website Changeset - 0fc09ea15422 · Conservancy Kallithea

Changeset - 0fc09ea15422

Parent rev.

Child rev.

[Not reviewed]

0 2 0

Bradley Kuhn (bkuhn) - 13 years ago 2010-10-03 16:13:12
bkuhn@ebb.org

Color improvement from fab; still trying to work out text placement.

2 files changed with 5 insertions and 3 deletions:

www/conservancy/static/conservancy.css

www/conservancy/templates/base_conservancy.html

0 comments (0 inline, 0 general)

www/conservancy/static/conservancy.css

➞

Show inline comments

@@ ... / @@ -4,99 +4,100 @@ body { margin: 0; padding: 0; } @@
 .clear { clear: both; }
 .hidden { display: none; }
 p, h1, h2, h3, h4, h5, h6, #mainContent ul, #mainContent ol {
   margin-top: 1em;
   margin-bottom: 1em;
+}
 body {
   font-family: "Lucida Grande",Verdana,Lucida,Helvetica,Arial,sans-serif;
   font-size: 90%;
+}
 a { text-decoration: none; color: #146624; }
 a:hover { text-decoration: underline; color: #665f14; }
 h1 { margin-top: .75em; margin-bottom: .5em; }
 h2 { margin-top: .75em; margin-bottom: .5em; }
 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; */
   background-color: #92CC58;
   background-color: #BDD8A2;
   border-bottom: 1px solid #808080;
   font-size: 6em;
   margin-right: 3px;
   font-size: 4em;
   display: block;
+}
 #logobutton {
   display: block;
   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,
 body.conservancy-services #navbar ul li.services a,
 body.conservancy-resources #navbar ul li.resources a,
 body.conservancy-technology #navbar ul li.technology a,
 body.conservancy-contact #navbar ul li.contact a,
 body.conservancy-donate #navbar ul li.donate a /* NO COMMA HERE! */
       { background: #fff url(/img/nav-bg-up.png) top repeat-x; color: #000; }
 /* Navbar Submenus (currently unused) */
 #navbar li ul { display: none; border: 1px solid #444; }
 #navbar li:hover ul { display: block; position: absolute; }
 #navbar li ul li { float: none; }
 #navbar li ul li a { border: 0px; margin: 0px; }
 .shaded { background: #ffeab7; padding: .1em .5em; margin-bottom: .5em; }
 .singleColumn { width: 79%; }
 .columns { margin: 0; }

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">
     <span id="logobutton"/>
       <h1><a href="/">Software Freedom Conservancy</a></h1>
     </div>
     <div id="logobutton">
     </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)