From 391777de388dfe62ccd02ed73af485dc44632eee Mon Sep 17 00:00:00 2001 From: Zambom Date: Thu, 12 Jan 2017 19:41:31 -0200 Subject: [PATCH] Adding footer note to login page --- amadeus/static/css/base/amadeus.css | 16 ++++++++++++++-- amadeus/static/css/themes/green.css | 5 +++++ amadeus/templates/base.html | 3 +++ users/templates/users/login.html | 14 ++++++++++++++ 4 files changed, 36 insertions(+), 2 deletions(-) diff --git a/amadeus/static/css/base/amadeus.css b/amadeus/static/css/base/amadeus.css index 52b05db..bc08547 100755 --- a/amadeus/static/css/base/amadeus.css +++ b/amadeus/static/css/base/amadeus.css @@ -3,7 +3,6 @@ ul, li { text-decoration: none; } - .pagination > li > a, .pagination > li > span { padding: 0px 8px; } @@ -586,4 +585,17 @@ ul, li { .theme_img { width: 100%; } -/* End Themes */ \ No newline at end of file +/* End Themes */ + +.footer { + position: relative; + bottom: 0px; + padding: 30px 30px; + width: 100%; + margin-top: 15px; + font-family: Roboto; + font-size: 16px; +} +.footer p { + margin: 0px; +} \ No newline at end of file diff --git a/amadeus/static/css/themes/green.css b/amadeus/static/css/themes/green.css index dd1c307..cc7f2b6 100644 --- a/amadeus/static/css/themes/green.css +++ b/amadeus/static/css/themes/green.css @@ -267,4 +267,9 @@ a, a:focus, a:hover { .filedrag { color: #555; border: 2px dashed #555; +} + +.footer { + color: #FFFFFF; + background: #26A69A; } \ No newline at end of file diff --git a/amadeus/templates/base.html b/amadeus/templates/base.html index 03de742..72b789d 100644 --- a/amadeus/templates/base.html +++ b/amadeus/templates/base.html @@ -187,6 +187,9 @@ + {% block footer %} + {% endblock %} + {% block bottommenu %}
diff --git a/users/templates/users/login.html b/users/templates/users/login.html index cebb14c..eedefd0 100644 --- a/users/templates/users/login.html +++ b/users/templates/users/login.html @@ -91,5 +91,19 @@
{% endblock%} +{% block footer %} + {% if theme.footer_note != '' and theme.footer_note != '


' %} + + {% endif %} +{% endblock %} + {% block bottommenu %} {% endblock %} \ No newline at end of file -- libgit2 0.21.2