From bf36da8dcb0e8611566240d7715b250161207863 Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 8 Apr 2015 09:57:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=86=92=E7=9B=AE=E6=96=B0?= =?UTF-8?q?=E9=97=BB=E6=96=B0=E5=BB=BA=E9=A1=B5=E9=9D=A2=20=E9=80=80?= =?UTF-8?q?=E5=87=BA=E9=A1=B9=E7=9B=AE=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/watchers_helper.rb | 2 +- app/views/layouts/base_projects.html.erb | 4 +- public/stylesheets/pleft.css | 1 + public/stylesheets/project.css | 5 + public/stylesheets/public.css | 174 +++++++++++++++++------ 5 files changed, 142 insertions(+), 44 deletions(-) diff --git a/app/helpers/watchers_helper.rb b/app/helpers/watchers_helper.rb index 38e42553b..af08fe1d3 100644 --- a/app/helpers/watchers_helper.rb +++ b/app/helpers/watchers_helper.rb @@ -304,7 +304,7 @@ module WatchersHelper def exit_project_link(project) link_to(l(:label_exit_project),exit_cur_project_path(project.id), :remote => true, :confirm => l(:lable_sure_exit_project), - :class => "pr_join_a" ) + :class => "pr_join_a_quit" ) end #项目关注、取消关注 diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index 358f90a5e..9e003b3a8 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -122,10 +122,10 @@
<%= link_to l(:label_issue_tracking), project_issues_path(@project), :class => "f14 c_blue02" %> <% unless @project.issues.count == 0 %> - (<%= @project.issues.count %>) + (<%= @project.issues.count %>) <% end %> <% if User.current.member_of?(@project) %> - <%= link_to "+"+l(:label_release_issue), new_project_issue_path(@project) , :class => "subnav_green" %> + <%= link_to "+"+l(:label_release_issue), new_project_issue_path(@project) , :class => "subnav_green" %> <% end %>
<% end %> diff --git a/public/stylesheets/pleft.css b/public/stylesheets/pleft.css index 54330ebae..4a6ecc5bf 100644 --- a/public/stylesheets/pleft.css +++ b/public/stylesheets/pleft.css @@ -8,6 +8,7 @@ .pr_info_logo:hover{ border:1px solid #64bdd9; } .pr_info_join{} a.pr_join_a{ color:#fff; display:block; padding:0 5px 0 3px; padding-top:2px; height:20px; margin-right:5px; float:left; text-align:center; background-color:#64bdd9; float:left; } +a.pr_join_a_quit{ color:#fff; display:block; padding:0 2px 0 3px; padding-top:2px; height:20px; margin-right:5px; float:left; text-align:center; background-color:#64bdd9; float:left; } a:hover.pr_join_a{ background:#41a8c8;} .pr_join_span{color: #fff; display:block; padding:0 5px; padding-top:2px; height:20px; margin-right:5px; float:left; text-align:center; background: #CCC;} .pr_setting{ display:block; background:url(../images/leftside.png) -1px 0 no-repeat; width:11px; height:11px; margin-top:3px; float:left; } diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css index 55be9cd4d..62c370b43 100644 --- a/public/stylesheets/project.css +++ b/public/stylesheets/project.css @@ -243,3 +243,8 @@ a.link_file_board{ background:url(../images/pic_file.png) 0 3px no-repeat !impor #course_member_pagination_links{height: auto;float: left;} #course_member_pagination_links li{margin-bottom: 5px;} + +/*新闻*/ +.hwork_new{ color:#4c4c4c;} +.hwork_text{ border:1px solid #64bdd9; height:100px;width:555px; background:#fff; margin-left:5px; padding:5px; margin-bottom:10px;} +.hwork_input{ border:1px solid #64bdd9; height:22px; width:555px; background:#fff; margin-bottom:10px; padding:5px;} \ No newline at end of file diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css index f4130aaf8..8f2563168 100644 --- a/public/stylesheets/public.css +++ b/public/stylesheets/public.css @@ -8,49 +8,21 @@ a:link,a:visited{color:#7f7f7f;text-decoration:none;} a:hover,a:active{color:#000;} /*常用*/ -select,input,textarea{ border:1px solid #64bdd9; background:#fff; color:#000; padding-left:5px; } -.sub_btn{ cursor:pointer; -moz-border-radius:3px; -webkit-border-radius:3px; border:1px solid #707070; color:#000; border-radius:3px; padding:1px 10px; margin-bottom:10px; background:#dbdbdb;} -.sub_btn:hover{ background:#b5e2fa; color:#000; border:1px solid #3c7fb1;} -table{ background:#fff;} -.more{ font-weight:normal; color:#999; font-size:12px;} -.no_line{ border-bottom:none;} -.no_border{ border:none;} - -/* font & color */ -h2{ font-size:18px; color:#15bccf;} -h3{ font-size:14px; color:#e8770d;} -h4{ font-size:14px; color:#3b3b3b;} -.f12{font-size:12px; font-weight:normal;} -.f14{font-size:14px;} -.f16{font-size:16px;} -.f18{font-size:18px;} -.fb{font-weight:bold;} -.lh20{line-height:20px;} -.lh22{line-height:22px;} -.lh24{line-height:24px;} -.lh26{line-height:26px;} -.fmYh{font-family:"MicroSoft Yahei";} -.font999{ color:#999;} -.fontRed{color:#770000;} - -/* Float & Clear */ .cl{ clear:both; overflow:hidden; } -.fl{float:left;display:inline;} -.fr{float:right;display:inline;} +.fl{ float: left;} +.fr{ float:right;} .f_l{ float:left;} .f_r{ float:right;} -.clearfix:after{clear:both;content:".";display:block;font-size:0;height:0;line-height:0;visibility:hidden} -.clearfix{clear:both;zoom:1} - -/* Spacing */ .ml2{ margin-left:2px;} +.ml3{ margin-left:3px;} +.ml4{ margin-left:4px;} .ml5{ margin-left:5px;} +.ml8{ margin-left:8px;} .ml10{ margin-left:10px;} .ml15{ margin-left:15px;} .ml20{ margin-left:20px;} -.ml40{ margin-left:40px;} .ml45{ margin-left:45px;} -.ml55 { margin-left:55px;} +.ml55{ margin-left:55px;} .ml30{ margin-left:30px;} .ml60{ margin-left:60px;} .ml80{ margin-left:80px;} @@ -66,12 +38,10 @@ h4{ font-size:14px; color:#3b3b3b;} .mb5{ margin-bottom:5px;} .mb10{ margin-bottom:10px;} .pl15{ padding-left:15px;} -.w150{ width:150px;} .w280{ width:280px;} .w430{ width:470px;} .w520{ width:520px;} .w557{ width:557px;} -.w583{ width:583px;} .w350{ width:350px;} .w610{ width:610px;} .w600{ width:600px;} @@ -79,11 +49,14 @@ h4{ font-size:14px; color:#3b3b3b;} .h50{ height:50px;} .h150{ height:150px;} -/* Font & background Color */ +h2{ font-size:18px; color:#15bccf;} +h3{ font-size:14px; color:#e8770d;} +h4{ font-size:14px; color:#3b3b3b;} + a.b_grey{ background: #F5F5F5;} a.b_dgrey{ background: #CCC;} -a.c_orange{color:#ff5722;} -a:hover.c_orange{color: #d33503;} +a.c_orange{color:#e8770d;} +a:hover.c_orange{color: #F30;} a.c_lorange{color:#ff9900;} a:hover.c_lorange{color:#fff;} a.c_blue{ color:#15bccf;} @@ -102,6 +75,10 @@ a:hover.c_blue02{color: #0781b4;} a.c_red{ color:#F00;} a:hover.c_red{ color: #C00;} +.f14{ font-size:14px;} +.fb{ font-weight:bold;} +.f12{ font-size:12px; font-weight:normal;} + .b_grey{ background: #F5F5F5;} .b_dgrey{ background: #CCC;} .c_orange{color:#e8770d;} @@ -114,7 +91,6 @@ a:hover.c_red{ color: #C00;} .b_green{background:#28be6c;} .b_w{ background:#fff;} -/* commonBtn */ .grey_btn{ background:#d9d9d9; color:#656565;font-size:14px; font-weight:normal; text-align:center;padding:2px 10px;} a.grey_btn{ background:#d9d9d9; color:#656565;font-size:14px; font-weight:normal; text-align:center;padding:2px 10px;} a:hover.grey_btn{ background:#717171; color:#fff;} @@ -130,6 +106,14 @@ a:hover.blue_btn{ background:#329cbd;} .pic_sch{ display:block; background:url(../images/public_icon.png) -31px -195px no-repeat; width:16px; height:15px; float:left;} +.more{ font-weight:normal; color:#999; font-size:12px;} +.no_line{ border-bottom:none;} + +select,input,textarea{ border:1px solid #ccc; background:#fff; color:#999; padding-left:5px;} +.sub_btn{ cursor:pointer; -moz-border-radius:3px; -webkit-border-radius:3px; border:1px solid #ccc; color:#999; border-radius:3px; padding:2px 10px; margin-bottom:10px;} +.sub_btn:hover{ background:#999; color:#fff; } +table{ background:#fff;} + /*框架主类容*/ #Container{ width:940px; margin:0 auto; } @@ -167,7 +151,7 @@ div#menu ul ul a.parent {background: url(../images/item.png) -20px 6px no-repea div#menu ul ul a.parent:hover {background: url(../images/item.png) -20px -11px no-repeat;} /* menu::level1 */ div#menu a { padding: 5px 12px 0 10px;line-height: 30px; color: #fff;} -div#menu li { background: url(images/main-delimiter.png) 98% 4px no-repeat; } +/*div#menu li { background: url(../images/main-delimiter.png) 98% 4px no-repeat; }*/ div#menu li.last { background: none; } /* menu::level2 */ div#menu ul ul li { background: none; } @@ -180,6 +164,7 @@ div#menu ul ul li {width: 100%;} div#menu ul ul ul {padding: 0;margin: -38px 0 0 92px !important; width:140px; } div#menu ul ul ul li a{ width:125px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;color:#15bccf;} + /*主类容*/ #Main{ background:#fff; margin-bottom:10px;} #content{} @@ -232,6 +217,113 @@ a:hover.close_btn {background-position:-66px 0;} .show_btn {background-position:-119px 0;} .msgserver a {color:#15bccf; } .msgserver a:hover { text-decoration:underline; } +.break_word{word-break: break-all;word-wrap: break-word;} +/***** Ajax indicator ******/ +#ajax-indicator { + position: absolute; /* fixed not supported by IE */ + background-color:#eee; + border: 1px solid #bbb; + top:35%; + left:40%; + width:20%; + font-weight:bold; + text-align:center; + padding:0.6em; + z-index:100000; + opacity: 0.5; +} + +html>body #ajax-indicator { position: fixed; } + +#ajax-indicator span { + background-position: 0% 40%; + background-repeat: no-repeat; + background-image: url(../images/loading.gif); + padding-left: 26px; + vertical-align: bottom; +} + +div.modal { + border-radius: 5px; + background: #fff; + z-index: 50; + padding: 4px; +} +.ui-widget-content { + border: 1px solid #ddd; + color: #333; +} +.ui-widget { + font-family: Verdana, sans-serif; + font-size: 1.1em; +} +.ui-dialog .ui-dialog-content { + position: relative; + border: 0; + padding: .5em 1em; + background: none; + overflow: auto; + zoom: 1; +} +.ui-widget-overlay { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; +} +.ui-widget-overlay { + background: #666 url(http://forge.trustie.net/stylesheets/jquery/images/xui-bg_diagonals-thick_20_666666_40x40.png.pagespeed.ic.9mfuw_R0z1.png) 50% 50% repeat; + opacity: .5; + filter: Alpha(Opacity=50); +} +/***** end Ajax indicator ******/ + +/***** Flash & error messages ****/ +#errorExplanation, div.flash, .nodata, .warning, .conflict { + padding: 4px 4px 4px 30px; + margin-bottom: 12px; + font-size: 1.1em; + border: 2px solid; +} + +div.flash {margin-top: 8px;} + +div.flash.error, #errorExplanation { + background: url(../images/exclamation.png) 8px 50% no-repeat; + background-color: #ffe3e3; + border-color: #dd0000; + color: #880000; +} + +div.flash.notice { + background: url(../images/true.png) 8px 5px no-repeat; + background-color: #dfffdf; + border-color: #9fcf9f; + color: #005f00; +} + +div.flash.warning, .conflict { + background: url(../images/warning.png) 8px 5px no-repeat; + background-color: #FFEBC1; + border-color: #FDBF3B; + color: #A6750C; + text-align: left; +} + +.nodata, .warning { + text-align: center; + background-color: #FFEBC1; + border-color: #FDBF3B; + color: #A6750C; +} + +#errorExplanation ul { font-size: 0.9em;} +#errorExplanation h2, #errorExplanation p { display: none; } + +.conflict-details {font-size:80%;} +/***** end Flash & error messages ****/ + /*弹出框*/ .black_overlay{display:none;position:fixed;top:0px;left:0px;width:100%;height:100%;background-color:black;z-index:1001;-moz-opacity:0.8;opacity:.80;filter:alpha(opacity=80);} .white_content{display:none;position:fixed;top:15%;left:30%;width:420px;height: auto; margin-bottom:20px;padding:16px;border:3px solid #15bccf;background-color:white;z-index:1002;overflow:auto;}