Download as
Browse Code »

Commit 120ff84f75eaad34fbf479402e5803eb9ca7fb8d

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

refactoring top bar

Showing 2 changed files with 21 additions and 78 deletions   Show diff stats
@@ -496,20 +496,19 @@ div#wrap-0.menu{/*width: 20%*/; /*float: left;height: 1px;*/} @@ -496,20 +496,19 @@ div#wrap-0.menu{/*width: 20%*/; /*float: left;height: 1px;*/}
496 496
497 497
498 /****************** Barra do usuário ******************/ 498 /****************** Barra do usuário ******************/
499 -#barra-psocial { 499 +#top-bar {
500 position: relative; 500 position: relative;
501 height: 40px; 501 height: 40px;
502 margin: auto; 502 margin: auto;
503 - background: url(images/barra-psocial-bg.png) repeat-x; 503 + background: url(images/top-bar-bg.png) repeat-x;
504 } 504 }
505 505
506 -#barra-psocial.top {  
507 - background-image: none; 506 +#top-bar.top {
508 background-color: #fff; 507 background-color: #fff;
509 - height: 40px; 508 + height: 40px;
510 } 509 }
511 510
512 -#barra-psocial li { 511 +#top-bar li {
513 float: left; 512 float: left;
514 } 513 }
515 514
@@ -738,13 +737,9 @@ a.btn_control_panel:hover ul li{display: block;} @@ -738,13 +737,9 @@ a.btn_control_panel:hover ul li{display: block;}
738 } 737 }
739 738
740 /*info do usuário na barra do usuário*/ 739 /*info do usuário na barra do usuário*/
741 -#barra-psocial{}  
742 -  
743 -#barra-psocial .layout_user {} 740 +#top-bar .layout_user #user .logged-in a{text-decoration: none;}
744 741
745 -#barra-psocial .layout_user #user .logged-in a{text-decoration: none;}  
746 -  
747 -#barra-psocial .layout_user #user .logged-in { 742 +#top-bar .layout_user #user .logged-in {
748 visibility: visible; 743 visibility: visible;
749 display: block; 744 display: block;
750 background: none; 745 background: none;
@@ -766,11 +761,10 @@ color: #333; @@ -766,11 +761,10 @@ color: #333;
766 display: inline-block; 761 display: inline-block;
767 } 762 }
768 763
769 -#barra-psocial .layout_user #user .not-logged-in a{text-decoration: none;} 764 +#top-bar .layout_user #user .not-logged-in a{text-decoration: none;}
770 765
771 -#barra-psocial .layout_user #user .not-logged-in {padding-left: 35px;} 766 +#top-bar .layout_user #user .not-logged-in {padding-left: 35px;}
772 767
773 -#barra-psocial .layout_user #user a i.icon-chat {display: none;}  
774 /*info do usuário no espaço do usuário*/ 768 /*info do usuário no espaço do usuário*/
775 #navigation-control{ 769 #navigation-control{
776 height: 100%; 770 height: 100%;
@@ -857,43 +851,6 @@ text-decoration: none; @@ -857,43 +851,6 @@ text-decoration: none;
857 851
858 /*fim de modificação da scroll bar DO ESPAÇO DO USUÁRIO */ 852 /*fim de modificação da scroll bar DO ESPAÇO DO USUÁRIO */
859 853
860 -/* * Internacionalização * */  
861 -  
862 -#participa-languages {  
863 - margin-right: 14px;  
864 - float: right;  
865 - vertical-align: top;  
866 - display: inline-block;  
867 -}  
868 -  
869 -#participa-languages ul {  
870 - margin: 0;  
871 -}  
872 -  
873 -#participa-languages ul li {  
874 - display: inline;  
875 - float: none;  
876 - line-height: 40px;  
877 -}  
878 -  
879 -#participa-languages a.flag {  
880 - color: #333;  
881 - text-decoration: none;  
882 - cursor: pointer;  
883 - background-repeat: no-repeat;  
884 - display: inline-block;  
885 - height: 17px;  
886 - width: 25px;  
887 - margin-left: 5px;  
888 -}  
889 -  
890 -.flag-en { background-image: url(images/flag-en.png) }  
891 -.flag-pt { background-image: url(images/flag-pt_br.png) }  
892 -  
893 -#participa-languages a span{ display: none }  
894 -  
895 -/* * FIM Internacionalização * */  
896 -  
897 /****************** FIM Barra do usuário ******************/ 854 /****************** FIM Barra do usuário ******************/
898 855
899 /****************** FIM Barra do usuário e Menu do usuário ******************/ 856 /****************** FIM Barra do usuário e Menu do usuário ******************/
@@ -901,6 +858,12 @@ text-decoration: none; @@ -901,6 +858,12 @@ text-decoration: none;
901 858
902 /****************** Painel de Controle ******************/ 859 /****************** Painel de Controle ******************/
903 860
  861 +.btn_home {
  862 + margin-right: 14px;
  863 + float: right;
  864 + line-height: 40px;
  865 +}
  866 +
904 .btn_home a{ 867 .btn_home a{
905 display: inline-block; 868 display: inline-block;
906 text-decoration: none; 869 text-decoration: none;
header.html.erb
  Diff comments   View file @120ff84
@@ -3,39 +3,19 @@ @@ -3,39 +3,19 @@
3 3
4 <!-- Nova Barra de usuário --> 4 <!-- Nova Barra de usuário -->
5 5
6 -<div id="barra-psocial" class="top" > 6 +<div id="top-bar" class="top" >
7 <div class="btn_control_panel btn_control" title="Painel de Controle" alt="menu"> 7 <div class="btn_control_panel btn_control" title="Painel de Controle" alt="menu">
8 - <div class="layout_user">  
9 - <%= render :partial => 'layouts/user' %>  
10 - </div>  
11 -</div>  
12 -  
13 -<!--  
14 -<div class="btn_control_panel btn_tasks" title="Pedências" alt="pendências">  
15 - <span>20</span>  
16 -</div>  
17 -<div class="btn_control_panel btn_msg" title="Mensagens" alt="mensagens">  
18 - <span>362</span>  
19 -</div>  
20 ---> 8 + <div class="layout_user">
  9 + <%= render :partial => 'layouts/user' %>
  10 + </div>
  11 + </div>
21 12
22 <!-- 13 <!--
23 <div id="categories_menu"> 14 <div id="categories_menu">
24 <%= theme_include 'categories' %> 15 <%= theme_include 'categories' %>
25 </div> 16 </div>
26 --> 17 -->
27 - <div id="participa-languages">  
28 - <ul>  
29 - <li>  
30 - <a href="?lang=pt" class="flag flag-pt" title="Português"><span>Português</span></a>  
31 - </li>  
32 - <li>  
33 - <a href="?lang=en" class="flag flag-en" title="English"><span>English</span></a>  
34 - </li>  
35 - <li class="btn_home" title="Página Inicial"><a href="<%=environment.top_url%>">&nbsp;</a></li>  
36 - </ul>  
37 -  
38 - </div> 18 + <span class="btn_home" title="Página Inicial"><a href="<%=environment.top_url%>">&nbsp;</a></span>
39 </div> 19 </div>
40 <!-- FIM Nova Barra de usuário --> 20 <!-- FIM Nova Barra de usuário -->
41 21