diff --git a/src/app/components/navbar/navbar.html b/src/app/components/navbar/navbar.html index 7302790..d5c59ee 100644 --- a/src/app/components/navbar/navbar.html +++ b/src/app/components/navbar/navbar.html @@ -1,25 +1,63 @@ - - - - Alternar menu de navegação - - - - - - - - - + + + + + Alternar menu de navegação + + + + + + + + + - - - Sobre - Programas - Propostas - - Dúvidas - - - - + + + Sobre + Programas + Propostas + Ranking + Dúvidas + + | + + Compartilhar + + + + + Compartilhar no Facebook + + + + + + Compartilhar no Twitter + + + + + + Compartilhar no Google Plus + + + + + + + Enviar por email + + + + + + + + diff --git a/src/app/components/navbar/navbar.scss b/src/app/components/navbar/navbar.scss index f71ee2d..585f612 100644 --- a/src/app/components/navbar/navbar.scss +++ b/src/app/components/navbar/navbar.scss @@ -1,4 +1,12 @@ -.header-navbar { +.app-navbar { + + border-bottom: 2px solid #f1f1f1; + margin-bottom: 40px; + + .navbar { + margin-bottom: 0; + border: none; + } .navbar-brand { height: auto; @@ -14,19 +22,62 @@ } } - .navbar-nav a { - padding-top: 30px; - padding-bottom: 30px; - text-transform: uppercase; - color: #03316f; + .navbar-nav .divider span { + padding: 0 0 10px 0; + margin: 53px 10px 0 10px; + display: block; + + @media screen and (max-width: 768px) { + display: none; + } + } + + .navbar-nav > li { - -webkit-transition: all 0.2s ease-in-out; - -moz-transition: all 0.2s ease-in-out; - -o-transition: all 0.2s ease-in-out; - transition: all 0.2s ease-in-out; + & > a { + padding: 0 0 10px 0; + margin: 55px 10px 0 10px; + text-transform: uppercase; + color: #616161; + font-weight: bold; - .contraste & { - color: #fff; + &:hover, + &:focus { + background: none; + } + + .contraste & { + color: #fff; + } + } + + &.active > a { + border-bottom: 3px solid #77BB34; + + @media screen and (max-width: 768px) { + border: none; + background-color: #eee; + padding: 10px 0 10px 0px; + } + } + + .dropdown-menu { + min-width: 190px; + + li { + float: left; + padding: 0; + margin: 0; + width: 45px; + + & > a { + padding: 0; + } + + &:first-child { + margin-left: 5px; + } + } } } @@ -37,8 +88,11 @@ .contraste & { .nav > li > a:hover, .nav > li > a:focus { - color: #000; + color: #fff; } + .active a { + border-bottom-color: #fff; + } } } diff --git a/src/app/components/socialShare/socialShare.scss b/src/app/components/socialShare/socialShare.scss index bbb0890..7efe3c0 100644 --- a/src/app/components/socialShare/socialShare.scss +++ b/src/app/components/socialShare/socialShare.scss @@ -21,8 +21,4 @@ text-align: right; vertical-align: middle; } - - .icon { - display: block; - } } diff --git a/src/app/index.scss b/src/app/index.scss index 27fb34e..c2436b3 100644 --- a/src/app/index.scss +++ b/src/app/index.scss @@ -132,6 +132,10 @@ body { } } +.icon { + display: block; +} + .icon-wrapper-rounded { padding: 3px; border-radius: 100%; diff --git a/src/app/pages/header/header.html b/src/app/pages/header/header.html index 19279eb..f9c1dde 100644 --- a/src/app/pages/header/header.html +++ b/src/app/pages/header/header.html @@ -12,9 +12,9 @@ - + -- libgit2 0.21.2