From 005cd09d4ae6c4470f7776d236d21dbe4db1cadf Mon Sep 17 00:00:00 2001 From: Tim Date: Tue, 11 Oct 2016 14:58:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E7=BA=B2=E4=B8=AD=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E7=A7=BB=E5=88=B0common.css=E4=B8=AD?= =?UTF-8?q?=EF=BC=9Bproject.css=E4=B8=AD=E9=83=A8=E5=88=86=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E5=8E=BB=E9=87=8D=EF=BC=9B=E7=BF=BB=E9=A1=B5=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=E7=81=B0=E8=89=B2=E8=BE=B9=E7=BA=BF=EF=BC=9B=E5=A4=A7?= =?UTF-8?q?=E7=BA=B2=E9=A1=B9=E7=9B=AE=E5=85=AC=E7=94=A8=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E6=8F=90=E5=8F=96=E5=88=B0public.css=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/css/common.css | 69 +++++++++++++- public/stylesheets/css/courses.css | 2 - public/stylesheets/css/project.css | 141 +---------------------------- public/stylesheets/css/public.css | 34 +++---- public/stylesheets/sy_public.css | 70 -------------- public/stylesheets/syllabus.css | 7 +- 6 files changed, 85 insertions(+), 238 deletions(-) diff --git a/public/stylesheets/css/common.css b/public/stylesheets/css/common.css index defbdbed1..7503e2320 100644 --- a/public/stylesheets/css/common.css +++ b/public/stylesheets/css/common.css @@ -530,7 +530,43 @@ a:hover.BlueCirBtn{ background:#3598db; color:#fff;} a.BlueCirBtnMini{ display:block;width:40px; height:24px; background-color:#ffffff; line-height:24px; vertical-align:middle; text-align:center; border:1px solid #3598db; color:#3598db; -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px;} a:hover.BlueCirBtnMini{ background:#3598db; color:#fff;} -/*20160725 项目申请按钮*/ +/* 按钮*/ +a.btn_orange_big{ + display:inline-block; + border: 1px solid #ee4a1f; + color: #ee4a1f; + text-align: center; + font-size: 14px; + padding:0 10px; + height: 30px; + line-height: 30px; + -webkit-border-radius:3px; + -moz-border-radius:3px; + -o-border-radius:3px; + border-radius:3px; +} +a:hover.btn_orange_big{ + background: #ee4a1f; + color: #fff; +} +a.btn_green_big{ + display:inline-block; + border: 1px solid #60b25e; + color: #60b25e; + text-align: center; + font-size: 14px; + padding:0 10px; + height: 30px; + line-height: 30px; + -webkit-border-radius:3px; + -moz-border-radius:3px; + -o-border-radius:3px; + border-radius:3px; +} +a:hover.btn_green_big{ + background: #60b25e; + color: #fff; +} a.sy_btn_grey{ display:inline-block; color: #333; @@ -561,6 +597,37 @@ a.sy_btn_blue{ border-radius:3px; } a:hover.sy_btn_blue{ background: #2788d0;} +a.sy_btn_green{ + display:inline-block; + color: #fff; + background: #60b25e; + text-align: center; + font-size: 12px; + padding:0 15px; + height: 30px; + line-height: 30px; + -webkit-border-radius:3px; + -moz-border-radius:3px; + -o-border-radius:3px; + border-radius:3px; +} +a:hover.sy_btn_green{ background: #51a74f;} +a.hw_btn_blue{ + display: inline-block; + color: #3b94d6; + border:1px solid #3b94d6; + background:#fff; + text-align: center; + font-size: 12px; + padding:0 15px; + height: 30px; + line-height: 30px; + -webkit-border-radius:3px; + -moz-border-radius:3px; + -o-border-radius:3px; + border-radius:3px; +} +a:hover.hw_btn_blue,a:active.hw_btn_blue{ background: #3b94d6; color:#fff;} /* commonpic */ .pic_date{ display:block; background:url(/images/public_icon.png) -31px 0 no-repeat; width:16px; height:15px; } .pic_add{ display:block; background:url(/images/public_icon.png) -31px -273px no-repeat; width:16px; height:15px; } diff --git a/public/stylesheets/css/courses.css b/public/stylesheets/css/courses.css index a21633e44..cd6c8b9e8 100644 --- a/public/stylesheets/css/courses.css +++ b/public/stylesheets/css/courses.css @@ -8,8 +8,6 @@ .HomeWork {width:718px; background-color:#ffffff; padding:15px; border:1px solid #dddddd; float:right;} .RightBanner {font-size:16px; width:733px; color:#4b4b4b; padding:10px 0 0 15px; margin-bottom:10px; background:#fff; border:1px solid #dddddd;height:34px;} select.InputBox,input.InputBox,textarea.InputBox{ border:1px solid #d9d9d9; color:#888888; height:28px; line-height:28px; padding-left:5px; font-size:14px;} -/*a.AnnexBtn{ background: url(../images/homepage_icon.png) 0px -343px no-repeat; width:70px; height:20px; display:block; padding-left:20px; color:#888888;}*/ -/*a:hover.AnnexBtn{background: url(../images/homepage_icon.png) -90px -343px no-repeat; color:#3598db;}*/ a.FilesBtn{ background: url(../images/homepage_icon.png) 0px -373px no-repeat; width:38px; height:20px; display:block; padding-left:20px; color:#888888;} a:hover.FilesBtn{background: url(../images/homepage_icon.png) -89px -372px no-repeat; color:#3598db;} a.ProBtn{background: url(../images/homepage_icon.png) -86px -396px no-repeat; width:30px; height:20px; display:block; padding-left:20px; color:#888888;} diff --git a/public/stylesheets/css/project.css b/public/stylesheets/css/project.css index 44b607b3b..fe10650ce 100644 --- a/public/stylesheets/css/project.css +++ b/public/stylesheets/css/project.css @@ -678,109 +678,12 @@ a.syllabusbox_a_blue{ .syllabus_info_tishi a{ color:#3b94d6; } -.homepagePostSettingIcon {background:url(../images/homepage_icon.png) -93px -5px no-repeat; width:20px; height:20px; } .homepagePostSettiongText {width:75px; line-height:2; font-size:12px; color:#616060; background-color:#ffffff; border:1px solid #eaeaea; border-radius:3px; position:absolute; left:-48px; top:20px; padding:5px 0px; display:none;} -.homepagePostSettingIcon:hover {background:url(../images/homepage_icon.png) -93px -44px no-repeat;} a.AnnexBtn{ background: url(../images/homepage_icon.png) 0px -343px no-repeat !important; height:20px; display:block; padding-left:20px; color:#888888; -moz-transition :all 0s linear 0s; -webkit-transition :all 0s linear 0s; -o-transition:all 0s linear 0s; transition:all 0s linear 0s;} a:hover.AnnexBtn{background: url(../images/homepage_icon.png) -90px -343px no-repeat !important; color:#3598db; -moz-transition :all 0s linear 0s; -webkit-transition :all 0s linear 0s; -o-transition:all 0s linear 0s; transition:all 0s linear 0s;} a.BlueCirBtnMini{ display:block;width:40px; height:22px; background-color:#ffffff; line-height:24px; vertical-align:middle; text-align:center; border:1px solid #3b94d6; color:#3b94d6; -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px;} a:hover.BlueCirBtnMini{ background:#3b94d6; color:#fff;} -/* 按钮 复制课程大纲*/ -a.btn_orange_big{ - border: 1px solid #ee4a1f; - color: #ee4a1f; - text-align: center; - font-size: 14px; - padding:0 10px; - height: 30px; - line-height: 30px; - -webkit-border-radius:3px; - -moz-border-radius:3px; - -o-border-radius:3px; - border-radius:3px; -} -a:hover.btn_orange_big{ - background: #ee4a1f; - color: #fff; -} -a.btn_green_big{ - border: 1px solid #60b25e; - color: #60b25e; - text-align: center; - font-size: 14px; - padding:0 10px; - height: 30px; - line-height: 30px; - -webkit-border-radius:3px; - -moz-border-radius:3px; - -o-border-radius:3px; - border-radius:3px; -} -a:hover.btn_green_big{ - background: #60b25e; - color: #fff; -} -a.sy_btn_green{ - display: inline-block; - color: #fff; - background: #60b25e; - text-align: center; - font-size: 12px; - padding:0 15px; - height: 30px; - line-height: 30px; - -webkit-border-radius:3px; - -moz-border-radius:3px; - -o-border-radius:3px; - border-radius:3px; -} -a:hover.sy_btn_green{ background: #51a74f;} -a.sy_btn_grey{ - color: #333; - background: #e1e1e1; - text-align: center; - font-size: 12px; - padding:0 15px; - height: 30px; - line-height: 30px; - -webkit-border-radius:3px; - -moz-border-radius:3px; - -o-border-radius:3px; - border-radius:3px; -} -a:hover.sy_btn_grey{ background: #c3c3c3;} -a.sy_btn_blue{ - color: #fff; - background: #3b94d6; - text-align: center; - font-size: 12px; - padding:0 15px; - height: 30px; - line-height: 30px; - -webkit-border-radius:3px; - -moz-border-radius:3px; - -o-border-radius:3px; - border-radius:3px; -} -a:hover.sy_btn_blue{ background: #2788d0;} -a.hw_btn_blue{ - display: inline-block; - color: #3b94d6; - border:1px solid #3b94d6; - background:#fff; - text-align: center; - font-size: 12px; - padding:0 15px; - height: 30px; - line-height: 30px; - -webkit-border-radius:3px; - -moz-border-radius:3px; - -o-border-radius:3px; - border-radius:3px; -} -a:hover.hw_btn_blue,a:active.hw_btn_blue{ background: #3b94d6; color:#fff;} - /* 缺陷列表 */ .issues_greycirbg_btn{ background-color:#dedede; padding:1px 5px;-webkit-border-radius:3px;-moz-border-radius:3px;-o-border-radius:3px;border-radius:3px; } .issues_greycirbg_btn:hover{background-color:#cbcbcb;} @@ -805,8 +708,6 @@ input.issues_calendar_input{ padding-left:5px; color:#444; border-right:none;} .issues_nav_hover{border-bottom:3px solid #3498db; font-weight:bold; } .issues_nav_nomall {border-bottom:none; } .issues_nav_tag{ background-color:#eaeaea; padding:2px 8px;-webkit-border-radius:15px;-moz-border-radius:15px;-o-border-radius:15px;border-radius:15px; font-size:12px;} -.undis {display:none;} -.dis {display:block;} .issues_form_filter{ position: absolute; top:0; right: 0;} .issues_form_filter select{ width:70px; height:30px; border:none; font-size:14px; border:none;border-right:none; color: #888; font-size: 12px; line-height: 30px; padding-right:10px;} .issues_form_filter select.issues_filter_select_min{width:50px; } @@ -837,48 +738,8 @@ a:hover.issues_list_title{color:#3b94d6;} .hw_search_box a.hw_btn_search{display:block; width:20px; height:20px; background:url(/images/hw/icons_hw.png) 0 -57px no-repeat; position:absolute; right:5px; top:5px; cursor:pointer;} .hw_search_box a:hover.hw_btn_search{background:url(/images/hw/icons_hw.png) -40px -57px no-repeat;} .hw_files_icon{display:block; width:17px; height:14px; background:url(/images/hw/icons_hw.png) 0 -135px no-repeat;} -/* 编辑删除 与课程相同 */ -.sy_icons_edit{ display: inline-block; padding:9px;background:url(/images/sy/sy_icons02.png) 0 1px no-repeat; } -.sy_icons_del{ padding:9px;background:url(/images/sy/sy_icons02.png) 0 -21px no-repeat;} -.sy_icons_edit:hover{ background:url(/images/sy/sy_icons02.png) -20px 1px no-repeat; } -.sy_icons_del:hover{ background:url(/images/sy/sy_icons02.png) -20px -21px no-repeat;} -/* 翻页 与课程相同*/ -.pages a{ - display:block; - border:1px solid #d1d1d1; - color:#888; - float:left; - width:30px; - text-align:center; - padding:3px 0; - line-height:1.9; - margin-right:5px; -} -.pages a:hover{ - background-color:#3b94d6; - border:1px solid #3b94d6; - color:#fff; -} -a.pages-big{ - width:50px; -} -.pages .active{ - background-color:#3b94d6; - border:1px solid #3b94d6; - color:#fff; -} -.pages{ - width:330px; - margin:20px auto 10px; -} -.sy_corange{ color: #ee4a1f;} -.sy_new_orange{font-size: 12px;padding: 0 5px;border-radius: 3px;line-height: 14px;color: #ff4a1b;border: 1px solid #ff4a1b;} -.sy_cgrey{ color: #888;} -a.sy_cgrey{ color: #888;} -.sy_corange{ color: #ee4a1f;} -a.sy_corange{ color: #ee4a1f;} -a.sy_cblue{ color: #3b94d6;} + /* 新增粉色关注按钮*/ a.sy_btn_pink{ display: inline-block; diff --git a/public/stylesheets/css/public.css b/public/stylesheets/css/public.css index 514139513..8aded437c 100644 --- a/public/stylesheets/css/public.css +++ b/public/stylesheets/css/public.css @@ -423,9 +423,6 @@ a.sortArrowActiveU {background:url(../images/post_image_list.png) -17px -20px no .postDate {color:#888888; font-size:12px;} .postStatics { margin-top:28px; color:#888888; float:right; text-align:center;} .slice {width:1px; height:25px; background-color:#d1d1d1; float:right; margin-top:35px; margin-right:20px;} -.pageRoll {float:right; border-left:1px solid #dddddd; margin-top:15px;} -.pageCell {border:1px solid #dddddd; border-width:1px 1px 1px 0px; padding:5px 12px; float:left; border-spacing:0px;} -.pageCellActive {background-color:#3498db;} .postCreateInput {width:963px; height:28px; border:1px solid #d9d9d9 !important; outline:none;} .upImg {padding:1px 6px; border: 1px solid #dddddd; margin-top:53px;} @@ -550,7 +547,7 @@ a:hover.st_img { border:1px solid #1c9ec7; } .searchContentDes {width:883px;} .searchTag {font-size:12px; color:#ffffff; background-color:#7ec8e4; height:16px; min-height:16px; max-height:16px; float:left; line-height:16px; padding:0px 3px;} .numRed {color:#FF6600;} -.pageRoll {float:right; border-left:1px solid #dddddd; margin-top:15px;} +.pageRoll {float:right; margin-top:15px;} .pageCell {border:1px solid #dddddd; padding:5px 12px; float:left; margin-left:-1px; position:relative;} .pageCell:hover {border:1px solid #3498db; z-index:10;} .pageCellActive {background-color:#3498db; border:1px solid #3498db !important; position:relative; color:#ffffff;} @@ -1431,21 +1428,6 @@ a.syllabusbox_a_blue { margin-bottom:100px; color:#888; } -a.sy_btn_green{ - display:inline-block; - color: #fff; - background: #60b25e; - text-align: center; - font-size: 12px; - padding:0 15px; - height: 30px; - line-height: 30px; - -webkit-border-radius:3px; - -moz-border-radius:3px; - -o-border-radius:3px; - border-radius:3px; - } -a:hover.sy_btn_green{ background: #51a74f;} /*资源提示框*/ .resource_tip_box {position:absolute; padding:5px 10px; white-space:nowrap; background-color:#fff; right:-150px; top:20px; box-shadow:0px 2px 8px rgba(146, 153, 169, 0.5);} @@ -1461,3 +1443,17 @@ a:hover.sy_btn_green{ background: #51a74f;} .flex-container {display:flex;} .flex-cell {flex:1;} .flex-cell:last-child {text-align:right;} + +/*新课程、项目公用样式提取*/ +.sy_new_orange{font-size: 12px;padding: 0 5px;border-radius: 3px;line-height: 14px;color: #ff4a1b;border: 1px solid #ff4a1b;} +.sy_cgrey{ color: #888;} +a.sy_cgrey{ color: #888;} +.sy_corange{ color: #ee4a1f;} +a.sy_corange{ color: #ee4a1f;} +a.sy_cblue{ color: #3b94d6;} + +/* 编辑删除 */ +.sy_icons_edit{ display: inline-block; padding:9px;background:url(/images/sy/sy_icons02.png) 0 1px no-repeat; } +.sy_icons_del{ padding:9px;background:url(/images/sy/sy_icons02.png) 0 -21px no-repeat;} +.sy_icons_edit:hover{ background:url(/images/sy/sy_icons02.png) -20px 1px no-repeat; } +.sy_icons_del:hover{ background:url(/images/sy/sy_icons02.png) -20px -21px no-repeat;} diff --git a/public/stylesheets/sy_public.css b/public/stylesheets/sy_public.css index adfce90bb..dfd806746 100644 --- a/public/stylesheets/sy_public.css +++ b/public/stylesheets/sy_public.css @@ -1,16 +1,11 @@ /* 字体颜色 */ .sy_cblack{ color: #333;} -.sy_cgrey{ color: #888;} -.sy_corange{ color: #ee4a1f;} .sy_f14{ font-size: 14px;} .sy_f16{ font-size: 16px;} a:hover.sy_cgrey{ color:#ee4a1f;} -a.sy_corange{ color: #ee4a1f; } a:hover.sy_corange{ text-decoration:underline;} -a.sy_cblue{ color: #3b94d6;} a.sy_cblack{ color: #333;} a:hover.sy_cblack{color: #3b94d6;} -a.sy_cgrey{ color: #888;} a.sy_cmore{ font-size:12px; color:#888; font-weight:normal;} a:hover.sy_cmore{color: #ee4a1f;} /* 题库新增*/ @@ -72,72 +67,7 @@ a:hover.hw_corange{ color: #e1412b;} .hw_cir_lgreen{ background:#7ecfa2;} .hw_w20{ width:20px; display:block; text-align:center;} .hw_w30{ width:30px; display:block; text-align:center;} -/* 按钮*/ -a.btn_orange_big{ - display:inline-block; - border: 1px solid #ee4a1f; - color: #ee4a1f; - text-align: center; - font-size: 12px; - padding:0 10px; - height: 30px; - line-height: 30px; - -webkit-border-radius:3px; - -moz-border-radius:3px; - -o-border-radius:3px; - border-radius:3px; -} -a:hover.btn_orange_big{ - background: #ee4a1f; - color: #fff; -} -a.btn_green_big{ - display:inline-block; - border: 1px solid #60b25e; - color: #60b25e; - text-align: center; - font-size: 14px; - padding:0 10px; - height: 30px; - line-height: 30px; - -webkit-border-radius:3px; - -moz-border-radius:3px; - -o-border-radius:3px; - border-radius:3px; -} -a:hover.btn_green_big{ - background: #60b25e; - color: #fff; -} -/*a.sy_btn_grey{*/ - /*color: #333;*/ - /*background: #e1e1e1;*/ - /*text-align: center;*/ - /*font-size: 12px;*/ - /*padding:0 15px;*/ - /*height: 30px;*/ - /*line-height: 30px;*/ - /*-webkit-border-radius:3px;*/ - /*-moz-border-radius:3px;*/ - /*-o-border-radius:3px;*/ - /*border-radius:3px;*/ -/*}*/ -/*a:hover.sy_btn_grey{ background: #c3c3c3;}*/ -/*a.sy_btn_blue{*/ - /*color: #fff;*/ - /*background: #3b94d6;*/ - /*text-align: center;*/ - /*font-size: 12px;*/ - /*padding:0 15px;*/ - /*height: 30px;*/ - /*line-height: 30px;*/ - /*-webkit-border-radius:3px;*/ - /*-moz-border-radius:3px;*/ - /*-o-border-radius:3px;*/ - /*border-radius:3px;*/ -/*}*/ -/*a:hover.sy_btn_blue{ background: #2788d0;}*/ /* 排序 */ .sy_category{ height: 50px; diff --git a/public/stylesheets/syllabus.css b/public/stylesheets/syllabus.css index 12f3ecb6c..14ca4ceda 100644 --- a/public/stylesheets/syllabus.css +++ b/public/stylesheets/syllabus.css @@ -624,7 +624,7 @@ a:hover.sy_class_ltitle{ color:#333;} .hw_tab_top{ height: 50px; line-height: 50px; padding-left: 15px; border-bottom:1px solid #ddd; border-left:3px solid #3b94d6; } /*20160918教师团队*/ -.sy_new_tablebox{ padding:15px; padding-bottom:none;} +.sy_new_tablebox{ padding:15px; padding-bottom:0;} .sy_new_table{ width:100%; background:#fff; border:1px solid #e5e5e5;} .sy_new_table thead tr{ height:40px; line-height:40px;} .sy_new_table thead tr th{ border-bottom:1px solid #e5e5e5;} @@ -634,7 +634,6 @@ a:hover.sy_class_ltitle{ color:#333;} .sy_new_tchlist li{ height:30px; line-height:30px;} .sy_new_search{-webkit-border-radius:3px;-moz-border-radius:3px;-o-border-radius:3px;border-radius:3px; border:1px solid #d3d3d3; background:#fff; padding-left:5px; color:#888; height:32px; width:370px;box-shadow: inset 0px 0px 3px #dcdcdc; } .sy_new_tchbox{ background:#f5f5f5; padding:15px; margin:15px; margin-top:0px;} -.sy_new_orange{font-size: 12px;padding: 0 5px;border-radius: 3px;line-height: 14px;color: #ff4a1b;border: 1px solid #ff4a1b;} .sy_new_namebox{ width:180px; overflow:hidden;} .sy_new_name{ display:block;max-width:120px; overflow:hidden;white-space: nowrap; text-overflow:ellipsis;} .sy_new_long_name{ display:block;width:180px; overflow:hidden;white-space: nowrap; text-overflow:ellipsis;} @@ -647,10 +646,6 @@ a:hover.sy_class_ltitle{ color:#333;} .sy_class_r_more{ display: block;} .sy_class_fenban{border: 1px solid #e7e7e7; background-color: #fff; padding:15px;} .sy_fenban_input{ height: 28px; background-color: #fff; border: 1px solid #d1d1d1;-webkit-border-radius:3px;-moz-border-radius:3px;-o-border-radius:3px;border-radius:3px; border:1px solid #d3d3d3;padding-left:5px; color:#888; box-shadow: inset 0px 0px 5px #dcdcdc; } -.sy_icons_edit{ display: inline-block; padding:9px;background:url(../images/sy/sy_icons02.png) 0 1px no-repeat; } -.sy_icons_del{ padding:9px;background:url(../images/sy/sy_icons02.png) 0 -21px no-repeat;} -.sy_icons_edit:hover{ background:url(../images/sy/sy_icons02.png) -20px 1px no-repeat; } -.sy_icons_del:hover{ background:url(../images/sy/sy_icons02.png) -20px -21px no-repeat;} .sy_icons_tips{padding:9px;background:url(../images/sy/sy_icons02.png) 0 -66px no-repeat;} .sy_sortupbtn{display: inline-block; width:15px; height:18px;background:url(../images/sy/sy_icons02.png) 0 -39px no-repeat;} .sy_sortdownbtn{display: inline-block; width:15px; height:18px;background:url(../images/sy/sy_icons02.png) -22px -39px no-repeat;}