From 9bbf658fdbff940a6a5968a516fc257972029a80 Mon Sep 17 00:00:00 2001 From: suntao <719450423@qq.com> Date: Wed, 2 Sep 2015 10:51:46 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E6=A1=86=E6=A0=B7?= =?UTF-8?q?=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/boards/_course_show.html.erb | 12 ++++++------ public/stylesheets/courses.css | 13 ++++++++----- public/stylesheets/new_user.css | 6 ++++-- 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/app/views/boards/_course_show.html.erb b/app/views/boards/_course_show.html.erb index b8bbf3d63..f117acd7f 100644 --- a/app/views/boards/_course_show.html.erb +++ b/app/views/boards/_course_show.html.erb @@ -37,7 +37,7 @@ <% @topics.each do |topic| %>
<%= link_to image_tag(url_to_avatar(topic.author), :width=>"42",:height=>"42"), user_path(topic.author),:class =>'talkmain_pic fl' %> -
+
<% author = topic.author.to_s %>
<%= link_to User.current.member_of_course?(@board.course) ? "#{topic.author.show_name}(#{topic.author.login})" : "#{topic.author}" , user_path(topic.author), @@ -48,7 +48,7 @@

  <%= h(topic.subject) %>

<% if topic.course_editable_by?(User.current) %> - <%= l(:button_edit) %> <% end %> @@ -120,7 +120,7 @@ <%= l(:label_activity_time)%>：  <%= format_time topic.created_on %>
- <%= l(:button_reply) %> + <%= l(:button_reply) %>
@@ -171,7 +171,7 @@

- <%= format_time(message.created_on) %> + <%= format_time(message.created_on) %> <%= link_to( l(:button_delete), @@ -179,13 +179,13 @@ :method => :post, :data => {:confirm => l(:text_are_you_sure)}, :title => l(:button_delete), - :class => ' c_dblue fr f14' + :class => ' linkBlue fr f12' ) if message.course_destroyable_by?(User.current) %> <%= link_to( l(:button_reply), 'javascript:;', :nhname =>'showbtn_child_reply', - :class => ' c_dblue fr f14', + :class => ' linkBlue fr f12', :style => 'margin-right: 10px;', 'data-topic-id' =>message.id, :title => l(:button_reply)) if !topic.locked? && authorize_for('messages', 'reply') %> diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index d9d5bfd36..2171d9c59 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -1,3 +1,5 @@ +a.linkBlue {color:#269ac9;} +a.linkBlue:hover {color:#297fb8;} /*右侧内容--动态*/ .project_r_h{ width:670px; height:40px; background:#eaeaea; margin-bottom:10px;} @@ -78,8 +80,8 @@ a:hover.talk_btn{ background:#2a9dc1;} /****讨论区内页***/ .mt0{ margin-top:0px;} .talk_info{ color:#7d7d7d; margin-left:60px; margin-top:10px;} -a.talk_edit{ color:#426e9a; margin-right:5px;} -a:hover.talk_edit{ color:#ff5722;} +a.talk_edit{ color:#269ac9; margin-right:5px;} +a:hover.talk_edit{ color:#297fb8;} .talk_reply { background:#eeeeee; padding:10px; margin-bottom:10px;} .talkpage_text{ border:1px solid #64bdd9; width:600px; color:#7d7d7d; padding:5px; margin:10px 0 10px 50px; background:#fff;} /****新建讨论***/ @@ -355,7 +357,7 @@ a.link_file{ background:url(../images/pic_file.png) 0 2px no-repeat; padding-lef a:hover.link_file{ background:url(../images/pic_file.png) 0 -25px no-repeat; color:#3ca5c6;} .r_txt_tit{width:510px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;color:#15bccf; float:left; color:#09658c; font-size:14px;} -blockquote {background: #eeeeee;padding: 10px;margin-bottom: 10px;word-break: break-all;word-wrap: break-word;} +blockquote {background: #eeeeee;padding: 10px;margin-bottom: 5px;word-break: break-all;word-wrap: break-word;} .respond-form{display: none;margin: auto;clear: both;} .reply_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;display: block;margin-left: 470px;} @@ -494,8 +496,9 @@ blockquote { margin-right: 0.4em; border-radius: 4px; font-family: "Microsoft YaHei"; - background: url('../images/requirements/reference.jpg'); + /*background: url('../images/requirements/reference.jpg');*/ background-size: 100% 100%; + margin-top:5px; } a.member_search_edit {width: 43px;background: #15bccf;color: #fff;text-align: center;text-decoration: none;padding: 2px;} .min_search_edit {width: 150px;height: 20px;border: 1px solid #d0d0d0 !important;color: #666;} @@ -576,7 +579,7 @@ a:hover.icon_add{background:url(../stylesheets/images/icons.png) -20px -310px no .talkmain_pic{} a.talkmain_pic{ display:block; width:42px; height:42px; padding:2px; border:1px solid #e3e3e3;} a:hover.talkmain_pic{border:1px solid #64bdd9;} -.talkmain_txt{ width:610px; margin-left:10px; color:#333;} +.talkmain_txt{ width:610px; margin-left:10px; color:#888;} a.talkmain_name{ color:#ff5722;} a:hover.talkmain_name{ color:#d33503;} .talkmain_tit{ color:#0781b4; width:450px; display:block; } diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index fc0b908a4..9d1754a6f 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -286,7 +286,7 @@ a:hover.search_btn{ background: #0fa9bb;} /*.resources {width:730px; background-color:#ffffff; padding:10px;float: right}*/ .resourcesBanner {width:730px; height:40px; background-color:#eaeaea; margin-bottom:10px;} .bannerName {background:#64bdd9; color:#ffffff; height:40px; line-height:40px; width:90px; text-align:center; font-weight:normal; vertical-align:middle; font-size: 16px; float:left;} -.resourcesSelect {width:30px; height:34px; float:right; position:relative; margin-top:-6px;} +.resourcesSelect {width:30px; height:24px; float:right; position:relative; margin-top:-6px;} .resourcesSelected {width:25px; height:20px; position:relative; background:url(images/resource_icon_list.png) 0px 0px no-repeat;} .resourcesSelected:hover { background:url(images/resource_icon_list.png) 0px -25px no-repeat;} .resourcesIcon {margin-top:15px; display:block; width:25px; height:20px;} @@ -949,7 +949,9 @@ blockquote { margin-right: 0.4em; border-radius: 4px; font-family: "Microsoft YaHei"; - background: url('../images/requirements/reference.jpg'); + /*background: url('../images/requirements/reference.jpg');*/ background-size: 100% 100%; + margin-bottom:5px; + background-color: #eeeeee; } From c9d46f17f34a32f5e9869c37cdc006d21f9e0220 Mon Sep 17 00:00:00 2001 From: suntao <719450423@qq.com> Date: Wed, 2 Sep 2015 11:15:38 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=9B=9E=E5=A4=8Dblockquote=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/courses.css | 2 +- public/stylesheets/new_user.css | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index 2171d9c59..bc7f62aea 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -357,7 +357,7 @@ a.link_file{ background:url(../images/pic_file.png) 0 2px no-repeat; padding-lef a:hover.link_file{ background:url(../images/pic_file.png) 0 -25px no-repeat; color:#3ca5c6;} .r_txt_tit{width:510px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;color:#15bccf; float:left; color:#09658c; font-size:14px;} -blockquote {background: #eeeeee;padding: 10px;margin-bottom: 5px;word-break: break-all;word-wrap: break-word;} +blockquote {background: #e8e8e8;padding: 10px;margin-bottom: 5px;word-break: break-all;word-wrap: break-word;} .respond-form{display: none;margin: auto;clear: both;} .reply_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;display: block;margin-left: 470px;} diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 9d1754a6f..0da0c02fa 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -581,7 +581,7 @@ a.postOptionLink {color:#616060; display:block; width:55px; padding:0px 15px;} a.postOptionLink:hover {color:#ffffff; background-color:#269ac9;} .homepagePostReplyPortrait {float:left; width:45px;} .homepagePostReplyDes {float:left; width:595px; margin-left:15px;} -.homepagePostReplyPublisher {font-size:12px; color:#484848; margin-bottom:5px;} +.homepagePostReplyPublisher {font-size:12px; color:#888888; margin-bottom:5px;} .homepagePostReplyContent {font-size:12px; color:#484848; margin-bottom:12px;} .homepagePostProjectState {width:52px; height:20px; line-height:20px; border-radius:1px; background-color:#28be6c; color:#ffffff; text-align:center; vertical-align:middle; font-size:12px; display:inline-block; margin-left:5px;} .homepagePostAssignTo {float:left; font-size:14px; color:#269ac9;} @@ -952,6 +952,6 @@ blockquote { /*background: url('../images/requirements/reference.jpg');*/ background-size: 100% 100%; margin-bottom:5px; - background-color: #eeeeee; + background-color: #e8e8e8; }