From 120ff84f75eaad34fbf479402e5803eb9ca7fb8d Mon Sep 17 00:00:00 2001 From: Victor Costa Date: Fri, 11 Jul 2014 18:08:13 -0300 Subject: [PATCH] refactoring top bar --- cabecalho.css | 67 +++++++++++++++---------------------------------------------------- header.html.erb | 32 ++++++-------------------------- 2 files changed, 21 insertions(+), 78 deletions(-) diff --git a/cabecalho.css b/cabecalho.css index f3ea761..bf4a946 100644 --- a/cabecalho.css +++ b/cabecalho.css @@ -496,20 +496,19 @@ div#wrap-0.menu{/*width: 20%*/; /*float: left;height: 1px;*/} /****************** Barra do usuário ******************/ -#barra-psocial { +#top-bar { position: relative; height: 40px; margin: auto; - background: url(images/barra-psocial-bg.png) repeat-x; + background: url(images/top-bar-bg.png) repeat-x; } -#barra-psocial.top { - background-image: none; +#top-bar.top { background-color: #fff; - height: 40px; + height: 40px; } -#barra-psocial li { +#top-bar li { float: left; } @@ -738,13 +737,9 @@ a.btn_control_panel:hover ul li{display: block;} } /*info do usuário na barra do usuário*/ -#barra-psocial{} - -#barra-psocial .layout_user {} +#top-bar .layout_user #user .logged-in a{text-decoration: none;} -#barra-psocial .layout_user #user .logged-in a{text-decoration: none;} - -#barra-psocial .layout_user #user .logged-in { +#top-bar .layout_user #user .logged-in { visibility: visible; display: block; background: none; @@ -766,11 +761,10 @@ color: #333; display: inline-block; } -#barra-psocial .layout_user #user .not-logged-in a{text-decoration: none;} +#top-bar .layout_user #user .not-logged-in a{text-decoration: none;} -#barra-psocial .layout_user #user .not-logged-in {padding-left: 35px;} +#top-bar .layout_user #user .not-logged-in {padding-left: 35px;} -#barra-psocial .layout_user #user a i.icon-chat {display: none;} /*info do usuário no espaço do usuário*/ #navigation-control{ height: 100%; @@ -857,43 +851,6 @@ text-decoration: none; /*fim de modificação da scroll bar DO ESPAÇO DO USUÁRIO */ -/* * Internacionalização * */ - -#participa-languages { - margin-right: 14px; - float: right; - vertical-align: top; - display: inline-block; -} - -#participa-languages ul { - margin: 0; -} - -#participa-languages ul li { - display: inline; - float: none; - line-height: 40px; -} - -#participa-languages a.flag { - color: #333; - text-decoration: none; - cursor: pointer; - background-repeat: no-repeat; - display: inline-block; - height: 17px; - width: 25px; - margin-left: 5px; -} - -.flag-en { background-image: url(images/flag-en.png) } -.flag-pt { background-image: url(images/flag-pt_br.png) } - -#participa-languages a span{ display: none } - -/* * FIM Internacionalização * */ - /****************** FIM Barra do usuário ******************/ /****************** FIM Barra do usuário e Menu do usuário ******************/ @@ -901,6 +858,12 @@ text-decoration: none; /****************** Painel de Controle ******************/ +.btn_home { + margin-right: 14px; + float: right; + line-height: 40px; +} + .btn_home a{ display: inline-block; text-decoration: none; diff --git a/header.html.erb b/header.html.erb index 4083da9..11cb716 100644 --- a/header.html.erb +++ b/header.html.erb @@ -3,39 +3,19 @@ -
+
-
- <%= render :partial => 'layouts/user' %> -
-
- - +
+ <%= render :partial => 'layouts/user' %> +
+
-
- - -
+  
-- libgit2 0.21.2