Download as
Browse Code »

Commit 0927db387cd2237e4ed1c6ab10050b5fca931d95

Authored by Victor Costa
1 parent fd95e26e
Exists in master and in 2 other branches production, staging

updating theme

Showing 4 changed files with 42 additions and 6 deletions   Show diff stats
@@ -385,7 +385,17 @@ background: url(images/icone-verde-flickr.png) 0 20px; @@ -385,7 +385,17 @@ background: url(images/icone-verde-flickr.png) 0 20px;
385 385
386 /********ABA Lateral - Espaço do Usuário**********/ 386 /********ABA Lateral - Espaço do Usuário**********/
387 /*escondendo e revelando a aba lateral*/ 387 /*escondendo e revelando a aba lateral*/
388 -div#wrap-1,div#wrap-0,div#theme-footer {transition-duration: 0.6s;-webkit-transition-duration:0.6s;} 388 +.notransition {
  389 + -webkit-transition: none !important;
  390 + -moz-transition: none !important;
  391 + -o-transition: none !important;
  392 + -ms-transition: none !important;
  393 + transition: none !important;
  394 +}
  395 +div#wrap-1,div#wrap-0,div#theme-footer {
  396 + transition-duration: 0.6s;
  397 + -webkit-transition-duration:0.6s;
  398 +}
389 div#wrap-1,div#theme-footer {float: right;width:100%;} 399 div#wrap-1,div#theme-footer {float: right;width:100%;}
390 div#wrap-1.menu,div#theme-footer.menu {width: 80%;} 400 div#wrap-1.menu,div#theme-footer.menu {width: 80%;}
391 div#wrap-0.menu{/*width: 20%*/; /*float: left;height: 1px;*/} 401 div#wrap-0.menu{/*width: 20%*/; /*float: left;height: 1px;*/}
@@ -459,11 +469,26 @@ div#wrap-0.menu{/*width: 20%*/; /*float: left;height: 1px;*/} @@ -459,11 +469,26 @@ div#wrap-0.menu{/*width: 20%*/; /*float: left;height: 1px;*/}
459 469
460 #navigation-control .menu_user .activity_menu {margin-top: 0;padding: 0;border-top: 1px solid #ddd;} 470 #navigation-control .menu_user .activity_menu {margin-top: 0;padding: 0;border-top: 1px solid #ddd;}
461 471
462 -#navigation-control .menu_user .activity_menu .activity_menu_item{color: #ddd; background-color: gray;padding: 14px 28px;margin: 0;border-bottom: 1px solid #ddd;} 472 +#navigation-control .menu_user .activity_menu .activity_menu_item{
  473 + color: #ddd;
  474 + background-color: gray;
  475 + padding: 0 28px;
  476 + margin: 0;
  477 + border-bottom: 1px solid #ddd;
  478 + height: 40px;
  479 +}
  480 +
  481 +#navigation-control .menu_user .activity_menu .activity_menu_item * {
  482 + line-height: 40px;
  483 +}
  484 +#navigation-control .menu_user .activity_menu .activity_menu_item a {
  485 + display: inline-block;
  486 + width: 100%;
  487 +}
463 488
464 #navigation-control .menu_user .activity_menu .activity_menu_item:hover {background-color: #ddd; color: #333;} 489 #navigation-control .menu_user .activity_menu .activity_menu_item:hover {background-color: #ddd; color: #333;}
465 490
466 -#navigation-control .menu_user .activity_menu .activity_menu_item span{float: right;} 491 +#navigation-control .menu_user .activity_menu .activity_menu_item .arrow{float: right;}
467 492
468 #navigation-control .menu_user .activity_menu .activity_menu_item .quick_post{padding: 14px;background-color: #fff;margin-top: 10px;display: none;} 493 #navigation-control .menu_user .activity_menu .activity_menu_item .quick_post{padding: 14px;background-color: #fff;margin-top: 10px;display: none;}
469 494
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
3 @import url(cabecalho.css); 3 @import url(cabecalho.css);
4 /****************** FIM cabecalho amarelo ******************/ 4 /****************** FIM cabecalho amarelo ******************/
5 @import url(style-core.css); 5 @import url(style-core.css);
  6 +@import url(user-menu.css);
6 7
7 body, th, td, input { 8 body, th, td, input {
8 font-size: 16px; 9 font-size: 16px;
user-menu.css 0 → 100644
  Diff comments   View file @0927db3
@@ -0,0 +1,10 @@ @@ -0,0 +1,10 @@
  1 +.activity_menu_item a {
  2 + color: #ddd;
  3 + text-decoration: none;
  4 +}
  5 +.activity_menu_item:hover a {
  6 + color: #333;
  7 +}
  8 +.activity_menu_item {
  9 + cursor: pointer;
  10 +}
user_menu.html.erb
  Diff comments   View file @0927db3
@@ -10,16 +10,16 @@ @@ -10,16 +10,16 @@
10 <%#= render :partial => 'layouts/user' %> 10 <%#= render :partial => 'layouts/user' %>
11 <div class="menu_user"> 11 <div class="menu_user">
12 <ul class="activity_menu"> 12 <ul class="activity_menu">
13 - <li class="activity_menu_item qpost">Blog<span>&#9660;</span> 13 + <li class="activity_menu_item qpost"><div>Blog<span class="arrow">&#9660;</span></div>
14 <ul class="quick_post"> 14 <ul class="quick_post">
15 <li>Quick Post</li> 15 <li>Quick Post</li>
16 </ul> 16 </ul>
17 </li> 17 </li>
18 <li class="activity_menu_item"><%= link_to _("Agenda"), url_for(:controller => :profile, :action => :events, :profile => person.identifier) %></li> 18 <li class="activity_menu_item"><%= link_to _("Agenda"), url_for(:controller => :profile, :action => :events, :profile => person.identifier) %></li>
19 - <li class="activity_menu_item">Artigos Recentes<span>&#9660;</span></li> 19 + <li class="activity_menu_item"><div>Artigos Recentes<span class="arrow">&#9660;</div></li>
20 <li class="activity_menu_item"><%= link_to _("Network"), url_for(person.public_profile_url.merge(:anchor => 'profile-network')) %></li> 20 <li class="activity_menu_item"><%= link_to _("Network"), url_for(person.public_profile_url.merge(:anchor => 'profile-network')) %></li>
21 <li class="activity_menu_item"><%= link_to _("Wall"), url_for(person.public_profile_url.merge(:anchor => 'profile-wall')) %></li> 21 <li class="activity_menu_item"><%= link_to _("Wall"), url_for(person.public_profile_url.merge(:anchor => 'profile-wall')) %></li>
22 - <li class="activity_menu_item">Galeria<span>&#9660;</span></li> 22 + <li class="activity_menu_item"><div>Galeria<span class="arrow">&#9660;</div></li>
23 <li class="activity_menu_item"><%= link_to _("Friends"), url_for(:controller => :profile, :action => :friends, :profile => person.identifier) %></li> 23 <li class="activity_menu_item"><%= link_to _("Friends"), url_for(:controller => :profile, :action => :friends, :profile => person.identifier) %></li>
24 <li class="activity_menu_item"><%= link_to _("Communities"), url_for(:controller => :profile, :action => :communities, :profile => person.identifier) %></li> 24 <li class="activity_menu_item"><%= link_to _("Communities"), url_for(:controller => :profile, :action => :communities, :profile => person.identifier) %></li>
25 </ul> 25 </ul>