Download as
Browse Code »

Commit a8485af9590b662a11eb73fbeb3de7ee1c96f8cf

Authored by ValessioBrito
1 parent be81703b
Exists in master and in 22 other branches angular_poc, api-article-archived, article-readonly, backup-7-jan-2016, captcha_serpro_plugin, content-manager-hostspot, export-comment-paragraph, fix_event_date_issue, login-captcha, master_rails3, new_video_plugin, pg_search_rank, production, refactor_with_role, refactor_with_role_scope, remove_profile_cat_icons, resend_confirmation_email, staging, staging_rails3, tasks_keep_filter_params, theme-brasil-digital-from-staging, travis

ActionItem0: bug fix login_box and register_box 


git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@389 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 2 changed files with 6 additions and 7 deletions   Show diff stats
app/views/layouts/application.rhtml
  Diff comments   View file @a8485af
1 <html> 1 <html>
2 <head> 2 <head>
3 <%= javascript_include_tag :defaults %> 3 <%= javascript_include_tag :defaults %>
4 - <%= stylesheet_link_tag 'common' %>  
5 <%= design_all_header_tags %> 4 <%= design_all_header_tags %>
6 <%= javascript_include_tag 'comatose_admin' %> 5 <%= javascript_include_tag 'comatose_admin' %>
7 <% if params[:controller] == 'comatose_admin' %> 6 <% if params[:controller] == 'comatose_admin' %>
8 <%= stylesheet_link_tag 'comatose_admin' %> 7 <%= stylesheet_link_tag 'comatose_admin' %>
9 <% end %> 8 <% end %>
10 - 9 + <%= stylesheet_link_tag 'common' %>
11 </head> 10 </head>
12 11
13 <body> 12 <body>
@@ -22,7 +21,7 @@ @@ -22,7 +21,7 @@
22 </div> 21 </div>
23 <% end %> 22 <% end %>
24 <div id="frame"> 23 <div id="frame">
25 - <div id="menu"> 24 + <div id="menu_accessibility">
26 <%= _('Skip to:') %> 25 <%= _('Skip to:') %>
27 <a href="#main_content"><%= _('Content') %></a> | 26 <a href="#main_content"><%= _('Content') %></a> |
28 <a href="#sidebar"><%= _('Navigation') %></a> | 27 <a href="#sidebar"><%= _('Navigation') %></a> |
@@ -54,7 +53,7 @@ @@ -54,7 +53,7 @@
54 </div> 53 </div>
55 </div> 54 </div>
56 </div> 55 </div>
57 -  
58 - </body> 56 + <%= image_tag 'loading.gif', :id => 'spinner', :style => "display:none; float:right;", :alt => _('Image for Loading...') %>
  57 + </body>
59 58
60 </html> 59 </html>
public/stylesheets/common.css
  Diff comments   View file @a8485af
@@ -51,11 +51,11 @@ padding: 0px 5px 0px 5px !important ; @@ -51,11 +51,11 @@ padding: 0px 5px 0px 5px !important ;
51 text-decoration: underline !important ; 51 text-decoration: underline !important ;
52 } 52 }
53 53
54 -#user_links { 54 +#user_links, #login_box {
55 margin-left: 290px !important ; 55 margin-left: 290px !important ;
56 } 56 }
57 57
58 -#user_links a:hover, #user_links a:focus { 58 +#user_links a:hover, #user_links a:focus, #login_box a:hover, #login_box a:focus, #register_box a:hover, #register_box a:focus {
59 color: #dfdfdf !important ; 59 color: #dfdfdf !important ;
60 text-decoration: none !important ; 60 text-decoration: none !important ;
61 } 61 }