From 94c4afd6dedef36960acd09b70053e4afaeab869 Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 18 Nov 2016 20:11:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/static_base.html.erb | 2 +- public/stylesheets/css/common.css | 50 -------------------------- public/stylesheets/css/project.css | 15 ++++---- 3 files changed, 9 insertions(+), 58 deletions(-) diff --git a/app/views/layouts/static_base.html.erb b/app/views/layouts/static_base.html.erb index e0b8b468f..ff0e30414 100644 --- a/app/views/layouts/static_base.html.erb +++ b/app/views/layouts/static_base.html.erb @@ -7,7 +7,7 @@ <%= csrf_meta_tag %> <%= favicon %> - <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', 'nyan','prettify', :media => 'all' %> + <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', 'nyan','prettify','css/project', :media => 'all' %> <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %> <%= javascript_heads %> <%= javascript_include_tag "jquery.leanModal.min",'prettify' %> diff --git a/public/stylesheets/css/common.css b/public/stylesheets/css/common.css index 7bf923a5c..bbc85f3ce 100644 --- a/public/stylesheets/css/common.css +++ b/public/stylesheets/css/common.css @@ -731,56 +731,6 @@ a:hover.hw_btn_blue,a:active.hw_btn_blue{ background: #3b94d6; color:#fff;} #popupWrap ul{cursor: default;} .bg_checked{background-color: #64bdd9;} -/* 缺陷列表 */ -.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;} -.issues_con{ width:718px; padding:15px; border:1px solid #ddd; background-color:#fff; color:#444; } -.issues_statistics{ line-height:35px;} -.issues_statistics ul li{ float:left; } -.issues_statistics ul li a{ font-size:12px; margin:5px; color:#888; } -.issues_statistics ul li a.act{} - - -.issues_form_filter select{ width:84px; height:35px; font-size:14px; border:1px solid #c8c8c8; border-right:none; background-color:#fff; margin-bottom: 10px; color: #888;} -.issues_form_filter input{ height:33px;width:91px; border:1px solid #c8c8c8;background-color:#fff;} -.issues_form_filter select:focus,.issues_form_filter input:focus{border:1px solid #c8c8c8; border-right:none;} -.issues_form_filter select{appearance:none;-moz-appearance:none;-webkit-appearance:none; background: url("../images/project/arrow.png") no-repeat scroll right center transparent;} -input.issues_calendar_input{ padding-left:5px; color:#444; border-right:none;} -.issues_data_img{ display:block; width:25px; height:33px; border:1px solid #c8c8c8; border-left:none; background: url("../images/public_icon.png") -29px 9px no-repeat; } -/* 缺陷Tab */ -.issues_con_list{border:1px solid #c8c8c8; } -#issues_list_nav {border-bottom:1px solid #d0d0d0;} -#issues_list_nav li {float:left; padding:10px 15px; text-align:center; } -#issues_list_nav li a{font-size:12px; color:#444;} -.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; } -.issues_form_filter select:focus,.issues_form_filter input:focus{border:none; } -.issues_filter_data input{height:28px;width:91px; border:1px solid #c8c8c8;background-color:#fff;} -.issues_form_filter select{appearance:none;-moz-appearance:none;-webkit-appearance:none; background: url("/images/new_project/arrow.png") no-repeat scroll right center transparent;} -.issues_form_filter select.my_issues_filter{ background:none; width:50px; margin-left: 10px;margin-right: 10px;} -input.issues_calendar_input{ padding-left:5px; color:#444; border-right:none;} -.issues_data_img{ display:block; width:25px; height:28px; border:1px solid #c8c8c8; border-left:none; background: url("../images/public_icon.png") -29px 9px no-repeat; } - -.issues_list_box{ padding:15px; padding-right: 0px; border-bottom:1px dashed #c8c8c8;} -.issues_list_titlebox{ font-size:14px; font-weight:bold; margin-bottom:8px;} -a.issues_list_title{ color:#444; max-width:260px; overflow:hidden; text-overflow:ellipsis; -o-text-overflow:ellipsis; white-space:nowrap; } -a:hover.issues_list_title{color:#3b94d6;} -.issues_list_titlebox span{ font-size: 12px;color: #888; font-weight: normal; } -.issues_ciricons_01{ width: 22px; height: 22px; display: inline-block; background: url("/images/new_project/icons_issue.png") 0 0 no-repeat;} -.issues_ciricons_02{ width: 22px; height: 22px; display: inline-block; background: url("/images/new_project/icons_issue.png") 0 -30px no-repeat;} -.issues_icons_mes{width: 17px; height: 17px; display: inline-block; background: url("/images/new_project/icons_issue.png") 0 -57px no-repeat; } -.issues_list_name{ font-size: 12px;} -.issues_list_name:hover{ color: #3b94d6;} -.issues_list_small{ font-size: 12px; color: #666;} -.issues_list_txt li{ height: 50px; line-height: 50px; float: left; font-size: 12px; width: 70px; text-align: center; overflow:hidden; text-overflow:ellipsis; -o-text-overflow:ellipsis; white-space:nowrap;} -.issues_list_txt li.issues_list_min{ width: 50px;} - /* 搜索 与课程相同 */ .hw_search_box{ position:relative; } diff --git a/public/stylesheets/css/project.css b/public/stylesheets/css/project.css index 0617b48d3..4ccaab242 100644 --- a/public/stylesheets/css/project.css +++ b/public/stylesheets/css/project.css @@ -742,14 +742,15 @@ a:hover.hw_btn_blue,a:active.hw_btn_blue{ background: #3b94d6; color:#fff;} .issues_statistics ul li a{ font-size:12px; margin:5px; color:#888; } .issues_statistics ul li a.act{} + .issues_form_filter select{ width:84px; height:35px; font-size:14px; border:1px solid #c8c8c8; border-right:none; background-color:#fff; margin-bottom: 10px; color: #888;} .issues_form_filter input{ height:33px;width:91px; border:1px solid #c8c8c8;background-color:#fff;} .issues_form_filter select:focus,.issues_form_filter input:focus{border:1px solid #c8c8c8; border-right:none;} -.issues_form_filter select{appearance:none;-moz-appearance:none;-webkit-appearance:none; background: url("/images/new_project/arrow.png") no-repeat scroll right center transparent;} +.issues_form_filter select{appearance:none;-moz-appearance:none;-webkit-appearance:none; background: url("../images/project/arrow.png") no-repeat scroll right center transparent;} input.issues_calendar_input{ padding-left:5px; color:#444; border-right:none;} -.issues_data_img{ display:block; width:25px; height:33px; border:1px solid #c8c8c8; border-left:none; background:url("/images/public_icon.png") -29px 9px no-repeat; } +.issues_data_img{ display:block; width:25px; height:33px; border:1px solid #c8c8c8; border-left:none; background: url("../images/public_icon.png") -29px 9px no-repeat; } /* 缺陷Tab */ -.issues_con_list{border:1px solid #dbdbdb; } +.issues_con_list{border:1px solid #c8c8c8; } #issues_list_nav {border-bottom:1px solid #d0d0d0;} #issues_list_nav li {float:left; padding:10px 15px; text-align:center; } #issues_list_nav li a{font-size:12px; color:#444;} @@ -764,12 +765,13 @@ input.issues_calendar_input{ padding-left:5px; color:#444; border-right:none;} .issues_form_filter select:focus,.issues_form_filter input:focus{border:none; } .issues_filter_data input{height:28px;width:91px; border:1px solid #c8c8c8;background-color:#fff;} .issues_form_filter select{appearance:none;-moz-appearance:none;-webkit-appearance:none; background: url("/images/new_project/arrow.png") no-repeat scroll right center transparent;} +.issues_form_filter select.my_issues_filter{ background:none; width:50px; margin-left: 10px;margin-right: 10px;} input.issues_calendar_input{ padding-left:5px; color:#444; border-right:none;} -.issues_data_img{ display:block; width:25px; height:28px; border:1px solid #c8c8c8; border-left:none; background: url("/images/public_icon.png") -27px 7px no-repeat; } +.issues_data_img{ display:block; width:25px; height:28px; border:1px solid #c8c8c8; border-left:none; background: url("../images/public_icon.png") -29px 9px no-repeat; } .issues_list_box{ padding:15px; padding-right: 0px; border-bottom:1px dashed #c8c8c8;} .issues_list_titlebox{ font-size:14px; font-weight:bold; margin-bottom:8px;} -a.issues_list_title{ color:#444; max-width:380px; overflow:hidden; text-overflow:ellipsis; -o-text-overflow:ellipsis; white-space:nowrap; } +a.issues_list_title{ color:#444; max-width:260px; overflow:hidden; text-overflow:ellipsis; -o-text-overflow:ellipsis; white-space:nowrap; } a:hover.issues_list_title{color:#3b94d6;} .issues_list_titlebox span{ font-size: 12px;color: #888; font-weight: normal; } .issues_ciricons_01{ width: 22px; height: 22px; display: inline-block; background: url("/images/new_project/icons_issue.png") 0 0 no-repeat;} @@ -778,10 +780,9 @@ a:hover.issues_list_title{color:#3b94d6;} .issues_list_name{ font-size: 12px;} .issues_list_name:hover{ color: #3b94d6;} .issues_list_small{ font-size: 12px; color: #666;} -.issues_list_txt li{ height: 24px; line-height: 24px; float: left; font-size: 12px; width: 70px; text-align: center; overflow:hidden; text-overflow:ellipsis; -o-text-overflow:ellipsis; white-space:nowrap;} +.issues_list_txt li{ height: 50px; line-height: 50px; float: left; font-size: 12px; width: 70px; text-align: center; overflow:hidden; text-overflow:ellipsis; -o-text-overflow:ellipsis; white-space:nowrap;} .issues_list_txt li.issues_list_min{ width: 50px;} - /* 搜索 与课程相同 */ .hw_search_box{ position:relative; } .hw_search_box input.hw_search-input{ width:293px; height:28px; border:none; border:1px solid #e7e7e7; background:#fff; padding-left:5px;padding-right: 25px;}