merged css
This commit is contained in:
commit
39ad05ded2
|
@ -22,7 +22,7 @@ position:relative;
|
|||
}
|
||||
|
||||
#leftColumn
|
||||
{width:296px;
|
||||
{width:306px;
|
||||
background-color:#FFF;
|
||||
margin-top:-8px; /*had to give this because of shadow*/
|
||||
margin-bottom:20px;
|
||||
|
@ -97,7 +97,8 @@ outline:none;
|
|||
{font-size:14px;
|
||||
color:#ff8400;
|
||||
margin-top:6px;
|
||||
margin-left:8px;}
|
||||
margin-left:8px;
|
||||
}
|
||||
|
||||
#tabsInner li
|
||||
{list-style:none;
|
||||
|
@ -219,11 +220,11 @@ white-space:nowrap;
|
|||
width:100%;*/}
|
||||
|
||||
#listLeft ul
|
||||
{color:#979797; /*was originally f7bd00*/
|
||||
{/* color:#979797; /*was originally f7bd00*/
|
||||
font-family:'Arial Regular', Arial, Helvetica, sans-serif;
|
||||
font-size:14px;
|
||||
line-height:18px;
|
||||
font-weight:bold;
|
||||
/*font-weight:bold;*/
|
||||
list-style-image:url(/static/images/noel/disc.png);
|
||||
list-style-type:disc;
|
||||
list-style-position:outside;
|
||||
|
@ -261,26 +262,40 @@ box-shadow:inset -6px 0px 18px #eece98;
|
|||
cursor:pointer;}
|
||||
|
||||
#triangleUp
|
||||
{font-size:10px;
|
||||
{font-size:12px;
|
||||
color:#f7bd00;
|
||||
position:absolute;
|
||||
/*position:absolute;
|
||||
right:8px;
|
||||
top:-14px;
|
||||
cursor:pointer;}
|
||||
top:-14px;*/
|
||||
float:left;
|
||||
margin-bottom: 8px;
|
||||
cursor:pointer;
|
||||
margin-left:16px;
|
||||
/*position: absolute;
|
||||
top: 136px;
|
||||
left: 20px;*/
|
||||
font-weight:bold;}
|
||||
|
||||
#triangleDown
|
||||
{font-size:10px;
|
||||
{font-size:12px;
|
||||
color:#f7bd00;
|
||||
position:absolute;
|
||||
margin-right:16px;
|
||||
/*position:absolute;
|
||||
right:8px;
|
||||
bottom:-0px;
|
||||
cursor:pointer;} /*SANJ, see what happens to the list when i do ctrl minus, and the triangles as well*/
|
||||
bottom:-0px;*/
|
||||
cursor:pointer;
|
||||
font-weight:bold;
|
||||
float:right;
|
||||
margin-bottom: 8px;
|
||||
/*position: absolute;
|
||||
right:12px;
|
||||
top:130px;*/} /*SANJ, see what happens to the list when i do ctrl minus, and the triangles as well*/
|
||||
|
||||
#rightColumn
|
||||
{width:618px;
|
||||
height:100%; /*necessary, right?*/
|
||||
margin-top:-8px;
|
||||
margin-left:36px;
|
||||
margin-left:26px;
|
||||
margin-bottom:20px;
|
||||
float:left;
|
||||
position:relative;
|
||||
|
|
|
@ -110,6 +110,9 @@ border-bottom:1px solid #e0e0e0;
|
|||
text-align:left;
|
||||
box-shadow:1px 1px 6px #919191;}
|
||||
|
||||
#navMenu li:first-child:hover
|
||||
{background:none;}
|
||||
|
||||
#navMenu li li a
|
||||
{padding:2px 10px;
|
||||
color:#737373;} /*menu may break in IE, add JS hack and one for navigation by keyboard*/
|
||||
|
@ -182,7 +185,7 @@ background-color:#ff8400;}
|
|||
#loginMenu li:hover a
|
||||
{color:#FFF;}
|
||||
|
||||
#woodPng
|
||||
/*#woodPng
|
||||
{width:30%;
|
||||
height:30%;
|
||||
position:absolute;
|
||||
|
@ -192,7 +195,7 @@ margin:0 auto;
|
|||
top:400px;
|
||||
background-color:#989898;
|
||||
opacity:0.4; /*plz add JS to detect if browser does not support opacity*/
|
||||
-moz-border-radius:60px;
|
||||
/*-moz-border-radius:60px;
|
||||
-webkit-border-radius:60px;
|
||||
border-radius:60px;
|
||||
-moz-box-shadow: 0px 0px 100px 100px #989898;
|
||||
|
@ -243,4 +246,5 @@ text-align:left;
|
|||
padding-left:22px;
|
||||
clear:both;}
|
||||
|
||||
|
||||
.clear
|
||||
{clear:both;}
|
||||
|
|
|
@ -10,8 +10,8 @@
|
|||
|
||||
{% block content %}
|
||||
<div id="center">
|
||||
<div id="woodPng">
|
||||
</div>
|
||||
<!--<div id="woodPng">
|
||||
</div>-->
|
||||
|
||||
<div id="centerContent" class="centerContent">
|
||||
<div id="shadow">
|
||||
|
|
|
@ -41,8 +41,8 @@
|
|||
</div>
|
||||
|
||||
<div id="centerInner">
|
||||
<div id="woodPng">
|
||||
</div>
|
||||
<!--<div id="woodPng">
|
||||
</div>-->
|
||||
|
||||
<div class="centerInnerContent">
|
||||
<div id="shadow">
|
||||
|
@ -54,9 +54,9 @@
|
|||
|
||||
<div id="searchInnerDiv">
|
||||
<!--<img src="/static/images/noel/search-inner.png" width="22" height="18" alt="search" class="searchInner">-->
|
||||
<img src="/static/images/noel/aboutus.gif" width="20" height="20" id="aboutBtn" alt="About">
|
||||
<img src="/static/images/noel/aboutus.gif" width="20" height="20" id="aboutBtn" alt="About" title="About">
|
||||
{% if has_add %}
|
||||
<span class="plus" id="addBtn">+</span>
|
||||
<span class="plus" id="addBtn" title="Add">+</span>
|
||||
|
||||
{% endif %}
|
||||
|
||||
|
@ -117,6 +117,12 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div id="triangleUp">previous</div>
|
||||
<div id="triangleDown">next</div>
|
||||
|
||||
<div class="clear"></div>
|
||||
|
||||
|
||||
<div id="listLeft">
|
||||
<ul>
|
||||
<li id="loadingList">Loading...</li>
|
||||
|
@ -128,9 +134,6 @@
|
|||
<!-- <li><a href=""><span>The Mystery of vanishing rights<span></a></li> -->
|
||||
</ul>
|
||||
|
||||
<div id="triangleUp">▲</div>
|
||||
<div id="triangleDown">▼</div>
|
||||
|
||||
</div>
|
||||
<div id="pagination" style="display:none;"> <!-- Please, please let me display pagination info -->
|
||||
<span id="currPageNo">1</span>
|
||||
|
|
Loading…
Reference in New Issue
Block a user