CAMP/edgware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

css changes merged

Browse Source
This commit is contained in:
Sanj 2011-07-04 18:40:33 +05:30
commit 751f9cac45
2 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
edgware/static/css/files/upload.css
View File

@ -1,7 +1,8 @@
#categoryHelp { #categoryHelp {
padding:10px 0px 5px 100px; padding:18px 0px 5px 100px;
font-size:14px; font-size:14px;
color: #298A08; color: #154e6f;
font-style:italic;
} }
#categoryForm { #categoryForm {
@ -15,7 +16,6 @@ font-size:14px;
float:left; float:left;
} }
#addFilesWrapper { #addFilesWrapper {
display: none; display: none;
padding:18px 0px 18px 100px; padding:18px 0px 18px 100px;
@ -23,19 +23,19 @@ padding:18px 0px 18px 100px;
#uploadInstructions { #uploadInstructions {
font-size:14px; font-size:14px;
color: #298A08; color: #154e6f;
margin-bottom: 10px; margin-bottom: 10px;
} }
#uploadingTo { #uploadingTo {
margin-bottom: 10px; margin-bottom: 10px;
} font-style:italic;}
.uploading { .uploading {
width: 446px; width: 446px;
border-width: 2px; border-width: 2px;
border-style: dashed; border-style: ridge;
border-color: #298A08; border-color: #3b240b;
padding: 5px; padding: 5px;
font-size: 14px; font-size: 14px;
margin-bottom: 5px; margin-bottom: 5px;
@ -43,8 +43,7 @@ margin-bottom: 5px;
.uploaded { .uploaded {
width: 450px; width: 450px;
background-color: #298A08; padding:10px;
padding:5px;
font-size:14px; font-size:14px;
margin-bottom:5px; margin-bottom:5px;
background: #3b240b; /* Old browsers */ background: #3b240b; /* Old browsers */
@ -52,15 +51,12 @@ background: -moz-linear-gradient(top, #3b240b 0%, #207cca 52%, #7db9e8 100%); /*
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#3b240b), color-stop(52%,#207cca), color-stop(100%,#7db9e8)); /* Chrome,Safari4+ */ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#3b240b), color-stop(52%,#207cca), color-stop(100%,#7db9e8)); /* Chrome,Safari4+ */
background: -webkit-linear-gradient(top, #3b240b 0%,#207cca 52%,#7db9e8 100%); /* Chrome10+,Safari5.1+ */ background: -webkit-linear-gradient(top, #3b240b 0%,#207cca 52%,#7db9e8 100%); /* Chrome10+,Safari5.1+ */
background: linear-gradient(top, #3b240b 0%,#207cca 52%,#7db9e8 100%); /* W3C */ background: linear-gradient(top, #3b240b 0%,#207cca 52%,#7db9e8 100%); /* W3C */
color:#FFF;} color:#FFF;
border-radius:14px;}
.fileDesc
{margin-left:4px;}
.formHelp .formHelp
{font-weight:bold; {font-weight:bold;
padding-top:6px; padding-top:6px;}
padding-left:6px;}
.fileForm button .fileForm button
{float:right; {float:right;
@ -86,9 +82,14 @@ font-size: 12px;
#filesList { #filesList {
margin-top: 15px; margin-top: 15px;
margin-bottom:5px; margin-bottom:5px;}
}
.saved
{padding-left:7px;
font-size:12px;
display:block;
padding-top:5px;
float:left;}
.fileForm { .fileForm {
overflow: hidden; overflow: hidden;
@ -98,14 +99,14 @@ width: 100%;
.fileTitle { .fileTitle {
float: bottom; float: bottom;
width: 170px; width: 170px;
margin-left: 5px; margin-left: 6px;
margin-bottom: 10px; margin-bottom: 10px;
} }
.fileDesc { .fileDesc {
float: left; float: left;
width: 250px; width: 250px;
margin-right:5px; margin-right:8px;
} }
#uploadStudy { #uploadStudy {

2
edgware/templates/upload_files.html
View File

@ -92,7 +92,7 @@ $(function() {
Uploading to: <span id="uploadStudy"></span> Uploading to: <span id="uploadStudy"></span>
</div> </div>
<div id="uploadInstructions"> <div id="uploadInstructions">
Select one or multiple files, or just drag any number of files from your computer into this browser window to upload. You can then view them <a href="http://edgwareroad.org/sandbox/archive">here</a>. Select one or multiple files, or just drag any number of files from your computer into this browser window to upload. View them <a href="http://edgwareroad.org/sandbox/archive">here</a>.
</div> </div>
<form id="addFile" action="/files/add" method="POST" enctype="multipart/form-data"> <form id="addFile" action="/files/add" method="POST" enctype="multipart/form-data">
<input id="files_category" name="files_category" type="hidden" /> <input id="files_category" name="files_category" type="hidden" />