diff --git a/cabecalho.css b/cabecalho.css index cfe4e31..9c538d2 100644 --- a/cabecalho.css +++ b/cabecalho.css @@ -680,7 +680,6 @@ a.btn_control_panel:hover ul li{display: block;} visibility: visible; } #user .logged-in a#homepage-link { - display: block; visibility: visible; } @@ -695,8 +694,6 @@ a.btn_control_panel:hover ul li{display: block;} #user .logged-in span {display: none;} #user .logged-in a { - display: block; - margin-bottom: 10px; width: auto; } @@ -739,7 +736,7 @@ a.btn_control_panel:hover ul li{display: block;} display: block; background: none; display: block; - padding: 5px 5px 5px 15px; + padding: 5px 5px 5px 5px; text-align: left; width: auto; border-radius: 0; @@ -892,6 +889,11 @@ text-decoration: none; display: inline-block; text-decoration: none; margin-left: 5px; + width: 35px; + height: 35px; + background: url("images/logo.png") no-repeat left center transparent; + position: relative; + top: -10px; } /*Botão Painel de controle*/ @@ -1187,4 +1189,13 @@ float: right; text-align: left; } - +#user #homepage-link { + background: url(images/barra-menu-control.png) no-repeat 10px center; + margin-left: 0px; +} +#user #homepage-link i { + display: none; +} +#user #homepage-link strong { + padding: 10px 0 10px 35px; +} diff --git a/header.html.erb b/header.html.erb index 61e0619..6b10d01 100644 --- a/header.html.erb +++ b/header.html.erb @@ -1,4 +1,5 @@ -<%= theme_include "user_menu" %> +<% user = (session[:user] && User.find_by_id(session[:user])) || nil %> +<%= theme_include "user_menu", :locals => {:person => user.person} if user %> @@ -31,7 +32,7 @@
  • English
  • -
  • Logo do Portal
  • +
  •  
  • diff --git a/images/logo.png b/images/logo.png new file mode 100644 index 0000000..73123bc Binary files /dev/null and b/images/logo.png differ diff --git a/style-core.css b/style-core.css index 8a6fb70..08668f9 100644 --- a/style-core.css +++ b/style-core.css @@ -1,3 +1,7 @@ #wrap-2 #user { display: none; } + +#user .logged-in a.ctrl-panel { + display: none; +} diff --git a/style.css b/style.css index a5db074..1266bd1 100644 --- a/style.css +++ b/style.css @@ -11,6 +11,10 @@ font-family: Arial, sans-serif; #wrap-2 {background-color:#ebeff2;} +#wrap-1 { + min-width: 800px; +} + #site-title { position: relative; top: 0; diff --git a/theme.js b/theme.js index 4c17235..a2814f8 100644 --- a/theme.js +++ b/theme.js @@ -1,7 +1,11 @@ (function($) { // Run code - - $(".btn_control .logged-in").click(function(){ + + $('.btn_control .logged-in #homepage-link').on('click', function(event){ + event.preventDefault(); + }); + + $(".btn_control .logged-in #homepage-link").click(function(){ $("#wrap-0").toggleClass("menu"); $("#wrap-1").toggleClass("menu"); $("#theme-footer").toggleClass("menu"); diff --git a/user_menu.html.erb b/user_menu.html.erb index 24ec75e..95c261d 100644 --- a/user_menu.html.erb +++ b/user_menu.html.erb @@ -2,9 +2,9 @@ -- libgit2 0.21.2