From f59593cc1c4ce15520729cd8ea2752fe4ee729c4 Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Tue, 20 Oct 2015 10:22:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E6=A0=A1=E4=BF=A1=E6=81=AF=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=A0=B7=E5=BC=8F=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/school/upload_logo.html.erb | 2 +-
 public/stylesheets/application.css    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/school/upload_logo.html.erb b/app/views/school/upload_logo.html.erb
index 96b577f46..01071fb81 100644
--- a/app/views/school/upload_logo.html.erb
+++ b/app/views/school/upload_logo.html.erb
@@ -61,7 +61,7 @@ function showPreview(source) {
         </select>
       </div>
       <div style="margin-top: 10px;">
-        <input type="button" value="提交" onclick="submit_edit_school($(this));" class="mr5 submit_btn" />
+        <input type="button" value="提交" onclick="submit_edit_school($(this));" class="mr5 submit_btn_s" />
         <input type="button" value="取消" onclick="history.go(-1);" class="cancel_btn" />
         <%#= submit_tag('提交',:class=>'mr5') %>
         <%#= submit_tag('取消') %>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 6c6227ed4..dbc91353b 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -12,8 +12,8 @@ li{list-style-type:none;}
 /*Tim 151019*/
 .schoolName {border:1px solid #dddddd; outline: none; width: 180px; height: 22px;}
 .provinceSelect {border: 1px solid #dddddd; outline: none; color: #888888;}
-.submit_btn {background-color: #269ac9; color: #ffffff; padding: 2px 5px; border: none; border-radius: 3px; cursor: pointer;}
-.submit_btn:hover {background-color:#297fb8;}
+.submit_btn_s {background-color: #269ac9; color: #ffffff; padding: 2px 5px; border: none; border-radius: 3px; cursor: pointer;}
+.submit_btn_s:hover {background-color:#297fb8;}
 .cancel_btn {background-color: #c1c1c1; color: #ffffff; padding: 2px 5px; border: none; border-radius: 3px; cursor: pointer;}
 .cancel_btn:hover {background-color:#656565; }
 /*huang*/