diff --git a/app/assets/stylesheets/small.css.scss b/app/assets/stylesheets/small.css.scss index 1331e56529..2bec6d2496 100644 --- a/app/assets/stylesheets/small.css.scss +++ b/app/assets/stylesheets/small.css.scss @@ -3,15 +3,15 @@ /* Default rules for the body of every page */ body { - font-size: 12px; + font-size: 10px; } h1 { - font-size: 16px; + font-size: 12px; } h2, h3, h4 { - font-size: 14px; + font-size: 12px; } .wrapper { @@ -30,6 +30,10 @@ h2, h3, h4 { position: relative; } +.site-edit #content, .site-index #content, .site-export #content { + position: absolute; +} + .column-1 { width: 100%; } @@ -89,7 +93,7 @@ h2, h3, h4 { #small-title h1 { position: absolute; - font-size: 12px; + font-size: 10px; line-height: 18px; margin: 0; left: 22px; @@ -106,6 +110,7 @@ h2, h3, h4 { #browse_map ul.secondary-actions { float: right; + font-size: 10px; } #map { @@ -155,14 +160,10 @@ h2, h3, h4 { #sidebar { border: 0px; margin: 0px; - width: 50%; + width: 50% !important; border-right: 1px solid #ccccdd; } -.sidebar_title, #sidebar_content { - font-size: 10px !important; -} - p.search_results_entry { padding: 2px 0px; } diff --git a/app/views/user/login.html.erb b/app/views/user/login.html.erb index c2deada5c0..05e9f96c1c 100644 --- a/app/views/user/login.html.erb +++ b/app/views/user/login.html.erb @@ -10,8 +10,8 @@

<%= t 'user.login.no account' %> <%= link_to t('user.login.register now'), :action => :new, :referer => params[:referer] %>

- - + +
<%= t 'user.login.email or username' %><%= text_field_tag "username", params[:username], :size => 28, :maxlength => 255, :tabindex => 1 %>
<%= t 'user.login.password' %><%= password_field_tag "password", "", :size => 28, :maxlength => 255, :tabindex => 2 %> (<%= link_to t('user.login.lost password link'), :controller => 'user', :action => 'lost_password' %>)
<%= t 'user.login.email or username' %><%= text_field_tag "username", params[:username], :maxlength => 255, :tabindex => 1 %>
<%= t 'user.login.password' %><%= password_field_tag "password", "", :maxlength => 255, :tabindex => 2 %> (<%= link_to t('user.login.lost password link'), :controller => 'user', :action => 'lost_password' %>)
<%= check_box_tag "remember_me", "yes", false, :tabindex => 3 %> @@ -43,7 +43,7 @@ <%= raw t 'user.login.openid', :logo => openid_logo %> - <%= url_field_tag("openid_url", "", { :size => 28, :maxlength => 255, :tabindex => 3, :class => "openid_url" }) %> + <%= url_field_tag("openid_url", "", { :maxlength => 255, :tabindex => 3, :class => "openid_url" }) %> (<%= t 'user.account.openid.link text' %>)