website Changeset - c7f50fdf21cf · Conservancy Kallithea

Changeset - c7f50fdf21cf

Parent rev.

Child rev.

[Not reviewed]

Merge

0 3 0

Bradley Kuhn (bkuhn) - 8 years ago 2015-12-22 01:19:05
bkuhn@ebb.org

Merge mina86' changes.

2 files changed with 20 insertions and 20 deletions:

README.md

www/conservancy/static/css/conservancy.css

0 comments (0 inline, 0 general)

README.md

➞

Show inline comments

 Contributing
 ============
 The canonical location for this repository is
 [on Gitorious](https://gitorious.org/conservancy/website).  Copies of this
 repository elsewhere, such as Github, are for backup purposes only.  If you
 have contributions, submit them on Gitorious.
 The canonical location for this repository is [on Conservancy’s
 Kallithea instance](http://k.sfconservancy.org/website).  Copies of
 this repository elsewhere, such as Github, are for backup purposes
 only..
 License
 =======
 The software included herein, such as the Python source files, are generally
 licensed [AGPLv3](AGPLv3)-or-later.  The Javascript is a hodgepodge of
 licensing, but all of it is compatible with [AGPLv3](AGPLv3)-or-later.  See
 the notices at the top of each Javascript file for licensing details.
 The content and text (such as the HTML files) is currently
 [CC-BY-SA-3.0](CC-By-SA-3.0).
 Server Configuration
 ====================
 conservancy's webserver runs on a machine called
 dogwood.sfconservancy.org, which is a standard Debian installation.
 The following packages are installed to make Django and Apache work on a
 squeeze install:
     $ aptitude install python-django apache2 sqlite3 python2.5-sqlite libapache2-mod-python

www/conservancy/static/css/conservancy.css

➞

Show inline comments

@@ ... / @@ -169,89 +169,89 @@ h3 { margin-top: .6em; margin-bottom: .4em; } @@
     background: #eeeeee;
+}
 #fundraiser-percentage {
     text-align: center;
+}
 .content-with-donate-sidebar {
     align: left;
     width: 80%;
+}
 #container {
     width: 100%;
     overflow: hidden;
+}
 #container #mainContent {
     background: #fffff;
     margin-left: 210px;
     margin-right: 50px;
+}
 #container #sidebar {
     width: 200px;
     float: left;
-    background-color: #ccd4a3;
+    background-color: #ccd4a3;
+}
 #container #sidebar li {
     text-align: center;
     list-style: none;
     padding: 3px 10px 3px 10px;
     margin: 5px;
     border: 1px solid #CCC;
     background: #ffd843;
     background: -moz-linear-gradient(top, #fff, #ffd533);
     background: -webkit-linear-gradient(top, #fff, #ffd533);
     background: linear-gradient(to bottom, #fff, #ffd533);
     filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#ffd533', GradientType=0);
     background: #eaf1f1;
     background: -moz-linear-gradient(top, #fff, #eaf1f1);
     background: -webkit-linear-gradient(top, #fff, #eaf1f1);
     background: linear-gradient(to bottom, #fff, #eaf1f1);
     filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#eaf1f1', GradientType=0);
+}
 #container #sidebar li a:hover { background: #577632; color: #fff; }
 #container #sidebar.Directors ul li.Directors,
 #container #sidebar.Eval ul li.Eval,
 #container #sidebar.Overview ul li.Overview,
 #container #sidebar.Contact ul li.Contact,
 #container #sidebar.Officers ul li.Officers,
 #container #sidebar.Staff ul li.Staff,
 #container #sidebar.Outside ul li.Outside,
 #container #sidebar.Filings ul li.Filings,
 #container #sidebar.License ul li.License,
 #container #sidebar.Current ul li.Current,
 #container #sidebar.Services ul li.Services,
 #container #sidebar.Applying ul li.Applying,
 #container #sidebar.VMwareLawsuitAppeal ul li.VMwareLawsuitAppeal,
 #container #sidebar.CopyleftPrinciples ul li.CopyleftPrinciples,
 #container #sidebar.VMwareLawsuitFAQ ul li.VMwareLawsuitFAQ,
 #container #sidebar.AboutCompliance ul li.AboutCompliance
+{
     color: #000033;
     font-weight: bold;
     background: #ffd843;
     background: -moz-linear-gradient(bottom, #fff, #ffd533);
     background: -webkit-linear-gradient(bottom, #fff, #ffd533);
     background: linear-gradient(to top, #fff, #ffd533);
     filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd533', endColorstr='#ffffff', GradientType=0);
     background: #eaf1f1;
     background: -moz-linear-gradient(bottom, #fff, #eaf1f1);
     background: -webkit-linear-gradient(bottom, #fff, #eaf1f1);
     background: linear-gradient(to top, #fff, #eaf1f1);
     filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#eaf1f1', endColorstr='#ffffff', GradientType=0);
+}
 #container #sidebar h2 {
     text-align: center;
     font-size: 150%;
     margin: 1.5em 0 0.8em 0;
+}
 #container #sidebar hr {
     width: 75%;
     float: center;
     clear: all;
+}
 /* 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: #F0FFB8; padding: .1em .5em; margin-bottom: .5em; }
 .columns {
     width: 100%;
     overflow: hidden;
+}
@@ ... @@
 .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; }
 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-Compliance #navbar ul li.compliance a,
 body.conservancy-donate #navbar ul li.donate a,
 body.conservancy-npoacct #navbar ul li.npoacct a,
 body.conservancy-sponsors #navbar ul li.sponsors a /* NO COMMA HERE! */
+{
     color: #000033;
     font-weight: bold;
     background: #ffd843;
     background: -moz-linear-gradient(bottom, #fff, #ffd533);
     background: -webkit-linear-gradient(bottom, #fff, #ffd533);
     background: linear-gradient(to top, #fff, #ffd533);
     filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd533', endColorstr='#ffffff', GradientType=0);
     background: #eaf1f1;
     background: -moz-linear-gradient(bottom, #fff, #eaf1f1);
     background: -webkit-linear-gradient(bottom, #fff, #eaf1f1);
     background: linear-gradient(to top, #fff, #eaf1f1);
     filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#eaf1f1', endColorstr='#ffffff', GradientType=0);
+}
 body.conservancy-supporter #navbar ul li.supporter a
+{
     color: #000033;
     font-weight: bold;
     background: #ffd843;
     background: -moz-linear-gradient(bottom, #fff, #ffd533);
     background: -webkit-linear-gradient(bottom, #fff, #ffd533);
     background: linear-gradient(to top, #fff, #ffd533);
     filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd533', endColorstr='#ffffff', GradientType=0);
+}
 #supporters ul {
   list-style: none;
   margin: 0;
   padding: 0;
+}
 #supporters li:before {
     content: '';
     display: inline-block;
     height: 2em;
     width: 2em;
     background-image: url(/img/conservancy-supporter-heart.svg);

0 comments (0 inline, 0 general)