Changeset - 53acfaa42ff1
[Not reviewed]
0 2 1
Bradley Kuhn (bkuhn) - 14 years ago 2010-10-03 16:04:17
bkuhn@ebb.org
First attempt and putting logo up on the site.
3 files changed with 10 insertions and 8 deletions:
0 comments (0 inline, 0 general)
www/conservancy/static/conservancy.css
Show inline comments
...
 
@@ -24,52 +24,58 @@ h3 { margin-top: .6em; margin-bottom: .4em; }
 
#mainContent h1 { border-bottom: 1px solid #00334b; }
 
h2 { border-bottom: 1px solid #aaa; }
 

	
 
#mainContent { clear: both; margin-left: 79px; padding: 4px 25px; }
 
#mainContent ul, #mainContent ol { padding-left: 1.5em; }
 

	
 
#mainContent img { margin: 3px; }
 

	
 
.internalNavigate { width: 19%; float: right; }
 
#mainContent .internalNavigate ul { list-style-type: none; padding-left: 0; }
 
.internalNavigate ul li { margin-top: .3em; margin-bottom: .3em; }
 

	
 
.affiliate-link { float: right; }
 
#affiliate-conservancy, #affiliate-mr {
 
  padding: 2px 10px;
 
  white-space: nowrap;
 
  font-size: x-small;
 
  text-align: right;
 
}
 
#affiliate-conservancy { background: #d4ff9d; }
 
#affiliate-mr { background: #ddd; }
 

	
 
/* Header */
 

	
 
#conservancyheader {
 
  height: 90px;
 
  background-color: #d1ff96;
 
  border-bottom: 1px solid #808080;
 
}
 

	
 
#logobutton {
 
  display: block;
 
  position: absolute; left: 17px; top: 10px; height: 51px; width: 525px;
 
  background: url(/img/conservancy-logo-wide.png) left center no-repeat;
 
  position: absolute; left: 17px; top: 10px; height: 75px; width: 75px;
 
  background: url(/img/conservancy-logo-75px.png) left center no-repeat;
 
}
 

	
 
/* Navigation bar */
 
#navbar-outer { background: #CDDBDC; }
 
#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 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;
 
}
 
#navbar li:hover a { background: #fff99d; }
 
#navbar li { float: left; display: inline; margin-bottom: 3px; }
 

	
 
/* Highlight current location on navbar */
 
body.conservancy-about #navbar ul li.about a,
 
body.conservancy-news #navbar ul li.news a,
 
body.conservancy-blog #navbar ul li.blog a,
 
body.conservancy-podcast #navbar ul li.podcast a,
...
 
@@ -142,49 +148,44 @@ blockquote, div.quote /* div.quote is used by conservancy whitepaper */ {
 
.secondary_info { font-size: 83%; }
 
.next_page_button { float: right; }
 
.document_format { border: 1px solid #888; padding: .2em; background: #fff99d;}
 
.copyright_info { font-size: 90%; }
 
hr.footnote-separator { width: 80%; margin-left: auto; margin-right: auto; }
 

	
 
/* Resources pages */
 
div.download-formats { margin-top: 2em; margin-bottom: 2em; }
 
.download-formats p { display: inline; }
 
#mainContent .download-formats ul { display: inline; list-style: none;
 
                                    padding-left: 0; }
 
.download-formats ul li { display: inline; padding-left: 2em; }
 

	
 
/* Resources - book styles */
 
hr.chapter-separator { display: none; }
 
h2.likechapterHead { text-align: center; }
 
h2.chapterHead { text-align: center; }
 
#mainContent ul.author { list-style-type: none; padding-left: 0; }
 
#mainContent div.footnotes { font-style: normal; } /* remove italics */
 
span.sectionToc { padding-left: 2em; } /* indent TOC properly */
 
span.subsectionToc { padding-left: 4em; }
 
span.subsubsectionToc { padding-left: 6em;}
 
.js, .js p, .js p.bibitem, .js p.bibitem-p { background-color: #cde7e9; }
 

	
 
#conservancyheader { background: #d4ff9d url(/img/headerbg.png) left top repeat-x; }
 

	
 
#conservancyheader h1 {
 
  text-indent: 0;
 
  margin: 0;
 
  margin-left: 104px;
 
  line-height: 72px;
 
}
 

	
 
#conservancyheader h1 a {
 
  color: #000;
 
}
 

	
 
#logobutton {
 
  position: absolute; left: 17px; top: 10px; height: 51px; width: 70px;
 
}
 

	
 
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-directors #navbar ul li.directors a,
 
body.conservancy-officers #navbar ul li.officers a,
 
body.conservancy-contact #navbar ul li.contact a,
 
body.conservancy-donate #navbar ul li.donate a /* NO COMMA HERE! */
 
  { background: #fff url(http://www.softwarefreedom.org/img/nav-bg-up.png) top repeat-x; color: #000; }
www/conservancy/static/img/conservancy-logo-75px.png
Show inline comments
 
new file 100644
 
binary diff not shown
Show images
www/conservancy/templates/base_conservancy.html
Show inline comments
 
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 

	
 
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 

	
 
  <head>
 
    <title>{% block title %}{% block subtitle %}{% endblock %}Software Freedom Conservancy{% endblock %}</title>
 
    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 
    <meta name="description" content="The Software Freedom Conservancy provides a non-profit home and services to Free, Libre and Open Source Software (FLOSS) projects." />
 
    <meta name="keywords" content="software, freedom, conservancy, open source, gnu, GNU, Open Source, Free and Open Source, Free and Open Source Software, FLOSS, FOSS, protect, protection, help, policy, linux, non-profit" />
 
    <link rel="stylesheet" type="text/css" media="screen, projection" href="/conservancy.css" />
 
    <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
 
    {% block head %}{% endblock %}
 
  </head>
 

	
 
  <body class="conservancy-{% block category %}other{% endblock %}">
 
    <div id="conservancyheader">
 
      <h1><a href="/"><span id="logobutton">Software Freedom Conservancy</span></a></h1>
 
    <span id="logobutton"/>
 
      <h1><a href="/">Software Freedom Conservancy</a></h1>
 
    </div>
 
    <div id="navbar-outer">
 
      <div id="navbar">
 
	<ul>
 
          <li class="overview"><a href="/overview/">Overview</a></li>
 
	  <li class="members"><a href="/members/">Member Projects</a></li>
 
          <li class="news"><a href="/news/">News</a></li>
 
          <li class="directors"><a href="/about/team/board/">Directors</a></li>
 
	  <li class="officers"><a href="/about/team/officers/">Officers</a></li>
 
          <li class="contact"><a href="/about/contact/">Contact</a></li>
 
	  <li class="donate"><a href="/donate/">Donations</a></li>
 
	</ul>
 
      </div>
 
      <div id="navbar-clear"></div>
 
    </div>
 
    <div id="mainContent">
 
      {% block outercontent %}<div class="singleColumn">{% block content %}{% endblock %}</div>{% endblock %}
 
    </div>
 
    <div id="conservancyfooter">
 
      <p><a href="/">Main Page</a> | <a href="/about/contact/">Contact</a> | <a href="/privacy-policy/">Privacy Policy</a> | <a href="/feeds/news/">News Feed</a></p>
 
      <p class="copyright_info">This page is licensed under the <a href="http://creativecommons.org/licenses/by-nc-nd/2.0/">Creative Commons Attribution-NonCommercial-NoDerivs 2.0 license</a>.</p>
 
    </div>
 
  </body>
 
</html>
0 comments (0 inline, 0 general)