From db4bbd7c58908f1f8826162d2cb41481bf3bf6a5 Mon Sep 17 00:00:00 2001 From: Melissa Wen Date: Mon, 1 Jun 2015 08:40:44 -0300 Subject: [PATCH] Adding header and refining footer's style --- colab/static/css/footer.css | 145 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------- colab/static/css/footer.html | 79 ------------------------------------------------------------------------------- colab/static/css/header.css | 229 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ colab/static/img/brasil.png | Bin 14322 -> 0 bytes colab/static/img/logo.svg | 130 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------- colab/templates/footer.html | 143 +++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------- colab/templates/header.html | 206 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------- 7 files changed, 555 insertions(+), 377 deletions(-) delete mode 100644 colab/static/css/footer.html create mode 100644 colab/static/css/header.css diff --git a/colab/static/css/footer.css b/colab/static/css/footer.css index 2e13cf0..92b9c1e 100644 --- a/colab/static/css/footer.css +++ b/colab/static/css/footer.css @@ -1,67 +1,78 @@ -/*Footer*/ - - -.footer-content{ - background: rgb(213,213,213); - padding: 20px 0; - font-family: 'Open Sans'; -} - -.footer-links a{ - color:#2c66ce; - font-size: 13px; - line-height: 1.7em; -} - -.footer-links a:hover{ - background: none; - text-decoration: underline; -} - -.footer-links{ - color:#2c66ce; - border-left:1px dotted #2c66ce; - margin-top: 10px; - margin-bottom: 10px; -} - -.footer-links dt{ - font-size: 18px; - font-weight: bold; - line-height: 1.3em; - margin-bottom: 8px; -} - -.footer-links dd{ - padding-bottom: 3px -} - -.footer-gov{ - background: #0042b2; -} - -.footer-gov > .container{ - padding: 2em 0; -} - -.footer-gov .institucionais a{ - display:table-cell; - vertical-align: middle; -} - -.footer-gov a:hover{ - text-decoration: none; -} - -.footer-gov span{ - display: none; -} - -.footer-gov .logo-sgpr img, .logo-acesso img{ - padding-right: 15%; -} - -.go-top a{ - color: #717782; - line-height: 1.4em; -} +/*Footer*/ + + +.footer-content{ + background: rgb(213,213,213); + padding: 50px 0; + font-family: 'open_sansregular', Arial, Helvetica, sans-serif; +} + +.footer-links a{ + color:#2c66ce; + font-size: 13px; + line-height: 1.7em; +} + +.footer-links a:hover{ + background: none; + text-decoration: underline; +} + +.footer-links{ + color:#2c66ce; + border-left:1px dotted #2c66ce; + margin-top: 10px; + margin-bottom: 10px; +} + +.footer-links dt{ + font-size: 18px; + font-weight: bold; + line-height: 1.3em; + margin-bottom: 8px; + font-family: 'open_sansregular', Arial, Helvetica, sans-serif; +} + +.footer-links dd{ + padding-bottom: 3px +} + +.footer-gov{ + background: #0042b2; +} + +.footer-gov > .container{ + padding: 2em 0; +} + +.footer-gov .institucionais a{ + display:table-cell; + vertical-align: middle; +} + +.footer-gov a:hover{ + text-decoration: none; +} + +.footer-gov span{ + display: none; +} + +.footer-gov .logo-sgpr img, .logo-acesso img{ + padding-right: 15%; +} + +.go-top{ + font-size: 13px; + height: 2em; +} + +.go-top a{ + color: #717782; + line-height: 2em; +} + +.go-top .icon-chevron-up{ + padding-right: 10px; + text-decoration: none; +} diff --git a/colab/static/css/footer.html b/colab/static/css/footer.html deleted file mode 100644 index d825314..0000000 --- a/colab/static/css/footer.html +++ /dev/null @@ -1,79 +0,0 @@ - - diff --git a/colab/static/css/header.css b/colab/static/css/header.css new file mode 100644 index 0000000..8447c69 --- /dev/null +++ b/colab/static/css/header.css @@ -0,0 +1,229 @@ +#barra-brasil #wrapper-barra-brasil .brasil-flag{ + height: auto; +} + +#first-nav{ + background-color:#f0f2f1; + background-color:#ecedf1; + background-image: -webkit-radial-gradient(center, ellipse cover, #f0f2f1 1%, #ecedf1 100%) +} + +/* Accessibility */ + +#accessibility { + font-family: arial; + font-size: 10px; +} + +#accessibility a{ + padding-left: 4px; + padding-right: 4px; + color: #2c66ce; +} + +#accessibility span{ + background-color: #2c66ce; +} + +#portal-siteactions{ + font-size: 10px; + text-align: center; +} + +#portal-siteactions li{ + display: inline-block; +} + +#portal-siteactions a { + color:#2c66ce; + text-decoration: none; + text-transform: uppercase; + font-family: 'open_sansregular', Arial, Helvetica, sans-serif; + padding-right: 0; + padding-left: 10px; +} + +#portal-siteactions #siteaction-mapadosite a{ + padding-right: 0; +} + +#portal-siteactions a:hover { + color: #03316f; +} + +#portal-siteactions span { + border-bottom: 1px dotted #2c66ce; +} + +/* User-bar */ + +#user-menu a.btn { + font-size: 13px; + padding: 10px; + background-color: #2c66ce; + border-color: #2c66ce; + color: #FFF; +} + +#user-menu .dropdown-menu{ + border-radius: 5px; +} + +#user-menu .dropdown-toggle img{ + border-radius: 20px; +} + +#user-menu .user .caret, #menu-spb a .caret { + border-left: 5px solid transparent; + border-right: 5px solid transparent; + border-top: 5px solid #2c66ce; +} + +#user-menu a:hover .caret, #menu-spb a:hover .caret, #user-menu a:focus .caret, #menu-spb a:focus .caret{ + border-left: 5px solid transparent; + border-right: 5px solid transparent; + border-top: 5px solid #03316f; + +} + +/* Brand and search */ + +#spb-logo-search { + margin-top: 10px; + margin-bottom: 10px; +} + +#spb-logo-search .logo-box{ + padding-bottom: 20px; +} + +#portal-logo img{ + max-height: 50px; +} + +.box-search{ + margin: auto; + margin-top: 10px; +} + +#search-form .form-group{ + float: left; +} + +#search-form button.btn.btn-default{ + float: left; + border-radius: 0px 5px 5px 0px; + border-left: none; + color: #2c66ce; +} + +#search-form button.btn.btn-default:hover{ + background: #fff; + border: 1px solid #cccccc; + border-left: none; + color: #03316f; +} + +#search-form #header-searchbox{ + width: 100%; + border-radius: 5px 0px 0px 5px; + border-right: none; + background: #fff; +} + +/* Menu */ + +#second-nav { + background-color:#CFD0D2; + min-height: 30px; + line-height: 30px; + font-size: 12px; + border-radius: 0; + margin-bottom: 0; +} + +#second-nav a { + color: #2c66ce; + font-family: 'Open Sans', Arial, Helvetica, sans-serif; +} + +#menu-spb > li > a{ + padding: 5px 15px 5px 5px; +} + +#menu-spb ul.dropdown-menu { + background: #CFD0D2; + border-color: #CFD0D2; + box-shadow: 0 6px 12px rgba(0, 0, 0, 0.1); + font-size: 12px; +} + +#menu-spb ul.dropdown-menu a{ + color: #03316f; +} + +#menu-spb ul.dropdown-menu a:hover{ + color:#2c66ce; +} + +#menu-spb .open > a, #menu-spb .open > a:hover, #menu-spb .open > a:focus{ + background: none; +} + +#quick-links{ + padding-right: 30px +} + +#quick-links > li > a{ + margin: 5px 0; + padding: 0 15px; + border-right: 1px solid #2c66ce; +} + +#quick-links li:last-child > a{ + padding-right: 5px; + border-right: none; +} + +#quick-links a:hover, #menu-spb a:focus , #menu-spb a:hover { + color: #03316f; + background: none; +} + +/* Menu collapsed elements */ +.navbar-toggle .icon-bar{ + background-color: #2c66ce; + margin: auto; +} + +.navbar-header.logo .navbar-toggle{ + float: left; + margin: 0; +} + +#quick-links-sm{ + list-style: none; + float: right; + margin: 0; +} + +#quick-links-sm li{ + display: inline-block; +} + +#quick-links-sm > li > a{ + margin: 5px 0; + padding: 0 15px; + border-right: 1px solid #2c66ce; + text-decoration: none; +} + +#quick-links-sm li:last-child > a{ + padding-right: 5px; + border-right: none; +} + +#quick-links-sm a:hover{ + color: #03316f; + background: none; +} diff --git a/colab/static/img/brasil.png b/colab/static/img/brasil.png index 0ac6ed2..fcd9d8b 100644 Binary files a/colab/static/img/brasil.png and b/colab/static/img/brasil.png differ diff --git a/colab/static/img/logo.svg b/colab/static/img/logo.svg index cd22010..a1d86d9 100644 --- a/colab/static/img/logo.svg +++ b/colab/static/img/logo.svg @@ -1,64 +1,66 @@ - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/colab/templates/footer.html b/colab/templates/footer.html index 3e5d53a..81349f5 100644 --- a/colab/templates/footer.html +++ b/colab/templates/footer.html @@ -1,106 +1,65 @@ {% load i18n browserid conversejs gravatar proxy %} {% load static from staticfiles %} -
- + diff --git a/colab/templates/header.html b/colab/templates/header.html index 2eb089b..7fcbd68 100644 --- a/colab/templates/header.html +++ b/colab/templates/header.html @@ -1,92 +1,148 @@ {% load i18n browserid conversejs gravatar proxy %} {% load static from staticfiles %} -
+
+
+
+ + + + +
+
- + + -- libgit2 0.21.2