Permalink
Browse files

ui tweaks

  • Loading branch information...
1 parent 4dc4861 commit 83a90d99d20b05912b57c663756c3e127b9a1643 @justquick committed Feb 10, 2010
Showing with 8 additions and 27 deletions.
  1. +1 −5 media/css/layout.css
  2. +7 −22 templates/base.html
View
6 media/css/layout.css
@@ -2,7 +2,7 @@
#topbar{ float:left; width:100%; padding:0.6em 0; font-size:0.9em; text-transform:uppercase; color:#CFD9DB; background:#FFF url(../images/bg/topbar.gif) repeat-x bottom left}
#header{clear:both; position:relative; height:5em; margin:0 auto; background:#48525B url(../images/bg/header.gif) repeat-x bottom left; background-color:#48525B}
#header img{ position:absolute; top:10%; left:10px}
-#header ul{ margin:3.5em 1em 0 0 !important; margin:3.5em 0.5em 0 0; padding:0; float:right}
+#header ul{ margin:3.5em 1em 0 3em !important; margin:3.5em 0.5em 0 0; padding:0; float:right}
#header ul li{ display:inline; list-style:none}
#header ul li a{ float:left; padding:0 1em; font:400 1.1em arial,sans-serif; letter-spacing:0.1em; line-height:0.8em !important; line-height:1em; color:#ccc; border-right:1px solid #4D5760}
#header ul li a.last{ padding-right:0; border-right:0}
@@ -70,10 +70,6 @@ ul.submenu1 li,
ul.submenu2 li{ margin:0; padding:0; list-style:none; list-style-image:url(foo.gif)}
ul.submenu1 li a,
ul.submenu2 li a{ display:block; height:auto !important; height:1%; padding:1px 5px 1px 20px}
-ul.submenu1 li a{ background:url(../images/bg/submenu1.gif) no-repeat 5px 50%}
-ul.submenu1 a:hover{ color:#888; background:#B3C6C4 url(../images/bg/submenu1.gif) no-repeat 5px 50%}
-ul.submenu2 li a{ color:#426F85; background:url(../images/bg/submenu2.gif) no-repeat 3px 50%}
-ul.submenu2 a:hover{ color:#888; background:#B3C6C4 url(../images/bg/submenu2.gif) no-repeat 3px 50%}
.block{ display:block}
.clear{ clear:both}
.marginRight{ margin-right:15px}
View
29 templates/base.html
@@ -15,29 +15,14 @@
<body>
<div id="content">
<div id="header" class="width">
- <a href="/"><img border="0" src="{{ MEDIA_URL }}images/logo.jpg" alt="Effervescent Collective"/></a>
+ <a href="/"><img style="padding-bottom: 35px;" border="0" src="{{ MEDIA_URL }}images/logo.jpg" alt="Effervescent Collective"/></a>
{% flatblock "top-menu" %}
</div>
- <div id="banner-menu"><h3><a id="prev" href="#">&laquo;</a><a id="next" href="#">&raquo;</a></h3></div>
-
<div id="headerImg" class="width hidden">
- <img height="250px" width="776px" src="http://lh4.ggpht.com/_f3gaky_MG94/S2yP4m-9sTI/AAAAAAAAAg8/xYKwfdBtmMg/groupelineupbanner.jpg"/>
- <img height="250px" width="776px" src="http://lh5.ggpht.com/_f3gaky_MG94/S2yP4xH1iQI/AAAAAAAAAhA/xXBuADMC7Cc/aroma%20nonsense%20banner.jpg"/>
- <img height="250px" width="776px" src="http://lh3.ggpht.com/_f3gaky_MG94/S2yP5LWyjHI/AAAAAAAAAhE/w6iTtDmAe9Y/DSC_0535banner.jpg"/>
- <img height="250px" width="776px" src="http://lh5.ggpht.com/_f3gaky_MG94/S2yP5gIeA_I/AAAAAAAAAhM/wIjpZ0aYamQ/DSC_0593banner.jpg"/>
- <img height="250px" width="776px" src="http://lh5.ggpht.com/_f3gaky_MG94/S2yP5xglQWI/AAAAAAAAAhQ/uYAK8PR3j8s/DSC_5152%20banner.jpg"/>
- <img height="250px" width="776px" src="http://lh4.ggpht.com/_f3gaky_MG94/S2yP6Bl30SI/AAAAAAAAAhU/lsv90T3nBi8/DSC_0368%20banner.jpg"/>
- <img height="250px" width="776px" src="http://lh5.ggpht.com/_f3gaky_MG94/S2yP6bXvu0I/AAAAAAAAAhc/Ie3o26eN3jU/_MG_3354banner.jpg"/>
- <img height="250px" width="776px" src="http://lh4.ggpht.com/_f3gaky_MG94/S2yP6zBsCcI/AAAAAAAAAhg/jlzxQXr2D-Q/DSC_0917banner.jpg"/>
- <img height="250px" width="776px" src="http://lh4.ggpht.com/_f3gaky_MG94/S2yP7U7Gb7I/AAAAAAAAAhk/sG0HGEngrf8/facesbanner.jpg"/>
- <img height="250px" width="776px" src="http://lh3.ggpht.com/_f3gaky_MG94/S2yP7k1EwLI/AAAAAAAAAho/7BeBFVMj65U/DSC_0940banner.jpg"/>
- <img height="250px" width="776px" src="http://lh5.ggpht.com/_f3gaky_MG94/S2yP77XB0uI/AAAAAAAAAhs/Hs-Udet7W2E/athenatuemedit.jpg"/>
- <img height="250px" width="776px" src="http://lh6.ggpht.com/_f3gaky_MG94/S2yP8KKxlNI/AAAAAAAAAhw/Ch2hBsVY-Uk/DSC_0585banner.jpg"/>
- <img height="250px" width="776px" src="http://lh4.ggpht.com/_f3gaky_MG94/S2yP8QciKCI/AAAAAAAAAh0/zLQEPrBRiWo/DSC_5306banner.jpg"/>
- <img height="250px" width="776px" src="http://lh5.ggpht.com/_f3gaky_MG94/S2yP8rkaIYI/AAAAAAAAAh4/-92Fqnp-kJw/_MG_3398editbanner.jpg"/>
- <img height="250px" width="776px" src="http://lh4.ggpht.com/_f3gaky_MG94/S2yP8q5NYhI/AAAAAAAAAh8/vIw_wwv94hA/lynnelilyhandtossbanner.jpg"/>
- <img height="250px" width="776px" src="http://lh5.ggpht.com/_f3gaky_MG94/S2yP9BBcduI/AAAAAAAAAiA/WOKLadndotw/DSC_0531banner%20%281%29.jpg"/>
- <img height="250px" width="776px" src="http://lh6.ggpht.com/_f3gaky_MG94/S2yRpnSTvlI/AAAAAAAAAjc/aJMDsXl1uQM/header_image.jpg"/>
+ {% get_images as images %}
+ {% for image in images %}
+ <img height="250px" width="776px" src="{{ image }}"/>
+ {% endfor %}
</div>
<div id="menu" class="width">
{% flatblock "sub-menu" %}
@@ -84,7 +69,7 @@
</div>
<div id="footer">
<div id="bg" class="width">
- <img src="{{ MEDIA_URL }}images/logo.jpg" alt="Effervescent Collective"/>
+ <img style="padding: 10px;" src="{{ MEDIA_URL }}images/logo.jpg" alt="Effervescent Collective"/>
<a href="http://creativecommons.org"><img style="border-width: 0pt;" src="http://i.creativecommons.org/l/by-nc-sa/3.0/us/88x31.png" alt="Creative Commons License"/></a><br/>
Licensed by Lily Susskind under a<br/> <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/3.0/us/">Creative Commons Attribution-Noncommercial-Share Alike 3.0 United States License</a>.
</div>
@@ -101,7 +86,7 @@
pageTracker._trackPageview();
} catch(err) {}
- $('#headerImg').cycle({fx:'fade',delay: 5000,speed: 5000,random: 1, next: '#next', prev: '#prev'}).removeClass('hidden');
+ $('#headerImg').cycle({fx:'fade',delay: 5000,speed: 5000,random: 1}).removeClass('hidden');
});
</script>
</body>

0 comments on commit 83a90d9

Please sign in to comment.