From 787dbaaffc89fd9b6c128ace4bab61aaeeb017f0 Mon Sep 17 00:00:00 2001 From: Tim Date: Thu, 5 May 2016 09:08:01 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81=E5=A4=84?= =?UTF-8?q?=E6=96=87=E5=AD=97=E6=A0=B7=E5=BC=8F=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/organizations/_org_subfield_rightM.html.erb | 8 ++++---- public/stylesheets/org2.css | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/views/organizations/_org_subfield_rightM.html.erb b/app/views/organizations/_org_subfield_rightM.html.erb index 8c090f833..a07b724d2 100644 --- a/app/views/organizations/_org_subfield_rightM.html.erb +++ b/app/views/organizations/_org_subfield_rightM.html.erb @@ -38,7 +38,7 @@ <% else %> <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "104", :height => "104"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class => "fl sn-index-wximg" %> <% end %> -

<%=link_to message.content.to_s.html_safe, board_message_url_in_org(message.board.id, message.id), :target => "_blank" %>

+

<%=link_to message.content.to_s.html_safe, board_message_url_in_org(message.board.id, message.id), :target => "_blank" %>

<% else %> @@ -50,7 +50,7 @@ <% else %> <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "104", :height => "104"), board_message_path(message.board, activity), :target => "_blank", :class => "fl sn-index-wximg" %> <% end %> -

<%=link_to message.content.to_s.html_safe, board_message_path(message.board, activity), :target => "_blank" %>

+

<%=link_to message.content.to_s.html_safe, board_message_path(message.board, activity), :target => "_blank" %>

<% end %> @@ -65,7 +65,7 @@ <% else %> <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "104", :height => "104"), news_path(news), :target => "_blank", :class => "fl sn-index-wximg" %> <% end %> -

<%=link_to news.description.to_s.html_safe, news_path(news), :target => "_blank" %>

+

<%=link_to news.description.to_s.html_safe, news_path(news), :target => "_blank" %>

<% end %> @@ -76,7 +76,7 @@

<%= field.name %>

-

暂无内容！

+

暂无内容！

diff --git a/public/stylesheets/org2.css b/public/stylesheets/org2.css index 9de2bf56f..52dde9ad4 100644 --- a/public/stylesheets/org2.css +++ b/public/stylesheets/org2.css @@ -157,7 +157,7 @@ a.more-btn{ display:block; width:185px; height:30px; text-align:center; backgrou /* index-wx*/ .sn-index-wxbox{margin-bottom:20px; background:#fff;} .sn-index-wximg{ margin:15px; margin-right:5px;} -.sn-index-txt{ font-size:16px; line-height:2.0; margin-top:30px;} +.sn-index-txt{ font-size:16px; line-height:2.0; margin-top:30px; max-height:64px; overflow:hidden;} .sn-index-smallbanner img{ display:block; width:369px; height:169px; } /* 内页新闻列表 */ From c3514f5b6aed49f65eda626b76b014490c581d5c Mon Sep 17 00:00:00 2001 From: Tim Date: Thu, 5 May 2016 09:28:49 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BA=8C=E7=BA=A7=E6=A0=8F=E7=9B=AE?= =?UTF-8?q?=E5=90=8D=E9=95=BF=E5=BA=A6=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/organizations/_subfield_sub_domains_list.html.erb | 2 +- public/stylesheets/org.css | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/organizations/_subfield_sub_domains_list.html.erb b/app/views/organizations/_subfield_sub_domains_list.html.erb index 20bd31ede..f68d06c1e 100644 --- a/app/views/organizations/_subfield_sub_domains_list.html.erb +++ b/app/views/organizations/_subfield_sub_domains_list.html.erb @@ -12,7 +12,7 @@
  • -
    <%= subdomain.name %>
    +
    <%= subdomain.name %>
    diff --git a/public/stylesheets/org.css b/public/stylesheets/org.css index cfee8e0c2..34025aa73 100644 --- a/public/stylesheets/org.css +++ b/public/stylesheets/org.css @@ -87,6 +87,7 @@ a.linkGrey8:hover {color:#585858;} .orgSubTree {width:20px; height:31px; background:url(/images/org_tree.png) 0 0 no-repeat; float:left; margin-left:30px;} .orgSubTree2 {width:20px; height:31px; background:url(/images/org_tree.png) 0 -45px no-repeat; float:left; margin-left:30px;} .orgSubColumn {width:100px; float:left;} +.subColumnControl {width:90px; max-width:90px; margin-right:10px; float:left; white-space:nowrap; overflow:hidden; text-overflow:ellipsis;} .personalUrl {border:1px solid #dddddd; width:75px; outline:none; white-space:nowrap; padding-left:2px;} .reCon{ margin:5px; width:710px;} .retop{width:710px; height:40px; background:#eaeaea; padding:5px;}