From 1e41fe24c8c198b5bf5edd4b72f3e9d93838aeb4 Mon Sep 17 00:00:00 2001 From: Carlos Oliveira Date: Mon, 8 Jun 2015 16:27:44 -0300 Subject: [PATCH] Updated SPB theme --- colab/static/css/footer.css | 27 +++++++++++++++------------ colab/static/css/header.css | 10 +++------- colab/static/css/screen.css | 5 ----- colab/static/img/brasil.png | Bin 14322 -> 0 bytes colab/templates/base.html | 40 +--------------------------------------- colab/templates/footer.html | 108 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------- colab/templates/header.html | 102 ++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------- 7 files changed, 123 insertions(+), 169 deletions(-) diff --git a/colab/static/css/footer.css b/colab/static/css/footer.css index e390ec9..689b5d1 100644 --- a/colab/static/css/footer.css +++ b/colab/static/css/footer.css @@ -1,7 +1,7 @@ /*Footer*/ -#footer-content{ +.footer-content{ background: rgb(213,213,213); padding: 50px 0; font-family: 'open_sansregular', Arial, Helvetica, sans-serif; @@ -37,51 +37,54 @@ padding-bottom: 3px } -#footer-gov{ +.footer-gov{ background: #0042b2; } -#footer-gov > .container{ +.footer-gov > .container{ padding: 2em 0; } -#footer-gov .institucionais a{ +.footer-gov .institucionais a{ display:table-cell; vertical-align: middle; + float: right; } -#footer-gov a:hover{ +.footer-gov a:hover{ text-decoration: none; } -#footer-gov span{ +.footer-gov span{ display: none; } -#logo-sgpr img, #logo-acesso img{ +.footer-gov .logo-sgpr img, .logo-acesso img{ + padding-top: 10px; padding-right: 15%; + padding-bottom: 10px; } -#logo-brasil img{ +.footer-gov .logo-brasil img{ padding-right: 0; } -#go-top{ +.go-top{ font-size: 13px; height: 2em; } -#go-top a{ +.go-top a{ color: #717782; line-height: 2em; } -#go-top .icon-chevron-up{ +.go-top .icon-chevron-up{ padding-right: 10px; text-decoration: none; } -#spb-definitions{ +.spb-definitions{ font-size: 10px; padding: 10px 0; } diff --git a/colab/static/css/header.css b/colab/static/css/header.css index 7d3c505..d72e985 100644 --- a/colab/static/css/header.css +++ b/colab/static/css/header.css @@ -146,10 +146,6 @@ font-family: 'Open Sans', Arial, Helvetica, sans-serif; } -#menu-spb.collapse{ - padding-left: 0; -} - #menu-spb > li > a{ padding: 5px 15px 5px 5px; } @@ -173,8 +169,8 @@ background: none; } -.navbar-header.nav-spb .navbar-toggle{ - padding: 7px 10px; +#quick-links{ + padding-right: 10px } #quick-links > li > a{ @@ -199,7 +195,7 @@ margin: auto; } -.navbar-header.nav-spb .navbar-toggle{ +.navbar-header.logo .navbar-toggle{ float: left; margin: 0; } diff --git a/colab/static/css/screen.css b/colab/static/css/screen.css index c70ef55..d7cb08e 100644 --- a/colab/static/css/screen.css +++ b/colab/static/css/screen.css @@ -452,8 +452,3 @@ span.highlighted { .chart > p > label { margin: 0 2px; } - -.row { - margin-left: 0; - margin-right: 0; -} diff --git a/colab/static/img/brasil.png b/colab/static/img/brasil.png index 0ac6ed2..038ef2e 100644 Binary files a/colab/static/img/brasil.png and b/colab/static/img/brasil.png differ diff --git a/colab/templates/base.html b/colab/templates/base.html index 259cae3..3a994f6 100644 --- a/colab/templates/base.html +++ b/colab/templates/base.html @@ -1,5 +1,5 @@ -{% load i18n browserid conversejs gravatar proxy %} +{% load i18n %} {% load static from staticfiles %} @@ -23,15 +23,6 @@ href="{% static 'third-party/font-awesome/css/font-awesome.min.css' %}" type="text/css" media="screen" /> - {% if ribbon %} - - - - {% endif %} - - @@ -43,10 +34,6 @@ {% block head_js %}{% endblock %} {% block head_css %}{% endblock %} - {% if not is_mobile %} - {% conversejs_static %} - {% endif %} - @@ -55,20 +42,6 @@ - {% if BROWSERID_ENABLED %} - {% browserid_info %} - {% endif %} - - {% block ribbon %} - {% if ribbon %} -
-
- {{ ribbon.text }} -
-
- {% endif %} - {% endblock %} - {% block navbar %} {% include "header.html" %} @@ -107,19 +80,8 @@ {% endblock %} - {% if not is_mobile %} - {% conversejs_chatpanel %} - {% conversejs_initialize %} - {% endif %} - {% include "tz/set_utc_offset.html" %} - {% if BROWSERID_ENABLED %} - - - - {% endif %} - {% block footer_js %}{% endblock %} diff --git a/colab/templates/footer.html b/colab/templates/footer.html index 310faa1..506c693 100644 --- a/colab/templates/footer.html +++ b/colab/templates/footer.html @@ -1,70 +1,78 @@ -{% load i18n browserid conversejs gravatar proxy %} +{% load i18n %} {% load static from staticfiles %} diff --git a/colab/templates/header.html b/colab/templates/header.html index 72fa9d7..01c6a16 100644 --- a/colab/templates/header.html +++ b/colab/templates/header.html @@ -1,62 +1,54 @@ -{% load i18n browserid conversejs gravatar proxy %} +{% load i18n gravatar proxy %} {% load static from staticfiles %}
- - - - + + + +
@@ -110,37 +99,38 @@
- -
- +
+ + + +
- -
- -- libgit2 0.21.2