diff --git a/cabecalho.css b/cabecalho.css index 70d9f38..cfe4e31 100644 --- a/cabecalho.css +++ b/cabecalho.css @@ -907,7 +907,7 @@ text-decoration: none; color: #666; } -#btn_open_control_panel span { +#navigation li span { position: relative; background: url("images/20-gear2.png") no-repeat left center transparent; padding-left: 30px; @@ -951,21 +951,50 @@ text-decoration: none; background-color: lightSteelBlue; } -.btn_control_panel_bar{ +#navigation { text-align: right; - position: relative; + position: static; + background: none; background-color: #eee; - /*position: absolute;*/ - /*right: 0;*/ - /*padding: 0;*/ + border-bottom: 1px solid #d3d7cf; } -.btn_control_panel_bar ul {text-align: center;display: inline-block;padding-left: 0px;} +#navigation ul { + text-align: center; + height: auto; + float: none; + font-size: small; + color: #666; + padding: 0; +} +#wrap-1 #wrap-2 { + padding: 0; + border-top: none; +} -.btn_control_panel_bar ul li{ -display: inline-block; +#navigation #navigation-end { + width: 0px; + height: 0px; + background: none; + clear: both; +} + +#navigation ul li{ border-left: 1px solid black; -padding: 0 14px;} +padding: 0 14px; +width: auto; +margin: 12px 0; +float: right; +} +#navigation ul li:hover { + cursor: pointer; +} + +#navigation ul li#btn_icon { + border: none; + padding: 4px; + margin: 0; +} #control_panel_bar .btn_control_panel{ float: none; @@ -1088,7 +1117,7 @@ padding: 0 14px;} /************* FIM Bar Psocial Style - Menu Horizontal**************/ /*ajuste no content*/ -#content{margin-top: 0;} +#content{margin-top: 8px;} /******************Footer - Rodapé**********************************/ diff --git a/header.html.erb b/header.html.erb index f88e38e..61e0619 100644 --- a/header.html.erb +++ b/header.html.erb @@ -42,24 +42,3 @@ <%= theme_include 'task_list' %> <%#= theme_include 'message_list' %> - - - -
- -   - - - - - - - -
- - - diff --git a/navigation.html.erb b/navigation.html.erb index e69de29..031f819 100644 --- a/navigation.html.erb +++ b/navigation.html.erb @@ -0,0 +1,9 @@ + +
  • Configurações
  • +
  • Aparência
  • +
  • Conteúdo
  • +
  •  
  • + + + + diff --git a/style-core.css b/style-core.css new file mode 100644 index 0000000..8a6fb70 --- /dev/null +++ b/style-core.css @@ -0,0 +1,3 @@ +#wrap-2 #user { + display: none; +} diff --git a/style.css b/style.css index 4a2781c..a5db074 100644 --- a/style.css +++ b/style.css @@ -2,6 +2,7 @@ /****************** ESTILO BASE ******************/ @import url(cabecalho.css); /****************** FIM cabecalho amarelo ******************/ +@import url(style-core.css); body, th, td, input { font-size: 16px; diff --git a/theme.js b/theme.js index aed6b33..4c17235 100644 --- a/theme.js +++ b/theme.js @@ -37,19 +37,19 @@ //abrir e fechar Painel de controle da comunidade// //aba conteúdo// - $("#btn_open_control_panel ul li#btn_content").click(function(){ + $("#navigation ul li#btn_content").click(function(){ $("#control_panel_bar.menu_aparence").removeClass("show"); $("#control_panel_bar.menu_settings").removeClass("show"); $("#control_panel_bar.menu_content").toggleClass("show"); }); //aba aparência// - $("#btn_open_control_panel ul li#btn_aparence").click(function(){ + $("#navigation ul li#btn_aparence").click(function(){ $("#control_panel_bar.menu_settings").removeClass("show"); $("#control_panel_bar.menu_content").removeClass("show"); $("#control_panel_bar.menu_aparence").toggleClass("show"); }); //aba Configurações// - $("#btn_open_control_panel ul li#btn_settings").click(function(){ + $("#navigation ul li#btn_settings").click(function(){ $("#control_panel_bar.menu_content").removeClass("show"); $("#control_panel_bar.menu_aparence").removeClass("show"); $("#control_panel_bar.menu_settings").toggleClass("show"); diff --git a/theme.yml b/theme.yml index fa297cf..5a58258 100644 --- a/theme.yml +++ b/theme.yml @@ -1,4 +1,5 @@ name: "Participa-WEB" -layout: "../../../public/designs/themes/participa-web/index" +#layout: "../../../public/designs/themes/participa-web/index" +layout: "application-ng" jquery_theme: "smoothness" icon_theme: [default, pidgin] -- libgit2 0.21.2