From 178ed00ddf01177eededac0ffac000d45453cba4 Mon Sep 17 00:00:00 2001 From: Karen Date: Sat, 15 Oct 2011 16:50:46 +0530 Subject: [PATCH 1/2] made changes according to sharvari's email dated 14/10/2011 --- itf/static/css/noel/inner.css | 27 +++++++++++++++------------ itf/static/css/noel/main.css | 7 +++++-- itf/templates/noel/index.html | 4 ++-- itf/templates/noel/insidepage.html | 17 +++++++++-------- 4 files changed, 31 insertions(+), 24 deletions(-) diff --git a/itf/static/css/noel/inner.css b/itf/static/css/noel/inner.css index 983a0cc..6ef262d 100755 --- a/itf/static/css/noel/inner.css +++ b/itf/static/css/noel/inner.css @@ -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; @@ -219,11 +219,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 +261,29 @@ box-shadow:inset -6px 0px 18px #eece98; cursor:pointer;} #triangleUp -{font-size:10px; +{font-size:14px; color:#f7bd00; -position:absolute; +/*position:absolute; right:8px; -top:-14px; -cursor:pointer;} +top:-14px;*/ +cursor:pointer; +margin-left:10px;} #triangleDown -{font-size:10px; +{font-size:14px; color:#f7bd00; -position:absolute; +/*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; +text-align:right; +margin-left:266px;} /*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; diff --git a/itf/static/css/noel/main.css b/itf/static/css/noel/main.css index 26dec2d..353f556 100755 --- a/itf/static/css/noel/main.css +++ b/itf/static/css/noel/main.css @@ -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; diff --git a/itf/templates/noel/index.html b/itf/templates/noel/index.html index 2d81010..b979e09 100755 --- a/itf/templates/noel/index.html +++ b/itf/templates/noel/index.html @@ -10,8 +10,8 @@ {% block content %}
-
-
+
diff --git a/itf/templates/noel/insidepage.html b/itf/templates/noel/insidepage.html index 605f54a..0682b43 100755 --- a/itf/templates/noel/insidepage.html +++ b/itf/templates/noel/insidepage.html @@ -41,8 +41,8 @@
-
-
+
@@ -54,9 +54,9 @@
- About + About {% if has_add %} - + + + {% endif %} @@ -116,7 +116,11 @@
- + + next + previous + +
  • Loading...
  • @@ -128,9 +132,6 @@
-
-
-
- next - previous +
previous
+
next
+ +