Download as
Browse Code »

Commit e51719afb24a9eb423aaca6110b2f7f698802b6f

Authored by Victor Costa
1 parent 74da1743
Exists in master and in 3 other branches new-theme, production, staging

Added navigation

Showing 7 changed files with 58 additions and 36 deletions   Show diff stats
cabecalho.css
  Diff comments   View file @e51719a
... ... @@ -907,7 +907,7 @@ text-decoration: none;
907 907 color: #666;
908 908 }
909 909  
910   -#btn_open_control_panel span {
  910 +#navigation li span {
911 911 position: relative;
912 912 background: url("images/20-gear2.png") no-repeat left center transparent;
913 913 padding-left: 30px;
... ... @@ -951,21 +951,50 @@ text-decoration: none;
951 951 background-color: lightSteelBlue;
952 952 }
953 953  
954   -.btn_control_panel_bar{
  954 +#navigation {
955 955 text-align: right;
956   - position: relative;
  956 + position: static;
  957 + background: none;
957 958 background-color: #eee;
958   - /*position: absolute;*/
959   - /*right: 0;*/
960   - /*padding: 0;*/
  959 + border-bottom: 1px solid #d3d7cf;
961 960 }
962 961  
963   -.btn_control_panel_bar ul {text-align: center;display: inline-block;padding-left: 0px;}
  962 +#navigation ul {
  963 + text-align: center;
  964 + height: auto;
  965 + float: none;
  966 + font-size: small;
  967 + color: #666;
  968 + padding: 0;
  969 +}
  970 +#wrap-1 #wrap-2 {
  971 + padding: 0;
  972 + border-top: none;
  973 +}
964 974  
965   -.btn_control_panel_bar ul li{
966   -display: inline-block;
  975 +#navigation #navigation-end {
  976 + width: 0px;
  977 + height: 0px;
  978 + background: none;
  979 + clear: both;
  980 +}
  981 +
  982 +#navigation ul li{
967 983 border-left: 1px solid black;
968   -padding: 0 14px;}
  984 +padding: 0 14px;
  985 +width: auto;
  986 +margin: 12px 0;
  987 +float: right;
  988 +}
  989 +#navigation ul li:hover {
  990 + cursor: pointer;
  991 +}
  992 +
  993 +#navigation ul li#btn_icon {
  994 + border: none;
  995 + padding: 4px;
  996 + margin: 0;
  997 +}
969 998  
970 999 #control_panel_bar .btn_control_panel{
971 1000 float: none;
... ... @@ -1088,7 +1117,7 @@ padding: 0 14px;}
1088 1117 /************* FIM Bar Psocial Style - Menu Horizontal**************/
1089 1118  
1090 1119 /*ajuste no content*/
1091   -#content{margin-top: 0;}
  1120 +#content{margin-top: 8px;}
1092 1121  
1093 1122  
1094 1123 /******************Footer - Rodapé**********************************/
... ...
header.html.erb
  Diff comments   View file @e51719a
... ... @@ -42,24 +42,3 @@
42 42 <%= theme_include 'task_list' %>
43 43 <%#= theme_include 'message_list' %>
44 44  
45   -
46   -
47   -<!-- *************** Painel de controle da comunidade ************** -->
48   -<div class="btn_control_panel_bar">
49   - <a href="#" id="btn_open_control_panel" class="btn_open">
50   - <span>&nbsp;</span><!-- <span>Painel de Controle</span> -->
51   - <ul>
52   - <li id="btn_content">Conteúdo</li>
53   - <li id="btn_aparence">Aparência</li>
54   - <li id="btn_settings">Configurações</li>
55   - </ul>
56   - </a>
57   -
58   -<div id="control_panel_bar" class="menu_content controller-profile_editor"> </div>
59   -<div id="control_panel_bar" class="menu_aparence controller-profile_editor"> </div>
60   -<div id="control_panel_bar" class="menu_settings controller-profile_editor"> </div>
61   -
62   -</div>
63   -
64   -
65   -<!-- *************** FIM Painel de controle da comunidade ************** -->
... ...
navigation.html.erb
  Diff comments   View file @e51719a
... ... @@ -0,0 +1,9 @@
  1 +<!-- *************** Painel de controle da comunidade ************** -->
  2 +<li id="btn_settings">Configurações</li>
  3 +<li id="btn_aparence">Aparência</li>
  4 +<li id="btn_content">Conteúdo</li>
  5 +<li id="btn_icon"><span>&nbsp;</span></li>
  6 +
  7 +<div id="control_panel_bar" class="menu_content controller-profile_editor"> </div>
  8 +<div id="control_panel_bar" class="menu_aparence controller-profile_editor"> </div>
  9 +<div id="control_panel_bar" class="menu_settings controller-profile_editor"> </div>
... ...
style-core.css 0 → 100644
  Diff comments   View file @e51719a
... ... @@ -0,0 +1,3 @@
  1 +#wrap-2 #user {
  2 + display: none;
  3 +}
... ...
style.css
  Diff comments   View file @e51719a
... ... @@ -2,6 +2,7 @@
2 2 /****************** ESTILO BASE ******************/
3 3 @import url(cabecalho.css);
4 4 /****************** FIM cabecalho amarelo ******************/
  5 +@import url(style-core.css);
5 6  
6 7 body, th, td, input {
7 8 font-size: 16px;
... ...
theme.js
  Diff comments   View file @e51719a
... ... @@ -37,19 +37,19 @@
37 37  
38 38 //abrir e fechar Painel de controle da comunidade//
39 39 //aba conteúdo//
40   - $("#btn_open_control_panel ul li#btn_content").click(function(){
  40 + $("#navigation ul li#btn_content").click(function(){
41 41 $("#control_panel_bar.menu_aparence").removeClass("show");
42 42 $("#control_panel_bar.menu_settings").removeClass("show");
43 43 $("#control_panel_bar.menu_content").toggleClass("show");
44 44 });
45 45 //aba aparência//
46   - $("#btn_open_control_panel ul li#btn_aparence").click(function(){
  46 + $("#navigation ul li#btn_aparence").click(function(){
47 47 $("#control_panel_bar.menu_settings").removeClass("show");
48 48 $("#control_panel_bar.menu_content").removeClass("show");
49 49 $("#control_panel_bar.menu_aparence").toggleClass("show");
50 50 });
51 51 //aba Configurações//
52   - $("#btn_open_control_panel ul li#btn_settings").click(function(){
  52 + $("#navigation ul li#btn_settings").click(function(){
53 53 $("#control_panel_bar.menu_content").removeClass("show");
54 54 $("#control_panel_bar.menu_aparence").removeClass("show");
55 55 $("#control_panel_bar.menu_settings").toggleClass("show");
... ...
theme.yml
  Diff comments   View file @e51719a
1 1 name: "Participa-WEB"
2   -layout: "../../../public/designs/themes/participa-web/index"
  2 +#layout: "../../../public/designs/themes/participa-web/index"
  3 +layout: "application-ng"
3 4 jquery_theme: "smoothness"
4 5 icon_theme: [default, pidgin]
... ...