From c024bb5e58d0b5606b0a2b4249e27bee50bc4c5e Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Fri, 18 Sep 2015 13:52:16 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E7=B3=BB=E7=BB=9F=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E6=A0=B7=E5=BC=8F=EF=BC=8C=E6=94=BE=E5=9C=A8applicati?= =?UTF-8?q?on.css=E4=B8=AD=EF=BC=9B=202.=E4=BF=AE=E6=94=B9=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E6=8F=90=E7=A4=BA=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/admin/messages.html.erb | 1 - public/stylesheets/application.css | 4 ++++ public/stylesheets/new_user.css | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/views/admin/messages.html.erb b/app/views/admin/messages.html.erb index ba6407ef5..2e9de264f 100644 --- a/app/views/admin/messages.html.erb +++ b/app/views/admin/messages.html.erb @@ -1,5 +1,4 @@ <%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' %> -<%= stylesheet_link_tag "project","public"%>

<%=l(:label_system_message)%>


diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 8fdb26ffc..4e99182a6 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -9,6 +9,10 @@ h4, .wiki h3 {font-size: 13px;} h4 {border-bottom: 1px dotted #bbb;} li{list-style-type:none;} /*huang*/ + +.hwork_input_news{ border:1px solid #64bdd9; height:22px; width:594px; background:#fff; margin-bottom:10px; padding:5px;} +.ml55{ margin-left:55px;} +.fl {float:left;} /*current position*/ .contest_count{ width: 20%; diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index e54a1ba5e..a7bc0a691 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -985,7 +985,7 @@ img.ui-datepicker-trigger { margin-bottom: 3px; } .message_title{border: 1px solid #9C9C9C;padding: 0.6em;margin-left: 1.4em;margin-right: 0.4em;border-radius: 4px;font-family: "Microsoft YaHei";background-size: 100% 100%;margin-bottom: 5px;background-color: #fff; max-width:400px;word-wrap:break-word; word-break:break-all;} -.message_title_red{border: 1px solid Red;padding: 0.6em;margin-left: 1.4em;margin-right: 0.4em;color:Red;border-radius: 4px;font-family: "Microsoft YaHei";background-size: 100% 100%;margin-bottom: 5px;background-color: #fff;background-image: -moz-linear-gradient(top, #fff, #E0E0E0);} +.message_title_red{border: 1px solid #484848;padding: 0.6em;margin-left: 1.4em;margin-right: 0.4em;border-radius: 4px;font-family: "Microsoft YaHei";background-size: 100% 100%;margin-bottom: 5px;background-color: #fff;background-image: -moz-linear-gradient(top, #fff, #E0E0E0);} .description{display: none !important;} .ispublic-label{display: none !important;}