alex
/
orbit4-5
forked from saurabh/orbit4-5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into gravity

This commit is contained in:
Harry Bomrah 2015-05-05 18:13:13 +08:00
parent 52037fba2c 7654fc7f23
commit 602ef183c0
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/assets/stylesheets/lib/orbit_bar/orbit-bar.scss.erb
View File

@ -41,7 +41,7 @@ $orbit-bar-bgc-lighter: lighten($orbit-bar-bgc, 20%) !default;
color: #FFF;
font-family: 'Chivo';
i {
display: block;
display: inline-block;
width: 50px;
height: 40px;
line-height: 40px;
@ -51,6 +51,13 @@ $orbit-bar-bgc-lighter: lighten($orbit-bar-bgc, 20%) !default;
text-align: center;
}
}
.orbit-bar-language-icon {
width: 30px;
}
.orbit-bar-language-text {
display: inline-block;
vertical-align: top;
}
}
#orbit-bar {
position: fixed;
@ -402,6 +409,9 @@ $orbit-bar-bgc-lighter: lighten($orbit-bar-bgc, 20%) !default;
}
}
}
#language {
padding-left: 0;
}
label {
padding: 0;
margin-bottom: 0;
@ -470,6 +480,8 @@ $orbit-bar-bgc-lighter: lighten($orbit-bar-bgc, 20%) !default;
}
.orbit-bar-title {
display: block;
height: 40px;
line-height: 40px;
}
ul.orbit-bar-search-sign-language {
display: none;

2
app/views/orbit_bar/index.html.erb
View File

@ -117,7 +117,7 @@
<li>
<% if @site_in_use_locales.count > 1 || current_site.enable_zh_cn %>
<% locale = session[:zh_cn] ? :zh_cn : I18n.locale %>
<span id="language"><%= t((locale==:zh_tw ? :zh_tw_ : locale.to_s)) %></span>
<span id="language"><i class="icons-earth orbit-bar-language-icon"></i><span class="orbit-bar-language-text">Language</span></span>
<ul>
<% @site_in_use_locales.each do |l| %>
<li class="<%= (l == I18n.locale and !session['zh_cn']) ? "active" : "" %>">