Changeset - 32e9164d48fc
[Not reviewed]
0 5 0
Bradley Kuhn (bkuhn) - 9 years ago 2015-03-05 21:25:08
bkuhn@ebb.org
Don't hard code style; use class and improve CSS

This changes the hard-coded style for what I'm calling the
content-with-donate-sidebar. The advantage of not hard-coding style are
obvious, but I'm doing this now rather than later so that I can add
changes to the CSS that causes the width to extend to 100% on smaller
screen media when the donate bar disappears (the latter of which is
already implemented).
5 files changed with 13 insertions and 4 deletions:
0 comments (0 inline, 0 general)
www/conservancy/static/conservancy.css
Show inline comments
...
 
@@ -15,48 +15,52 @@ body {
 
  font-size: 95%;
 
  background-color: #0000;
 
  color: #ffff;
 
}
 

	
 
a { text-decoration: none; color: #557733; }
 
a:hover { text-decoration: underline; color: #577632; }
 

	
 
.toggle-control  {
 
cursor: pointer;
 
text-decoration: none; color: #557733;
 
}
 
.toggle-control:hover { text-decoration: underline; color: #577632; }
 

	
 
/* FIXME: We should do this:          */
 
/* http://www.waypointarts.com/blog/2013/06/29/fixing-a-side-bar-while-scrolling-until-bottom */
 
.donate-sidebar {
 
    position: fixed;
 
    top: 180px;
 
    right: 2%;
 
    width: 18%;
 
}
 
@media all and (max-width: 625px) {
 
    .donate-sidebar { display: none; }
 
    .content-with-donate-sidebar {
 
        align: center;
 
        width: 100%;
 
    }
 
}
 

	
 
p.footnote {
 
    font-size: 85%;
 
}
 

	
 
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; }
 
#mainContent h2 { border-bottom: 1px solid #aaa; }
 

	
 
#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; }
 

	
 
/* Header */
 

	
 
#conservancyheader {
...
 
@@ -92,48 +96,53 @@ h3 { margin-top: .6em; margin-bottom: .4em; }
 
  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.supporter:hover a { background: #577632; color: #CE1F1F; }
 
#navbar li { float: left; display: inline; margin-bottom: 3px; }
 

	
 
#mainContent {
 
    margin-left: 50px;
 
    margin-right: 50px;
 
}
 

	
 
.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; 
 
}
 

	
 
#container #sidebar li {
 
    text-align: center;
 
    list-style: none;
 
    padding: 3px 10px 3px 10px; 
 
    margin: 5px; 
 
    border: 1px solid #CCC;
 
    background: #fff url(/img/nav-bg.png) bottom repeat-x;
 
}
 
#container #sidebar li:hover a { background: #577632; color: #fff; }
www/conservancy/static/npoacct/index.html
Show inline comments
...
 
@@ -247,49 +247,49 @@ Other donation methods:
 
            contact <a href="mailto:accounting@sfconservancy.org">Conservancy
 
            by email</a><br/> for wire transfer instructions.<br/>
 
            Please Include your currency and country.<br/>
 
    </div><!-- /.toggle-content -->
 
</div><!-- /.toggle.unit -->
 

	
 
<div class="toggle-unit">
 
    <h4 class="toggle-control" data-text="Paper Check" 
 
    data-expanded-text="Paper Check:">Paper Check</h4>
 
    <div class="toggle-content">
 
    Send paper check donations to:<br/>
 
    Software Freedom Conservancy, Inc.<br/>
 
    137 MONTAGUE ST  STE 380<br/>
 
    BROOKLYN, NY 11201-3548<br/>
 
    Please write <q>NPO ACCOUNTING</q> in the memo line. 
 
    </div><!-- /.toggle-content -->
 
</div><!-- /.toggle.unit -->
 

	
 
<!-- Flattr start -->
 
<p><a href="https://flattr.com/thing/1296704/NPOAcct-to-develop-Free-and-Open-Source-Non-Profit-Accounting-Software" target="_blank"><img src="https://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" title="Flattr this" style="border:0" /></a></p>
 
<!-- Flattr end -->
 
</td></tr></table>
 
</div>
 

	
 
<div style="align:left;width:80%;">
 
<div class="content-with-donate-sidebar">
 
<!-- begin campaign text -->
 

	
 
<h2>Fundraising Campaign: Non-Profit Accounting Software</h2>
 

	
 
<img src="/img/conservancy-accounting-campaign-logo.png" alt="Conservancy accounting campaign logo" style="float:left;" />
 

	
 
<blockquote>
 
<p><strong>Update on 2014-12-03:</strong> As can be seen, Conservancy sadly
 
  never reached our fundraising target for this project.  However, as we
 
  promised below, we <a href="http://npoacct.sfconservancy.org/">continue to
 
  work on this project</a>.  We'd really appreciate more donations, as we've
 
  needed to make a lot of compromises in our plans since we didn't reach our
 
  fundraising goal.  We did complete Phase 0 described below
 
  (<a href="http://npoacct.sfconservancy.org/">results are on our wiki</a>),
 
  and Phase 1 now comprises the development of an REST API for double-entry
 
  accounting  which many applications (including this one) can use.</p>
 
</blockquote>
 
<br/>
 
<hr/>
 
<p>Conservancy has a plan to help all non-profit organizations (NPOs) by
 
creating an Open Source and Free Software accounting system usable by
 
non-technical bookkeepers, accountants, and non-profit managers.  You can
 
help us do it by donating now.
 
</p>
www/conservancy/static/supporter/event.html
Show inline comments
 
{% extends "base_conservancy.html" %}
 
{% block subtitle %}Attend Supporter Night - {% endblock %}
 
{% block category %}supporter{% endblock %}
 

	
 
{% block head %}
 
<link href="/jquery-ui.css" rel="stylesheet" type="text/css"/>
 
<link href="/forms.css" rel="stylesheet" type="text/css"/>
 
<script type="text/javascript" src="/jquery.min.js"></script>
 
<script type="text/javascript" src="/jquery-ui.min.js"></script>
 
<script type="text/javascript" src="/supporter-page.js"></script>
 

	
 
{% endblock %}
 

	
 
{% block content %}
 
<div style="align:left;width:80%;">
 
<div class="content-with-donate-sidebar">
 
  <h1>Conservancy Supporter Night 2015</h1>
 
  <p>
 
  <dl>
 
    <dt>Who</dt> <dd><strong>Everyone</strong>: just show up at 6:30PM with &euro;50!
 
    &mdash;  <a href="/supporter#annual">Conservancy Annual Supporters</a> attend <em>gratis</em>.</dd>
 
    <dt>When</dt> <dd>Friday 30 January 2015 at 18:30 (6:30PM)</dd>
 
    <dt>Where</dt> <dd><a href="http://www.drugopera.be/">Drug Opera</a>
 
    Restaurant at Rue Gr&eacute;try 51, 1000 Brussels, Belgium
 
    (<a href="http://www.openstreetmap.org/node/2698048172#map=18/50.84898/4.35214">map</a>)</dd>
 
    <dt>What</dt> <dd>Full prix fixe dinner (one drink included)</dd>
 
    <dt>Why</dt> <dd>Enjoy a meal while meeting and discussing Free Software
 
    with fellow Conservancy enthusiasts
 
    and <a href="/about/staff/#bkuhn">Bradley</a> and
 
    <a href="/about/staff/#karen">Karen</a> from
 
    Conservancy's executive team (and the <a href="http://faif.us"><cite>Free
 
        as in Freedom</cite> audcast</a>).</dd>
 
    </dl>
 
    </p>
 

	
 
  <p>Conservancy's Annual Supporter Night will be held this year on the
 
  evening of Friday 30 January 2015 in Brussels, Belgium (which is the night
 
    before <a href="https://fosdem.org/2015/">FOSDEM 2015</a> begins).</p>
 

	
 
<p>Space for this exclusive dinner <em>is limited</em> so if you haven't
www/conservancy/static/supporter/index.html
Show inline comments
...
 
@@ -34,49 +34,49 @@ Other annual supporters methods:
 
       Contact <a href="mailto:accounting@sfconservancy.org">Conservancy
 
            by email</a><br/> for wire transfer instructions.<br/>
 
            Include  currency &amp; country.<br/>
 
    </div><!-- /.toggle-content -->
 
</div><!-- /.toggle.unit -->
 

	
 
<div class="toggle-unit">
 
    <h4 class="toggle-control" data-text="Paper Check" 
 
    data-expanded-text="Paper Check:">Paper Check</h4>
 
    <div class="toggle-content">
 
    Send paper check for $120 to:<br/>
 
    Software Freedom Conservancy, Inc.<br/>
 
    137 MONTAGUE ST  STE 380<br/>
 
    BROOKLYN, NY 11201-3548 &nbsp; USA<br/>
 
    Please write <q>SUPPORTER</q> and t-shirt size in memo line. 
 
    </div><!-- /.toggle-content -->
 
</div><!-- /.toggle.unit -->
 

	
 
<p><a href="/donate">Even More Ways to Donate</a></p>
 
<!-- Flattr end -->
 
</td></tr></table>
 
</div>
 

	
 

	
 
<div style="align:left;width:80%;">
 
<div class="content-with-donate-sidebar">
 
  <h1><img class="appeal-header" alt="Become a Conservancy Supporter!" src="/img/conservancy-supporter-header.png"/></h1>
 

	
 
<p>Software Freedom Conservancy is an essential organization to free and
 
open source software. We are the home of over
 
<a href="/members/current/">30 projects</a> like 
 
<a href="http://git-scm.org">Git</a>,
 
<a href="http://inkscape.org">Inkscape</a>, <a href="http://samba.org">Samba</a>,
 
<a href="http://winehq.org">Wine</a>, <a href="http://www.seleniumhq.org/">Selenium</a>, the <a href="/linux-compliance/">GPL Compliance Project for Linux
 
Developers</a>, <a href="http://pypy.org">PyPy</a> and
 
<a href="http://sugarlabs.org/">Sugar Labs</a> just to name a few. Conservancy is a "fiscal sponsor plus",
 
providing everything that our projects need in a nonprofit. We help our
 
projects defend their trademarks, manage their assets, handle donations,
 
improve their community management, manage risk and assist them with all
 
legal needs they may have. While we do receive a portion of the revenue
 
donated to our projects, we keep that number low enough that it doesn't
 
even pay for a single staff member. <a href="#donate-box" class="donate-now">Help us</a> show that you care about
 
community-focused free software and help us be able to continue our
 
charitable work. Donating to Conservancy is a great non-technical way to
 
contribute to the cause.</p>
 

	
 
<img alt="*** The Conservancy T-Shirt that Supporters Receive ***" class="appeal" src="/img/conservancy-t-shirt.jpg"/>
 

	
 
<p>For the first time, we're launching a Supporter
 
program. For <a href="#donate-box" class="donate-now">an annual donation of $120</a>, you can
www/conservancy/templates/base_compliance.html
Show inline comments
...
 
@@ -17,40 +17,40 @@
 

	
 
<h3>Support GPL Compliance Now!</h3>
 

	
 
<p>Support our GPL compliance work now &amp; <strong>donation counts double!</strong></p>
 

	
 
$<span id="fundraiser-so-far">5,056</span>
 
of $<span id="fundraiser-goal">50,000</span> match met.<br/>
 
<div id="progressbar" style="height:20px;"><span id="fundraiser-percentage" style="float:right; align:center; margin-right:40%"></span></div>
 

	
 
<p>Donate now via PayPal:
 
</p>
 
<!-- PayPal start -->
 
<form action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_top">
 
<input type="hidden" name="cmd" value="_s-xclick">
 
<input type="hidden" name="hosted_button_id" value="4ZKJN4F9BMFAS">
 
<input type="image" src="https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif" style="border:0" name="submit" alt="PayPal - The safer, easier way to pay online!">
 
<img alt="" style="border:0" src="https://www.paypalobjects.com/en_US/i/scr/pixel.gif" width="1" height="1">
 
</form>
 
<!-- PayPal end -->
 

	
 
<p>Or, <a href="/supporter/#annual"><strong>become a Conservancy
 
      Supporter</strong></a>.</p>
 
</td></tr></table>
 
</div>
 
<div style="align:left;width:80%;">
 
<div class="content-with-donate-sidebar">
 
    <div id="container">
 
         <div id="sidebar" class="{% block submenuselection %}other{% endblock %}">
 
            <h2>Our GPL {% block category %}Compliance{% endblock %} Work</h2>
 
            <ul>
 
            <li class="VMwareLawsuitAppeal"><a href="/linux-compliance/vmware-lawsuit-appeal.html">Stand Up For GPL!</a></li>
 
            <li><a href="/news/2015/mar/05/vmware-lawsuit/">VMware Lawsuit: Press Release</a></li>
 
            <li class="VMwareLawsuitFAQ"><a href="/linux-compliance/vmware-lawsuit-faq.html">
 
                <abbr title="Frequently Asked Questions">FAQ</abbr> on VMware Lawsuit</a></li>
 
            <li class="AboutCompliance"><a href="/linux-compliance/about.html">About GPL Compliance Project for Linux Developers</a></li>
 
            </ul>
 
         </div>
 
               <div id="mainContent">{% block content %}{% endblock %}
 
               </div>
 
</div></div>
 
{% endblock %}
0 comments (0 inline, 0 general)