From 7654fc7f236d0f4828300ba7e655967fc2e7a826 Mon Sep 17 00:00:00 2001
From: Harry Bomrah <harry@rulingcom.com>
Date: Tue, 5 May 2015 18:08:57 +0800
Subject: [PATCH] language in orbit bar fixed

---
 .../stylesheets/lib/orbit_bar/orbit-bar.scss.erb   | 14 +++++++++++++-
 app/views/orbit_bar/index.html.erb                 |  2 +-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/app/assets/stylesheets/lib/orbit_bar/orbit-bar.scss.erb b/app/assets/stylesheets/lib/orbit_bar/orbit-bar.scss.erb
index a7187c0..c449d65 100644
--- a/app/assets/stylesheets/lib/orbit_bar/orbit-bar.scss.erb
+++ b/app/assets/stylesheets/lib/orbit_bar/orbit-bar.scss.erb
@@ -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;
diff --git a/app/views/orbit_bar/index.html.erb b/app/views/orbit_bar/index.html.erb
index aa13846..1cd84b8 100644
--- a/app/views/orbit_bar/index.html.erb
+++ b/app/views/orbit_bar/index.html.erb
@@ -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" : "" %>">