Changeset - bda85a597bf3
[Not reviewed]
0 2 0
Bradley Kuhn (bkuhn) - 11 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
...
 
@@ -53,24 +53,34 @@ h3 { margin-top: .6em; margin-bottom: .4em; }
 
}
 
#logobutton {
 
  display: block;
 
  position: absolute; left: 17px; top: 10px; height: 120px; width: 933px;
 
  background: url(/img/conservancy-header.png)  left center no-repeat;
 
}
 

	
 
/* 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;
 
  font-size: .8em;
 
  background: #fff url(/img/nav-bg.png) bottom repeat-x;
 
  border-color: #ffffff;
 
}
 
#navbar li:hover a { background: #577632; color: #fff; }
 
#navbar li.campaign:hover a { background: #577632; color: #CE1F1F; }
...
 
@@ -227,29 +237,29 @@ span.subsubsectionToc { padding-left: 6em;}
 
body.conservancy-overview #navbar ul li.overview a,
 
body.conservancy-Members #navbar ul li.Members a,
 
body.conservancy-news #navbar ul li.news a,
 
body.conservancy-blog #navbar ul li.blog a,
 
body.conservancy-About #navbar ul li.About a,
 
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;
 
}
 
#sponsor li {
 
  width: 100%;
 
  float: left;
 
  margin-top: 10px;
 
  text-align: center;
 
  list-style: none;
www/conservancy/templates/base_conservancy.html
Show inline comments
...
 
@@ -17,25 +17,25 @@
 
      <h1><span id="logobutton"><a href="/">Software Freedom Conservancy</a></span></h1>
 
    </div>
 
    <div id="navbar-outer">
 
      <div id="navbar">
 
	<ul>
 
          <li class="overview"><a href="/overview/">Overview</a></li>
 
          <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">
 
      <p><a href="/">Main Page</a> | <a href="/about/contact/">Contact</a> | <a href="/sponsors/">Sponsors</a> | <a href="/privacy-policy/">Privacy Policy</a> | <a href="/feeds/omnibus/">RSS Feed</a></p>
 
      <p>Follow Conservancy
 
      on <a href="https://identi.ca/conservancy">identi.ca</a>
 
      and <a href="https://twitter.com/conservancy">twitter</a>.
 
      <a href="https://flattr.com/thing/922714/Donate-to-Software-Freedom-Conservancy" target="_blank">
 
      <img src="https://api.flattr.com/button/flattr-badge-large.png" alt="Flattr us!" title="Flattr us!" border="0" /></a></p>
0 comments (0 inline, 0 general)