Commit 6d18de269de763e7f374dc7f4875dbe500a661bc
1 parent
aa2407b8
Exists in
master
and in
3 other branches
clean css
Showing
2 changed files
with
6 additions
and
81 deletions
Show diff stats
cabecalho.css
| @@ -611,9 +611,6 @@ a.btn_control_panel:hover ul li{display: block;} | @@ -611,9 +611,6 @@ a.btn_control_panel:hover ul li{display: block;} | ||
| 611 | .task_list ul .task_box { | 611 | .task_list ul .task_box { |
| 612 | border-bottom: 1px solid #ccc; | 612 | border-bottom: 1px solid #ccc; |
| 613 | padding:16px; | 613 | padding:16px; |
| 614 | -/* display: inline-block; | ||
| 615 | - float: left; | ||
| 616 | - margin-right: 1em;*/ | ||
| 617 | } | 614 | } |
| 618 | 615 | ||
| 619 | .task_icon { | 616 | .task_icon { |
| @@ -653,55 +650,11 @@ a.btn_control_panel:hover ul li{display: block;} | @@ -653,55 +650,11 @@ a.btn_control_panel:hover ul li{display: block;} | ||
| 653 | 650 | ||
| 654 | /**/ | 651 | /**/ |
| 655 | 652 | ||
| 656 | - /*código "#control-panel" substituído por "#control_panel_bar" */ | ||
| 657 | -/* | ||
| 658 | -#control-panel { | ||
| 659 | - position: absolute; | ||
| 660 | - width: 230px; | ||
| 661 | - padding: 10px; | ||
| 662 | -} | ||
| 663 | -#control-panel .pending-tasks {background-color: white;} | ||
| 664 | - | ||
| 665 | -#control-panel .pending-tasks ul{ | ||
| 666 | - padding-left: 0; | ||
| 667 | -} | ||
| 668 | - | ||
| 669 | -#control-panel .pending-tasks ul li{ | ||
| 670 | - margin: 10px 0; | ||
| 671 | - padding: 10px 0; | ||
| 672 | - border-bottom: 1px solid gray; | ||
| 673 | -} | ||
| 674 | - | ||
| 675 | -#control-panel .control-panel {position: relative;} | ||
| 676 | - | ||
| 677 | -#control-panel .control-panel a, | ||
| 678 | -#control-panel .control-panel a:visited { | ||
| 679 | - clear: left; | ||
| 680 | - border-bottom: 1px solid LightGray; | ||
| 681 | -} | ||
| 682 | -*/ | ||
| 683 | - | ||
| 684 | - | ||
| 685 | - | ||
| 686 | /************* Bar Psocial Style - Menu Horizontal**************/ | 653 | /************* Bar Psocial Style - Menu Horizontal**************/ |
| 687 | -/* | ||
| 688 | -#user{ | ||
| 689 | - padding: 0px 2em; | ||
| 690 | - top: -30px; | ||
| 691 | - font-size: 12px; | ||
| 692 | - right: 4em; | ||
| 693 | -} | ||
| 694 | - | ||
| 695 | -.logged-in #user{ | ||
| 696 | - top: -40px; | ||
| 697 | -} | ||
| 698 | -*/ | ||
| 699 | 654 | ||
| 700 | #user{ | 655 | #user{ |
| 701 | - | ||
| 702 | - top: 0px; | ||
| 703 | font-size: 12px; | 656 | font-size: 12px; |
| 704 | - position: relative; | 657 | + position: static; |
| 705 | z-index: 9; | 658 | z-index: 9; |
| 706 | } | 659 | } |
| 707 | 660 | ||
| @@ -714,11 +667,11 @@ a.btn_control_panel:hover ul li{display: block;} | @@ -714,11 +667,11 @@ a.btn_control_panel:hover ul li{display: block;} | ||
| 714 | #user .logged-in { | 667 | #user .logged-in { |
| 715 | visibility: hidden; | 668 | visibility: hidden; |
| 716 | display: block; | 669 | display: block; |
| 717 | - background:url("images/barra-menu-user-bg.png") repeat-x bottom center #FEFEFE; | ||
| 718 | - display: block; | ||
| 719 | - padding: 2px 1em; | ||
| 720 | - text-align: left; | ||
| 721 | - width: 130px; | 670 | + background:url("images/barra-menu-user-bg.png") repeat-x bottom center #FEFEFE; |
| 671 | + display: block; | ||
| 672 | + padding: 2px 1em; | ||
| 673 | + text-align: left; | ||
| 674 | + width: 130px; | ||
| 722 | border-radius: 10px | 675 | border-radius: 10px |
| 723 | } | 676 | } |
| 724 | 677 | ||
| @@ -745,33 +698,6 @@ a.btn_control_panel:hover ul li{display: block;} | @@ -745,33 +698,6 @@ a.btn_control_panel:hover ul li{display: block;} | ||
| 745 | width: auto; | 698 | width: auto; |
| 746 | } | 699 | } |
| 747 | 700 | ||
| 748 | -/*modificado devido a barra do usuário*/ | ||
| 749 | -/* | ||
| 750 | -#user .logged-in #pending-tasks-count { | ||
| 751 | - display: inline-block; | ||
| 752 | - left: -30px; | ||
| 753 | - position: absolute; | ||
| 754 | - top: 0px; | ||
| 755 | - visibility: visible; | ||
| 756 | - text-align: right; | ||
| 757 | -} | ||
| 758 | -*/ | ||
| 759 | - | ||
| 760 | -/* | ||
| 761 | -.layout_user { | ||
| 762 | - margin-left: 14px; | ||
| 763 | - margin-top: 11px; | ||
| 764 | - position: relative; | ||
| 765 | - z-index: 9; | ||
| 766 | - display: inline-block; | ||
| 767 | -} | ||
| 768 | - | ||
| 769 | -.layout_user ul {margin-right: 24px;} | ||
| 770 | - | ||
| 771 | -.layout_user ul li { | ||
| 772 | - display: inline; | ||
| 773 | -} | ||
| 774 | -*/ | ||
| 775 | /*info do usuário na barra do usuário*/ | 701 | /*info do usuário na barra do usuário*/ |
| 776 | #barra-psocial{} | 702 | #barra-psocial{} |
| 777 | 703 |
user_menu.html.erb
| @@ -11,7 +11,6 @@ | @@ -11,7 +11,6 @@ | ||
| 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"><%= link_to _("Agenda"), url_for(:controller => :profile, :action => :events, :profile => person.identifier) %></li> | 13 | <li class="activity_menu_item"><%= link_to _("Agenda"), url_for(:controller => :profile, :action => :events, :profile => person.identifier) %></li> |
| 14 | - <li class="activity_menu_item"><div>Artigos Recentes<span class="arrow">▼</div></li> | ||
| 15 | <li class="activity_menu_item"><%= link_to _("Network"), url_for(person.public_profile_url.merge(:anchor => 'profile-network')) %></li> | 14 | <li class="activity_menu_item"><%= link_to _("Network"), url_for(person.public_profile_url.merge(:anchor => 'profile-network')) %></li> |
| 16 | <li class="activity_menu_item"><%= link_to _("Wall"), url_for(person.public_profile_url.merge(:anchor => 'profile-wall')) %></li> | 15 | <li class="activity_menu_item"><%= link_to _("Wall"), url_for(person.public_profile_url.merge(:anchor => 'profile-wall')) %></li> |
| 17 | <li class="activity_menu_item"><%= link_to _("Friends"), url_for(:controller => :profile, :action => :friends, :profile => person.identifier) %></li> | 16 | <li class="activity_menu_item"><%= link_to _("Friends"), url_for(:controller => :profile, :action => :friends, :profile => person.identifier) %></li> |