From 7dd20cafa0f52e0c9e88f36edc29b7d2603b2c88 Mon Sep 17 00:00:00 2001
From: nccu <nccu@test174.(none)>
Date: Thu, 13 Nov 2014 11:22:08 +0800
Subject: [PATCH] update css

---
 .../lib/orbit_bar/orbit-bar.scss.erb          | 36 ++++++-------------
 .../stylesheets/template/base/_default.scss   |  4 +--
 .../stylesheets/template/modules/news.scss    |  4 +--
 .../nccu/modules/news/_news_widget1.html.erb  |  2 +-
 .../nccu/modules/news/news_index1.html.erb    |  2 +-
 5 files changed, 16 insertions(+), 32 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 384cbd5..a987707 100644
--- a/app/assets/stylesheets/lib/orbit_bar/orbit-bar.scss.erb
+++ b/app/assets/stylesheets/lib/orbit_bar/orbit-bar.scss.erb
@@ -15,7 +15,6 @@ $orbit-bar-bgc-lighter:           lighten($orbit-bar-bgc, 20%) !default;
     clear: both;
   }
 }
-
 .orbitMenuLink {
   cursor: pointer;
   width: 50px;
@@ -136,35 +135,20 @@ $orbit-bar-bgc-lighter:           lighten($orbit-bar-bgc, 20%) !default;
           border-radius: 4px 0 0 4px;
           margin-right: -5px;
           display: inline-block;
-          width: auto;
-          height: 20px;
-          min-width: 16px;
-          padding: 4px 5px;
-          font-size: 14px;
-          font-weight: normal;
-          line-height: 20px;
-          text-align: center;
-          text-shadow: 0 1px 0 #ffffff;
-          background-color: #eeeeee;
+          padding: 7px 5px 6px 5px;
+          font-size: 13px;
+          text-shadow: 0 1px 0 #fff;
+          background-color: #eee;
           border: 1px solid #ccc;
-          white-space: nowrap;
+          vertical-align: top;
+          height: auto;
         }
         .input {
-          display: inline-block;
-          position: relative;
-          width: 270px;
-          height: 20px;
-          vertical-align: top;
+          font-size: 13px;
+          padding: 8px 6px;
+          width: 240px;
           border-radius: 0 4px 4px 0;
-          background-color: #ffffff;
-          border: 1px solid #cccccc;
-          box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
-          margin-left: 0;
-          padding: 4px 6px;
-          font-size: 14px;
-          line-height: 20px;
-          color: #555555;
-          white-space: nowrap;
+          height: auto;
         }
       }
       .submit {
diff --git a/app/templates/nccu/assets/stylesheets/template/base/_default.scss b/app/templates/nccu/assets/stylesheets/template/base/_default.scss
index 5ab68c5..861e702 100644
--- a/app/templates/nccu/assets/stylesheets/template/base/_default.scss
+++ b/app/templates/nccu/assets/stylesheets/template/base/_default.scss
@@ -3088,8 +3088,8 @@ article.page_content .linkAndFile > div:last-child {
 .news .list_mask .news_img a {
     display: block;
     overflow: hidden;
-    height: 130px;
-    min-height: 130px;
+    // height: 150px;
+    // min-height: 150px;
 }
 
 .news .list_mask .news_img img {
diff --git a/app/templates/nccu/assets/stylesheets/template/modules/news.scss b/app/templates/nccu/assets/stylesheets/template/modules/news.scss
index 62f3c9f..4b51459 100644
--- a/app/templates/nccu/assets/stylesheets/template/modules/news.scss
+++ b/app/templates/nccu/assets/stylesheets/template/modules/news.scss
@@ -20,8 +20,8 @@
     }
     .i-news__pic-wrap {
         display: inline-block;
-        width: 21.506122%;
-        height: 78px;
+        width: 21.806122%;
+        height: 75px;
     }
     .i-news__content-wrap {
         display: inline-block;
diff --git a/app/templates/nccu/modules/news/_news_widget1.html.erb b/app/templates/nccu/modules/news/_news_widget1.html.erb
index c5ab4c5..ed756c0 100644
--- a/app/templates/nccu/modules/news/_news_widget1.html.erb
+++ b/app/templates/nccu/modules/news/_news_widget1.html.erb
@@ -24,7 +24,7 @@
   <div class="list_mask">
     <ul id="topic_list" data-level="0" data-list="news">
       <li>
-        <div class="news_img bullseye">
+        <div class="news_img">
           <a href="{{link_to_show}}">
             <img src="{{img_src}}" alt="Announcement image">
           </a>
diff --git a/app/templates/nccu/modules/news/news_index1.html.erb b/app/templates/nccu/modules/news/news_index1.html.erb
index d892291..2597960 100644
--- a/app/templates/nccu/modules/news/news_index1.html.erb
+++ b/app/templates/nccu/modules/news/news_index1.html.erb
@@ -8,7 +8,7 @@
   <span class="search-result">搜尋標題有關 ' {{keyword}} ' 共搜尋到{{news_count}}筆資料</span>
   <ul class="i-news__list" data-level="0" data-list="news">
     <li class="i-news__item">
-      <div class="i-news__pic-wrap  bullseye">
+      <div class="i-news__pic-wrap">
             <img class="i-news__pic" src="{{img_src}}" alt="{{img_description}}">
       </div>
       <div class="i-news__content-wrap">