cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix some issues with the new tab styling

Browse source 
Uses the parent of the tabnav element to do its positioning, and fixes
this style in RTL and small.

Also move the greetings block into the top-bar div in order to cleanly
have it share a border with tabs.
This commit is contained in:
Tom MacWright 2012-02-28 18:25:23 -05:00 • committed by Tom Hughes
parent 86946536ec
commit 40402fcdb8
5 changed files with 29 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/assets/stylesheets/common.css.scss
View file

@ -248,9 +248,12 @@ h2 {
/* Rules for tabbed navigation bar */
#tabnav {
height: 29px;
#top-bar {
border-bottom: 1px solid #ccc;
height: 29px;
}
#tabnav {
padding: 0;
margin: 0;
overflow:hidden;
@ -293,10 +296,10 @@ h2 {
/* Rules for greeting bar in the top right corner */
#greeting {
height: 30px;
height: 28px;
margin: 0px;
font-size: 13px;
line-height: 30px;
line-height: 28px;
}
.greeting-bar-unread {

2
app/assets/stylesheets/ltr.css.scss
View file

@ -68,7 +68,7 @@ html body {
/* Rules for tabbed navigation bar */
#tabnav {
#top-bar {
margin-left: 185px;
}

6
app/assets/stylesheets/rtl.css.scss
View file

@ -68,15 +68,15 @@ html body {
/* Rules for tabbed navigation bar */
#tabnav {
margin-right: 185px;
#top-bar {
margin-right: 185px
}
#tabnav a,
#tabnav a:link,
#tabnav a:visited {
float: right;
margin-left: 4px;
margin-left: 1px;
}
/* Rules for greeting bar in the top right corner */

9
app/assets/stylesheets/small.css.scss
View file

@ -17,9 +17,11 @@ h1 {
}
/* Rules for tabbed navigation bar */
#top-bar {
margin: 0;
}
#tabnav
{
#tabnav {
height: 14px;
margin: 0px;
padding-top: 5px;
@ -28,8 +30,7 @@ h1 {
line-height: 10px;
}
#tabnav a, #tabnav a:link, #tabnav a:visited
{
#tabnav a, #tabnav a:link, #tabnav a:visited {
font-size: 10px;
line-height: 10px;
padding: 2px 5px;

27
app/views/layouts/site.html.erb
View file

@ -12,20 +12,19 @@
<%= yield %>
</div>
<span id="greeting">
<% if @user and @user.id %>
<span id="full-greeting"><%= raw(t 'layouts.welcome_user', :user_link => (link_to h(@user.display_name), {:controller => 'user', :action => 'view', :display_name => @user.display_name}, :title => t('layouts.welcome_user_link_tooltip'))) %></span>
<span id="small-greeting"><%= link_to t('layouts.welcome_user_link_tooltip'), {:controller => 'user', :action => 'view', :display_name => @user.display_name} %></span> |
<%= yield :greeting %>
<%= render :partial => "layouts/inbox" %> |
<%= link_to t('layouts.logout'), {:controller => 'user', :action => 'logout', :session => request.session_options[:id], :referer => request.fullpath}, {:id => 'logoutanchor', :title => t('layouts.logout_tooltip')}%>
<% else %>
<%= link_to t('layouts.log_in'), {:controller => 'user', :action => 'login', :referer => request.fullpath}, {:id => 'loginanchor', :title => t('layouts.log_in_tooltip')} %> |
<%= link_to t('layouts.sign_up'), {:controller => 'user', :action => 'new'}, {:id => 'registeranchor', :title => t('layouts.sign_up_tooltip')} %>
<% end %>
</span>
<div>
<div id='top-bar'>
<span id="greeting">
<% if @user and @user.id %>
<span id="full-greeting"><%= raw(t 'layouts.welcome_user', :user_link => (link_to h(@user.display_name), {:controller => 'user', :action => 'view', :display_name => @user.display_name}, :title => t('layouts.welcome_user_link_tooltip'))) %></span>
<span id="small-greeting"><%= link_to t('layouts.welcome_user_link_tooltip'), {:controller => 'user', :action => 'view', :display_name => @user.display_name} %></span> |
<%= yield :greeting %>
<%= render :partial => "layouts/inbox" %> |
<%= link_to t('layouts.logout'), {:controller => 'user', :action => 'logout', :session => request.session_options[:id], :referer => request.fullpath}, {:id => 'logoutanchor', :title => t('layouts.logout_tooltip')}%>
<% else %>
<%= link_to t('layouts.log_in'), {:controller => 'user', :action => 'login', :referer => request.fullpath}, {:id => 'loginanchor', :title => t('layouts.log_in_tooltip')} %> |
<%= link_to t('layouts.sign_up'), {:controller => 'user', :action => 'new'}, {:id => 'registeranchor', :title => t('layouts.sign_up_tooltip')} %>
<% end %>
</span>
<ul id="tabnav">
<%
viewclass = 'geolink llz layers'