From 126c7f558d9717647ed6bffe7b3bad4a07aed089 Mon Sep 17 00:00:00 2001
From: zhuhao <zh13964069093@163.com>
Date: Tue, 18 Nov 2014 17:03:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=A4=84=E6=8E=A7=E4=BB=B6=E5=AF=B9=E9=BD=90=EF=BC=8C?=
 =?UTF-8?q?=E6=96=B0=E5=BB=BA=E8=AF=BE=E7=A8=8B=E9=80=9A=E7=9F=A5=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E5=8F=96=E6=B6=88=E6=8C=89=E9=92=AE=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E7=BB=9F=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/news/_course_news.html.erb |  4 ++--
 public/stylesheets/application.css   |  2 +-
 public/stylesheets/nyan.css          | 24 ++++++++++++++++++++----
 3 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/app/views/news/_course_news.html.erb b/app/views/news/_course_news.html.erb
index f66def486..346fff8b4 100644
--- a/app/views/news/_course_news.html.erb
+++ b/app/views/news/_course_news.html.erb
@@ -74,10 +74,10 @@
       <%= labelled_form_for @news, :url => course_news_index_path(@course),
                             :html => {:id => 'news-form', :multipart => true} do |f| %>
           <%= render :partial => 'news/course_form', :locals => {:f => f, :is_new => true} %>
-          <%= link_to l(:button_create), "#", :onclick => 'submitNews();', :onmouseover => 'submitFocus(this);', :class => 'whiteButton m3p10' %>
+          <%= link_to l(:button_create), "#", :onclick => 'submitNews();', :onmouseover => 'submitFocus(this);', :class => 'ButtonColor m3p10' %>
           <%#= preview_link preview_news_path, 'news-form', target='preview', {:class => 'whiteButton m3p10'} %>
 
-          <%= link_to l(:button_cancel), "#", :onclick => '$("#add-news").hide()', :class => 'whiteButton m3p10' %>
+          <%= link_to l(:button_cancel), "#", :onclick => '$("#add-news").hide()', :class => 'ButtonColor m3p10' %>
       <% end if @course %>
       <div id="preview" class="wiki"></div>
     </div>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index d0d71c50d..710a404dc 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -1898,7 +1898,7 @@ input#time_entry_comments { width: 90%;}
 fieldset.settings label { display: block; }
 fieldset#notified_events .parent { padding-left: 20px; }
 
-span.required {color: #bb0000;}
+span.required {color: #bb0000;margin-right: 4px;}
 .summary {font-style: italic;}
 
 #attachments_fields input.description {margin-left:4px; width:100px; }
diff --git a/public/stylesheets/nyan.css b/public/stylesheets/nyan.css
index def79d53b..27e8a367e 100644
--- a/public/stylesheets/nyan.css
+++ b/public/stylesheets/nyan.css
@@ -15,7 +15,7 @@ span[id^=valid_user] {
 }
 
 .red {
-    color: red;
+    color: red;margin-left: 10px;margin-right: 10px;text-align: right;
 }
 
 .green {
@@ -474,6 +474,19 @@ body {
     position: relative;
     top: 1px;
 }
+input[class~='ButtonClolr'],.ButtonColor{
+    color: #fffbff !important;
+    padding-bottom: 5px;
+    width: 40px;
+    height: 20px;
+    font-family: '微软雅黑',Arial,Helvetica,sans-serif;
+    font-size: 15px;
+
+    padding: 0px;
+    background: #15bccf;
+    border: 1px solid #15bccf;
+
+}
 
 input[class~='whiteButton'], .whiteButton {
     -moz-box-shadow: inset 0px 1px 0px 0px #ffffff;
@@ -493,9 +506,9 @@ input[class~='whiteButton'], .whiteButton {
     border: 1px solid #dcdcdc;
     display: inline-block;
     color: #666666;
-    color: #116699;
+    color: #fffbff;
     font-family: arial;
-    font-size: 15px;
+    font-size: 20px;
     font-weight: bold;
     padding: 6px 24px;
     /*padding:3px 10px;*/
@@ -513,13 +526,14 @@ input[class~='whiteButton']:hover, .whiteButton:hover {
     background: linear-gradient(to bottom, #f6f6f6 5%, #ffffff 100%);
     filter: progid:DXImageTransform.Microsoft.gradient(startColorstr = '#f6f6f6', endColorstr = '#ffffff', GradientType = 0);
     text-decoration: none;
-    background-color: #f6f6f6;
+    background-color: #09bbff;
 }
 
 input[class~='whiteButton']:active, .whiteButton:active {
     position: relative;
     top: 1px;
     text-decoration: none;
+    color: #ffffff;
 }
 
 input[class~='m3p10'], .m3p10 {
@@ -527,6 +541,8 @@ input[class~='m3p10'], .m3p10 {
     padding: 3px 10px;
     height: 20px;
     display: inline-block;
+    text-align: center;
+    color: #ffffff;
 }
 
 input[class~='h30'], .h30 {