From 0a8f3faf6aaab8506450880dfc76ebc2777c0a44 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 30 Apr 2015 09:02:33 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81project.css=E9=94=99=E8=AF=AF?=
=?UTF-8?q?=E4=BB=A3=E7=A0=81=202=E3=80=81=E9=A1=B9=E7=9B=AE=E4=B8=8A?=
=?UTF-8?q?=E4=BC=A0=E8=B5=84=E6=BA=90=E5=BC=B9=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/files/_project_file_new.html.erb | 2 +-
public/stylesheets/project.css | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/app/views/files/_project_file_new.html.erb b/app/views/files/_project_file_new.html.erb
index f71783ba2..e94e27784 100644
--- a/app/views/files/_project_file_new.html.erb
+++ b/app/views/files/_project_file_new.html.erb
@@ -5,7 +5,7 @@
$('#ajax-modal').html('<%= escape_javascript(render :partial => 'upload_show_project',:locals => {:project => project}) %>');
showModal('ajax-modal', '513px');
$('#ajax-modal').siblings().remove();
- $('#ajax-modal').before("")
+ $('#ajax-modal').before("");
$('#ajax-modal').parent().css("top","40%").css("left","30%");
$('#ajax-modal').parent().addClass("popbox_polls");
}
diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css
index 4f9c6ec78..27a32b18a 100644
--- a/public/stylesheets/project.css
+++ b/public/stylesheets/project.css
@@ -222,7 +222,7 @@ a:hover.ping_sub{ background:#14a8b9;}
/*.ping_distop span a{ float:right; width:20px; height:20px; background:url(images/star.png) -24px 0 no-repeat; margin-right:3px;}*/
/*上传资源弹出框样式*/
-/*#popbox_polls{width:300px;height:100px;position:fixed !important;z-index:100;left:50%;top:50%;margin:-100px 0 0 -150px; background:#fff; -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px; box-shadow:0px 0px 8px #194a81; overflow:auto;}*/
+.popbox_polls{position:fixed !important;}
.upload_con h2{ display:block; background:#eaeaea; font-size:14px; color:#343333; height:31px; width: auto; margin-top:25px; padding-left:20px; padding-top:5px;}
.upload_box{ width:430px; margin:15px auto;}
@@ -338,7 +338,7 @@ a:hover.st_add{ color:#ff8e15;}
.newpro_box input{ height:26px; float:left; margin-bottom:10px;}
.newpro_box textarea{ height:150px; float:left; margin-bottom:10px;}
.newpro_box select{ height:29px; float:left; margin-bottom:10px;}
-.label{ width:80px; text-align:right; font-size:14 background-image: url(../images/true.png); }
+.label{ width:80px; text-align:right; font-size:14px; background-image: url(../images/true.png); }
.icon-reload { background-image: url(../images/reload.png); }
.icon {
background-position: 0% 50%;
@@ -433,7 +433,7 @@ span.add_attachment a {padding-left:16px; background: url(../images/bullet_add.p
/*日历选择图*/
img.ui-datepicker-trigger {
display:block;
- background:url(/images/public_icon.png) -31px 0 no-repeat;
+ background:url(../images/public_icon.png) -31px 0 no-repeat;
cursor: pointer;
vertical-align: middle;
margin-left: 5px;