Changeset - bda85a597bf3
[Not reviewed]
0 2 0
Bradley Kuhn (bkuhn) - 10 years ago 2013-05-01 00:01:48
bkuhn@ebb.org
Styles should live in CSS, not in the template.
Properly use nav-bg for campaign.
2 files changed with 12 insertions and 2 deletions:
0 comments (0 inline, 0 general)
www/conservancy/static/conservancy.css
Show inline comments
...
 
@@ -59,12 +59,22 @@ h3 { margin-top: .6em; margin-bottom: .4em; }
 

	
 
/* Navigation bar */
 
#navbar-outer { background: #577632; }
 
#navbar { margin-left: 104px; margin-top: 3px; float: left; display: inline; }
 
#navbar ul { list-style: none; }
 
#navbar-clear { clear: both; border-bottom: 1px solid #808080; }
 
#navbar li.campaign a {
 
  display: block;
 
  background: #fafafe;
 
  padding: .2em .8em;
 
  margin-right: 3px;
 
  border: 1px solid #808080;
 
  font-size: .8em;
 
  background: url(/img/nav-bg-campaign.png) bottom repeat-x;
 
  border-color: #ffffff;
 
}
 
#navbar li a {
 
  display: block;
 
  background: #fafafe;
 
  padding: .2em .8em;
 
  margin-right: 3px;
 
  border: 1px solid #808080;
...
 
@@ -233,17 +243,17 @@ body.conservancy-donate #navbar ul li.donate a,
 
body.conservancy-sponsors #navbar ul li.sponsors a /* NO COMMA HERE! */
 
{ 
 
    color: #000033;
 
    font-weight: bold;
 
    background: #fff url(/img/nav-bg-up.png) top repeat-x;
 
}
 

	
 
body.conservancy-campaign #navbar ul li.campaign a
 
{ 
 
    color: #000033;
 
    font-weight: bold;
 
    background: url(/img/nav-bg-campaign-up.png) bottom repeat-x;
 
}
 

	
 
#sponsor ul {
 
  clear: all;
 
  margin-bottom: 10px;
 
}
www/conservancy/templates/base_conservancy.html
Show inline comments
...
 
@@ -23,13 +23,13 @@
 
          <li class="news"><a href="/news/">News</a></li>
 
          <li class="blog"><a href="/blog/">Blog</a></li>
 
	  <li class="Members"><a href="/members/">Member Projects &amp; Services</a></li>
 
          <li class="About"><a href="/about/">About</a></li>
 
	  <li class="sponsors"><a href="/sponsors/">Sponsors</a></li>
 
	  <li class="donate"><a href="/donate/">Support Conservancy!</a></li>
 
          <li class="campaign"><a style="background: url(/img/nav-bg-campaign.png) bottom repeat-x;" href="/campaign/">Campaign</a></li>
 
          <li class="campaign"><a href="/campaign/">Campaign</a></li>
 
	</ul>
 
      </div>
 
      <div id="navbar-clear"></div>
 
    </div>
 
      {% block outercontent %}<div id="mainContent">{% block content %}{% endblock %}</div>{% endblock %}
 
    <div id="conservancyfooter">
0 comments (0 inline, 0 general)