merged css changes

This commit is contained in:
Sanj 2011-07-01 14:26:08 +05:30
commit 49874544c0
4 changed files with 135 additions and 46 deletions

View File

@ -1,3 +1,4 @@
#filterForm
{padding:18px;}
@ -7,7 +8,81 @@ padding-right:40px;
font-size:14px;
float:left;}
.previewObject a, a:link
.fileItem
{width:250px; /*is this width ok*/
text-align:justify;
overflow:hidden;
white-space:nowrap;
text-overflow:ellipsis;} /*I SUGGEST you have icon, checkbox and then text so a long filename wont bajao someone, FF7 only supports*/
#withSelected, #firstPage, #lastPage, #pageData
{font-size:12px;}
.fileItem
{font-size:12px;
padding-bottom:8px;
padding-left:18px;
cursor:pointer;
clear:both;}
.fileItem:hover
{color:#555353;}
.fileIcon
{margin-right:4px;}
.selectedItem
{background-color:#f4f3ba;}
.fileCheckbox
{padding-right:4px;} /*any way to change the bottom margin*/
#pageData
{padding-top:16px;
padding-left:16px;
font-style:italic;}
#firstPage
{cursor:pointer;
padding-top:18px;
padding-left:16px;
clear:both;
float:left;}
#prevBtn, #nextBtn
{font-size:14px;
cursor:pointer;
padding-top:18px;}
#prevBtn
{padding-left:16px;
float:left;}
#nextBtn
{padding-left:36px;
padding-right:18px;
float:left;}
#lastPage
{float:left;
cursor:pointer;
padding-top:18px;}
#withSelected
{padding-top:12px;
padding-left:16px;
clear:both;}
#em
{font-style:italic;}
#previewPane {
position:absolute;
left:350px;
top:154px;}
.previewObject a, .previewObject a:link
{text-decoration:none;
font-size:12px;
color:#555353;}
@ -21,42 +96,7 @@ color:#555353;}
.previewObject a:active
{color:#000;}
#prevBtn, #nextBtn
{font-size:16px;
cursor:pointer;}
#prevBtn
{padding-left:16px;
font-size:14px;
float:left;
clear:both;}
#nextBtn
{padding-left:40px;
font-size:14px;
float:left;}
.fileItem
.itemForm p span
{font-size:12px;
padding-bottom:8px;
padding-left:18px;
cursor:pointer;
clear:both;}
.fileItem:hover
{color:#555353;}
.fileIcon
{margin-right:4px;}
.selectedItem
{background-color:#f4f3ba;}
.fileCheckbox
{margin:0px 0 0px 4px;} /*any way to change the bottom margin*/
#previewPane {
position:absolute;
left:350px;
top:154px;}
padding-top:6px;
font-weight:bold;}

View File

@ -0,0 +1,44 @@
/* http://meyerweb.com/eric/tools/css/reset/
v2.0 | 20110126
License: none (public domain)
*/
html, body, div, span, applet, object, iframe,
h1, h2, h3, h4, h5, h6, p, blockquote, pre,
a, abbr, acronym, address, big, cite, code,
del, dfn, em, img, ins, kbd, q, s, samp,
small, strike, sub, sup, tt, var,
b, u, i, center,
dl, dt, dd, ol, ul, li,
fieldset, form, label, legend,
table, caption, tbody, tfoot, thead, tr, th, td,
article, aside, canvas, details, embed,
figure, figcaption, footer, header, hgroup,
menu, nav, output, ruby, section, summary,
time, mark, audio, video {
margin: 0;
padding: 0;
border: 0;
font-size: 100%;
font: inherit;
vertical-align: baseline;
}
/* HTML5 display-role reset for older browsers */
article, aside, details, figcaption, figure,
footer, header, hgroup, menu, nav, section {
display: block;
}
body {
line-height: 1;
}
ol, ul {
list-style: none;
}
blockquote, q {
quotes: none;
}
blockquote:before, blockquote:after,
q:before, q:after {
content: '';
content: none;
}

View File

@ -1,6 +1,7 @@
{% extends 'main_base.html' %}
{% block extra_head %}
<!-- <link rel="stylesheet" href="/static/css/reset.css" /> -->
<link rel="stylesheet" href="/static/css/files/browse.css" />
<script type="text/javascript" src="/static/js/files/browse.js"></script>
{% endblock %}
@ -19,19 +20,21 @@
<div id="fileWrapper">
<div id="fileList">
</div>
<div id="withSelected">
With Selected: <button id="deleteSelectedBtn">Delete</button>
or Move To:
<select id="moveSelectedSelect">
<option value="">...............</option>
</select>
</div>
<div id="pageData">
Results: <span id="noOfResults"></span>. Page <span id="currentPageNo"></span> of <span id="noOfPages"></span>
</div>
<div id="firstPage">First</div>
<div id="prevBtn">&lt;&lt;</div>
<div id="nextBtn">&gt;&gt;</div>
<div id="lastPage">Last</div>
<div id="withSelected">
Selected Items: <button id="deleteSelectedBtn">Delete</button>
&nbsp;&nbsp;<span id="em">OR</span> &nbsp;&nbsp;Move to:
<select id="moveSelectedSelect">
<option value="">...............</option>
</select>
</div>
</div>
</div>
<div id="previewPane">

View File

@ -1,5 +1,7 @@
{% extends 'base.html' %}
{% block head %}
<link rel="stylesheet" href="/static/css/fonts.css" />
<link rel="stylesheet" href="/static/css/main.css" />