From d478b297cbcffd4b1465bfca6656e862d1de37f0 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Fri, 18 Aug 2017 15:24:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E9=85=8D=E7=BD=AE=E9=A1=B5?=
=?UTF-8?q?=E9=9A=90=E8=97=8F=E6=8F=90=E7=A4=BA=EF=BC=8Cicon=E7=A7=BB?=
=?UTF-8?q?=E5=85=A5=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/shixuns/_settings_edit.html.erb | 3 ++-
public/stylesheets/css/edu-common.css | 2 +-
public/stylesheets/css/taskstyle.css | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/app/views/shixuns/_settings_edit.html.erb b/app/views/shixuns/_settings_edit.html.erb
index 92ee39ea7..8d3de97fc 100644
--- a/app/views/shixuns/_settings_edit.html.erb
+++ b/app/views/shixuns/_settings_edit.html.erb
@@ -35,7 +35,7 @@
- 请选择适用课程
+ 请选择适用课程
@@ -120,6 +120,7 @@
} else {
$(".lesson_content").val($(".lesson_content").val() + "," + $(this).attr("data-val"));
}
+ $("#shixun_major_course_notice").hide();
event.stopPropagation();
} else {
var valueCon = $(".lesson_content").val().split(",");
diff --git a/public/stylesheets/css/edu-common.css b/public/stylesheets/css/edu-common.css
index 4bdd9bf43..14d51b024 100644
--- a/public/stylesheets/css/edu-common.css
+++ b/public/stylesheets/css/edu-common.css
@@ -48,7 +48,7 @@ textarea{resize: none;}
.color-orange03{color:#ff7500!important;}
.color-orange04{color: #ee4a20!important;}/*温馨提示公用颜色*/
.color-orange05{color: #FF9e6a!important;}
-a.color-orange05:hover{color:#ff7500!important;}
+a.color-orange05:hover,i.color-orange05:hover{color:#ff7500!important;}
.color-yellow{color:#f0ad4e!important;}
.color-yellow2{color:#ff9933!important;}
diff --git a/public/stylesheets/css/taskstyle.css b/public/stylesheets/css/taskstyle.css
index 2ee46028c..e4f9a186c 100644
--- a/public/stylesheets/css/taskstyle.css
+++ b/public/stylesheets/css/taskstyle.css
@@ -305,7 +305,7 @@ a.shixun-task-ban-btn{background-color: #c2c4c6;display: inline-block;font-weigh
.lesson_checkbox{display: none;position: absolute;top:40px;left: -1px;width: 100%;border:1px solid #eeeeee;background: #FFFFFF;padding-bottom: 5px;height: 150px;z-index: 10}
.lesson_checkbox li{height:20px;padding:5px 10px;clear:both;line-height:28px;margin-bottom: 0;}
.lesson_checkbox li input{float: left;margin: 3px 5px 0px 0px;}
-.lesson_content{height: 39px;border:none !important;width:100%;outline: none;padding-left: 0;}
+.lesson_content{height: 37px;border:none !important;width:97%;outline: none;padding-left: 0;}
/* 实训首页的搜索 */
.xy_box{padding:16px;height:180px}