From 13bf91f954244578275c9f7d02bee56ad314ebb1 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Sat, 22 Nov 2014 15:50:14 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E8=AF=BE=E7=A8=8B=E4=BD=9C?= =?UTF-8?q?=E4=B8=9A=E5=88=97=E8=A1=A8=E4=B8=AD=E3=80=81=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=E3=80=81=E5=85=B3=E9=97=AD=E5=8C=BF=E8=AF=84=E3=80=81=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E4=BD=9C=E4=B8=9A=E3=80=81=E7=BC=96=E8=BE=91=E7=AD=89?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E4=B8=8D=E8=A7=81=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=202.=E4=BF=AE=E6=94=B9=E5=8C=BF=E8=AF=84=E3=80=81=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E8=AF=84=E8=AE=BA=E7=9A=84=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/bids/_bid_homework_show.html.erb | 1 - db/schema.rb | 3 ++- public/stylesheets/css.css | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/bids/_bid_homework_show.html.erb b/app/views/bids/_bid_homework_show.html.erb index 8a6b276b3..c29b784b0 100644 --- a/app/views/bids/_bid_homework_show.html.erb +++ b/app/views/bids/_bid_homework_show.html.erb @@ -28,7 +28,6 @@ color: #fff; text-align: center; padding: 5px !important; - display: none; } .span_wping a:hover{ background-color:#03a1b3;} diff --git a/db/schema.rb b/db/schema.rb index 2e664eaa7..973e2afbe 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20141119011439) do +ActiveRecord::Schema.define(:version => 20141120091234) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false @@ -52,6 +52,7 @@ ActiveRecord::Schema.define(:version => 20141119011439) do t.string "disk_directory" t.integer "attachtype", :default => 1 t.integer "is_public", :default => 1 + t.integer "copy_from" end add_index "attachments", ["author_id"], :name => "index_attachments_on_author_id" diff --git a/public/stylesheets/css.css b/public/stylesheets/css.css index 19b68743a..b85b6ae73 100644 --- a/public/stylesheets/css.css +++ b/public/stylesheets/css.css @@ -42,7 +42,7 @@ a:hover.tb_all{ background:#eaeaea; text-decoration:none;} .dis ul li.wdown a{padding-top:25px; color:#3d7ec2; margin-right:35px;} .wscore{ padding-top:25px; color:#888888; width:96px;} .dis ul li.wping{margin-left:12px; } -.dis ul li.wping a{ margin-top:18px; margin-bottom:3px; width:43px; height:23px; background:#15bccf; color:#fff; text-align:center; padding-top:3px;} +.dis ul li.wping a{ margin-top:18px; margin-bottom:3px; width:43px; height:23px; background:#15bccf; color:#fff; text-align:center; padding-top:8px;} .dis ul li.wping a:hover{ background-color:#03a1b3;} ul.wlist{ float:right; border-bottom:none; height:30px; margin-top:20px;line-height: 1.9; } .wlist span{ border:1px solid #15bccf; padding:0 5px; margin-left:3px;} @@ -84,7 +84,7 @@ a.wzan_visited{background:url(images/pic_zan.png) 0 0 no-repeat;} .ping_star span a:hover{background:url(images/star.png) -24px 0 no-repeat;} .ping_con textarea{ height:76px; border:1px solid #15bccf; margin-bottom:5px; color:#666; font-size:12px;} a.ping_sub{ float:right; height:22px; width:60px; margin-right:20px; background:#15bccf; color:#fff; text-align:center;} -a.ping_sub1{ float:right; height:22px; width:60px; background:#15bccf; color:#fff; text-align:center;} +a.ping_sub1{ float:right; height:22px; width:60px; background:#15bccf; color:#fff; text-align:center;line-height: 1.9;} a:hover.ping_sub{ background:#14a8b9;} .recall{ border-top:1px solid #CCC; padding:5px 0;} .recall_head{ float:left;}