From 5ed445e8a96167afa66d580573c5f317870ce3c6 Mon Sep 17 00:00:00 2001
From: wangning <164851225@qq.com>
Date: Mon, 19 Mar 2018 17:55:43 +0800
Subject: [PATCH] =?UTF-8?q?mondelay=20=20=E5=91=A8=E4=B8=8018=E7=82=B9?=
 =?UTF-8?q?=E4=B9=8B=E5=89=8D=E5=81=9C=E6=AD=A2=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/activity/mondelay/mondelay.html   | 8 ++++----
 .../ui/static/templates/activity/mondelay/mondelay.css    | 3 ---
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/main/resources/templates/activity/mondelay/mondelay.html b/src/main/resources/templates/activity/mondelay/mondelay.html
index c74da4a5b..8c0ff0c71 100644
--- a/src/main/resources/templates/activity/mondelay/mondelay.html
+++ b/src/main/resources/templates/activity/mondelay/mondelay.html
@@ -53,8 +53,8 @@
     </button>
 </div>
     <div class="button_center" th:if="${active && !apply}" id="applyButton">
-        <button th:class="${operation_pause}?'button_gray'" class="button_position">
-            <span style="color: #FFFFFF;">我要参加</span>
+        <button  class="button_position" th:style="'background-image:' + @{(${operation_pause} ? 'linear-gradient(0deg, #808080 0%, #808080 100%)' )} + ''">
+            <span style="color: #FFFFFF;" >我要参加</span>
         </button>
     </div>
     <div th:class="${apply}?'margin_top'" th:if="${list!=null}">
@@ -87,8 +87,8 @@
         </div>
     </div>
     <div class="button_center cancel_posttion"  th:if="${active && apply}" id="cancelButton">
-        <button th:class="${operation_pause}?'button_gray'" class="button_position button_color">
-            <span class="cancel">放弃活动资格</span>
+        <button class="button_position button_color" th:style="'background-image:' + @{(${operation_pause} ? 'linear-gradient(0deg, #808080 0%, #808080 100%)' )} + ''">
+            <span class="cancel" >放弃活动资格</span>
         </button>
     </div>
 
diff --git a/src/main/ui/static/templates/activity/mondelay/mondelay.css b/src/main/ui/static/templates/activity/mondelay/mondelay.css
index 7db5366f9..336638ac2 100644
--- a/src/main/ui/static/templates/activity/mondelay/mondelay.css
+++ b/src/main/ui/static/templates/activity/mondelay/mondelay.css
@@ -212,6 +212,3 @@ tbody tr:nth-child(odd){
     letter-spacing: 0px;
     padding: 0 8px;
 }
-.button_gray{
-    background-image: linear-gradient(0deg, #808080 0%, #808080 100%)
-}