Better logos and everything!

diff --git a/css/master.css b/css/master.css
index 4c99f7df26aff1346afaf40e2762f065d95a4d5a..18702529731085a1633c60f334f5de10f77c52ea 100644 (file)
--- a/css/master.css
+++ b/css/master.css
@@ -67,15 +67,6 @@
 }
 
 /*Typography*/
-@font-face {
-  font-family: "Open Sans Bold";
-  font-weight: bold;
-  font-style: normal;
-
-  src: url("../fonts/opensans-bold-webfont.eot");
-  src: url("../fonts/opensans-bold-webfont.eot?#iefix") format('embedded-opentype'), url("../fonts/opensans-bold-webfont.woff2") format('woff2'), url("../fonts/opensans-bold-webfont.woff") format('woff'), url("../fonts/opensans-bold-webfont.ttf") format('truetype');
-
-}
 @font-face {
   font-family: "Open Sans";
   font-weight: 400;
@@ -83,7 +74,14 @@
 
   src: url("../fonts/opensans-regular-webfont.eot");
   src: url("../fonts/opensans-regular-webfont.eot?#iefix") format('embedded-opentype'), url("../fonts/opensans-regular-webfont.woff2") format('woff2'), url("../fonts/opensans-regular-webfont.woff") format('woff'), url("../fonts/opensans-regular-webfont.ttf") format('truetype');
+}
+@font-face {
+  font-family: "Open Sans Bold";
+  font-weight: 700;
+  font-style: normal;
 
+  src: url("../fonts/opensans-bold-webfont.eot");
+  src: url("../fonts/opensans-bold-webfont.eot?#iefix") format('embedded-opentype'), url("../fonts/opensans-bold-webfont.woff2") format('woff2'), url("../fonts/opensans-bold-webfont.woff") format('woff'), url("../fonts/opensans-bold-webfont.ttf") format('truetype');
 }
 @font-face {
   font-family: "Signika Bold";
@@ -92,7 +90,6 @@
 
   src: url("../fonts/signika-bold-webfont.eot");
   src: url("../fonts/signika-bold-webfont.eot?#iefix") format('embedded-opentype'), url("../fonts/signika-bold-webfont.woff2") format('woff2'), url("../fonts/signika-bold-webfont.woff") format('woff'), url("../fonts/signika-bold-webfont.ttf") format('truetype');
-
 }
 @font-face {
   font-family: "Signika Light";
@@ -101,7 +98,6 @@
 
   src: url("../fonts/signika-light-webfont.eot");
   src: url("../fonts/signika-light-webfont.eot?#iefix") format('embedded-opentype'), url("../fonts/signika-light-webfont.woff2") format('woff2'), url("../fonts/signika-light-webfont.woff") format('woff'), url("../fonts/signika-light-webfont.ttf") format('truetype');
-
 }
 @font-face {
   font-family: "Signika Regular";
@@ -117,7 +113,7 @@ h1 {
   margin-top: 10px;
   margin-bottom: 20px;
 
-  color: #2caf8f;
+  color: #4B423B;
 
   font-family: "Signika Light";
   font-size: 35px;
@@ -148,7 +144,6 @@ h4 {
 }
 
 h5 {
-  margin-bottom: 25px;
 
   color: #4a4a4a;
 
@@ -192,6 +187,8 @@ a:hover {
 }
 
 section {
+  padding-top: 20px;
+  padding-bottom: 20px;
   margin-bottom: 20px;
 }
 /*Header*/
@@ -496,8 +493,8 @@ li.neutral {
 /*Charities*/
 
 .charities {
-  /*padding-top: 30px;*/
-  padding-bottom: 50px;
+  background-color: #E4F5F1;
+  margin-bottom: 0;
 }
 
 .charities img {
@@ -512,8 +509,12 @@ li.neutral {
 
 /*Licenses*/
 
-.licenses .well,
-.licenses .panel-default .panel-heading  {
+.licenses {
+  background-color: #fffae5;
+  margin-bottom: 0;
+}
+
+.licenses .panel-default .panel-heading {
   background-color: #fffae5;
   border: 0;
   box-shadow: 0 0 0 transparent;
@@ -528,11 +529,21 @@ footer {
   padding-top: 30px;
   padding-bottom: 30px;
 
-  background-color: #1a1a1a;
+  background-color: #4B423B;
 }
 
 footer p {
   color: white;
+  color: rgba(255,255,255,0.72);
+}
+
+footer a {
+  color: #FFD429;
+  font-weight: 700;
+}
+
+footer a:hover {
+  color: white;
 }
 
 .footer-logo {
@@ -617,7 +628,7 @@ footer p {
 
   /*Fixes*/
   /*This sections fixes the inevitable difference in height of the comparison panes with margin-top where a simpler isn't possible*/
-  .fix-iphone {
+  /*.fix-iphone {
     margin-top: 15px;
   }
 
@@ -632,7 +643,7 @@ footer p {
 
   .fix-itunes {
     margin-top: 50px;
-  }
+  }*/
 }
 /* Medium devices (desktops, 992px and up) */
 @media (min-width: 992px) {
@@ -738,7 +749,7 @@ footer p {
 
   /*Fixes*/
   /*This sections fixes the inevitable difference in height of the comparison panes with margin-top where a simpler isn't possible*/
-  .fix-iphone {
+  /*.fix-iphone {
     margin-top: 15px;
   }
 
@@ -753,7 +764,7 @@ footer p {
 
   .fix-itunes {
     margin-top: 50px;
-  }
+  } */
 }
 
 /* Large devices (large desktops, 1200px and up) */

diff --git a/givingguide.html b/givingguide.html
index 45c2b73d51e4d9dac2a4fd21755fa970121c952b..28a715ed02446846058ccb84f9aef3c10db34719 100644 (file)
--- a/givingguide.html
+++ b/givingguide.html
@@ -38,7 +38,7 @@
           <span class="icon-bar bar2"></span>
           <span class="icon-bar bar3"></span>
         </button>
-        <a class="navbar-brand" href="#"><img class="brand" src="img/logo.png" alt="FSF" width="180" /></a>
+        <a class="navbar-brand" href="https://fsf.org/"><img class="brand" src="img/logo.png" alt="FSF" width="180" /></a>
         <!-- <span class="label label-warning"><a href="http://fsf.org/jfb">Join the FSF</a></span> -->
 
       </div>
@@ -46,10 +46,10 @@
       <!-- Collect the nav links, forms, and other content for toggling -->
       <div class="collapse navbar-collapse" id="navbar-links">
         <ul class="nav navbar-nav">
-          <li><a href="https://www.fsf.org/about/">About the FSF</a></li>
-          <li><a href="https://www.fsf.org/campaigns/">Campaigns</a></li>
-          <li><a href="https://www.fsf.org/donate/">Donate</a></li>
-          <li><a href="http://shop.fsf.org/">Shop</a>
+          <li><a class="animated fadeIn" href="https://www.fsf.org/about/">About the FSF</a></li>
+          <li><a class="animated fadeIn" href="https://www.fsf.org/campaigns/">Campaigns</a></li>
+          <li><a class="animated fadeIn" href="https://www.fsf.org/donate/">Donate</a></li>
+          <li><a class="animated fadeIn" href="http://shop.fsf.org/">Shop</a>
         </ul>
 
       </div>
@@ -181,7 +181,7 @@
         <!--End Good-->
 
         <div class="bad col-md-6 col-sm-6">
-          <img src="img/products/iphone-blocked.png" alt="iphone" class="center-block fix-iphone" width="80" />
+          <img src="img/products/iphone-blocked.png" alt="iphone" class="center-block fix-iphone" width="250" />
           <h5 class="text-center">iPhone</h5>
           <ul class="cons">
             <li>Comes with no shortage of <a href="https://www.gnu.org/philosophy/proprietary-surveillance.html#SpywareIniThings">spyware</a>.</li>
@@ -410,7 +410,7 @@
         <!--End Good-->
 
         <div class="bad col-md-6 col-sm-6">
-          <img src="img/products/adobe-blocked.png" alt="adobe" class="center-block" height="150" />
+          <img src="img/products/adobe-blocked.png" alt="adobe" class="center-block" height="250" />
           <h5 class="text-center">Photoshop and Illustrator</h5>
           <ul class="cons">
             <li>Proprietary software controlled by Adobe.</li>
@@ -494,10 +494,10 @@
       <!-- End Row -->
       <div class="row">
         <div class="col-md-12">
-          <p class="alert alert-info"> If you have ideas for more gifts that can be given freely, submit your recommendations to our <a class="alert-link" href="http://libreplanet.org/wiki/Group:Giving_Guide_Suggestions">growing page</a>.
+          <p class="alert alert-info"> If you have ideas for more gifts that can be given freely, submit your recommendations to our <a class="alert-link" href="http://libreplanet.org/wiki/Group:Giving_Guide_Suggestions">growing page.</a>
         </div>
         <div class="col-md-12">
-          <p class="alert alert-success">To learn more about which hardware supports free software and which doesn't, explore the community-run <a href="https://www.h-node.org/" class="alert-link">h-node database</a>.</p>
+          <p class="alert alert-success">To learn more about which hardware supports free software and which doesn't, explore the community-run <a href="https://www.h-node.org/" class="alert-link">h-node database.</a></p>
         </div>
       </div>
     </div>
@@ -512,28 +512,28 @@
       <h1>Recommended organizations for holiday donations</h1>
       <div class="row">
         <div class="col-md-3 col-sm-4 col-xs-6">
-          <a href="http://www.fsf.org/"><img src="img/charities/fsf.jpg" alt="fsf" class="center-block img-responsive" /></a>
+          <a href="http://www.fsf.org/"><img src="img/charities/fsf.png" alt="fsf" class="center-block img-responsive" /></a>
         </div>
         <div class="col-md-3 col-sm-4 col-xs-6">
-          <a href="http://www.sfconservancy.org/"><img src="img/charities/sfc.jpg" alt="sfc" class="center-block img-responsive" /></a>
+          <a href="http://www.sfconservancy.org/"><img src="img/charities/sfc.png" alt="sfc" class="center-block img-responsive" /></a>
         </div>
         <div class="col-md-3 col-sm-4 col-xs-6">
-          <a href="http://www.eff.org/"><img src="img/charities/eff.jpg" alt="eff" class="center-block img-responsive" /></a>
+          <a href="http://www.eff.org/"><img src="img/charities/eff.png" alt="eff" class="center-block img-responsive" /></a>
         </div>
         <div class="col-md-3 col-sm-4 col-xs-6">
-          <a href="http://www.creativecommons.org/"><img src="img/charities/cc.jpg" alt="cc" class="center-block img-responsive" /></a>
+          <a href="http://www.creativecommons.org/"><img src="img/charities/cc.png" alt="cc" class="center-block img-responsive" /></a>
         </div>
         <div class="col-md-3 col-sm-4 col-xs-6">
-          <a href="http://wikimedia.org/"><img src="img/charities/wikimedia.jpg" alt="wikimedia" class="center-block img-responsive" /></a>
+          <a href="http://wikimedia.org/"><img src="img/charities/wikimedia.png" alt="wikimedia" class="center-block img-responsive" /></a>
         </div>
         <div class="col-md-3 col-sm-4 col-xs-6">
-          <a href="http://www.softwarefreedom.org/"><img src="img/charities/sflc.jpg" alt="sflc" class="center-block img-responsive" /></a>
+          <a href="http://www.softwarefreedom.org/"><img src="img/charities/sflc.png" alt="sflc" class="center-block img-responsive" /></a>
         </div>
         <div class="col-md-3 col-sm-4 col-xs-6">
-          <a href="http://www.gnome.org/"><img src="img/charities/gnome.jpg" alt="gnome" class="center-block img-responsive" /></a>
+          <a href="http://www.gnome.org/"><img src="img/charities/gnome.png" alt="gnome" class="center-block img-responsive" /></a>
         </div>
         <div class="col-md-3 col-sm-4 col-xs-6">
-          <a href="https://ceata.org/"><img src="img/charities/ceata.jpg" alt="ceata" class="center-block img-responsive" /></a>
+          <a href="https://ceata.org/"><img src="img/charities/ceata.png" alt="ceata" class="center-block img-responsive" /></a>
         </div>
       </div>
     </div>
@@ -545,7 +545,7 @@
     <div class="container">
       <div class="row">
         <div class="col-md-12">
-          <div class="well panel-default">
+          <div class="panel-default">
             <div class="panel-heading">
               <h1 class="fix-margin">Licenses</h1>
             </div>
@@ -583,10 +583,10 @@
   <footer>
     <div class="container-fluid">
       <div class="row">
-        <div class="col-md-3 col-sm-3 footer-logo">
-          <img src="../img/FSF_footer.png" alt="FSF" class="center-block" width="120" />
+        <div class="col-md-4 col-sm-4 footer-logo">
+          <a href="https://fsf.org/"><img src="../img/fsf-footer.png" alt="FSF" class="center-block" width="290"/></a>
         </div>
-        <div class="col-md-9 col-sm-9">
+        <div class="col-md-8 col-sm-8">
           <p>The FSF is a nonprofit with a worldwide mission to advance software freedom —
             <a href="https://fsf.org/about">learn about our history and work.</a>
           </p>

diff --git a/img/FSF_footer.png b/img/FSF_footer.png
deleted file mode 100644 (file)
index f9f207a..0000000
Binary files a/img/FSF_footer.png and /dev/null differ

diff --git a/img/charities/cc.jpg b/img/charities/cc.jpg
deleted file mode 100644 (file)
index 92e8f43..0000000
Binary files a/img/charities/cc.jpg and /dev/null differ

diff --git a/img/charities/cc.png b/img/charities/cc.png
new file mode 100644 (file)
index 0000000..bd5b26c
Binary files /dev/null and b/img/charities/cc.png differ

diff --git a/img/charities/ceata.jpg b/img/charities/ceata.jpg
deleted file mode 100644 (file)
index 1d4e522..0000000
Binary files a/img/charities/ceata.jpg and /dev/null differ

diff --git a/img/charities/ceata.png b/img/charities/ceata.png
new file mode 100644 (file)
index 0000000..ab86527
Binary files /dev/null and b/img/charities/ceata.png differ

diff --git a/img/charities/eff.jpg b/img/charities/eff.jpg
deleted file mode 100644 (file)
index 7e0d613..0000000
Binary files a/img/charities/eff.jpg and /dev/null differ

diff --git a/img/charities/eff.png b/img/charities/eff.png
new file mode 100644 (file)
index 0000000..09f5e77
Binary files /dev/null and b/img/charities/eff.png differ

diff --git a/img/charities/fsf.jpg b/img/charities/fsf.jpg
deleted file mode 100644 (file)
index ba62e90..0000000
Binary files a/img/charities/fsf.jpg and /dev/null differ

diff --git a/img/charities/fsf.png b/img/charities/fsf.png
new file mode 100644 (file)
index 0000000..9162215
Binary files /dev/null and b/img/charities/fsf.png differ

diff --git a/img/charities/gnome.jpg b/img/charities/gnome.jpg
deleted file mode 100644 (file)
index 8a3ab20..0000000
Binary files a/img/charities/gnome.jpg and /dev/null differ

diff --git a/img/charities/gnome.png b/img/charities/gnome.png
new file mode 100644 (file)
index 0000000..6e6cb8b
Binary files /dev/null and b/img/charities/gnome.png differ

diff --git a/img/charities/sfc.jpg b/img/charities/sfc.jpg
deleted file mode 100644 (file)
index b339ede..0000000
Binary files a/img/charities/sfc.jpg and /dev/null differ

diff --git a/img/charities/sfc.png b/img/charities/sfc.png
new file mode 100644 (file)
index 0000000..96dc613
Binary files /dev/null and b/img/charities/sfc.png differ

diff --git a/img/charities/sflc.jpg b/img/charities/sflc.jpg
deleted file mode 100644 (file)
index b4bb68a..0000000
Binary files a/img/charities/sflc.jpg and /dev/null differ

diff --git a/img/charities/sflc.png b/img/charities/sflc.png
new file mode 100644 (file)
index 0000000..ee8f9f4
Binary files /dev/null and b/img/charities/sflc.png differ

diff --git a/img/charities/wikimedia.jpg b/img/charities/wikimedia.jpg
deleted file mode 100644 (file)
index cb626d8..0000000
Binary files a/img/charities/wikimedia.jpg and /dev/null differ

diff --git a/img/charities/wikimedia.png b/img/charities/wikimedia.png
new file mode 100644 (file)
index 0000000..0e4599a
Binary files /dev/null and b/img/charities/wikimedia.png differ

diff --git a/img/fsf-footer.png b/img/fsf-footer.png
new file mode 100644 (file)
index 0000000..56af21f
Binary files /dev/null and b/img/fsf-footer.png differ

diff --git a/img/products/adobe-blocked.png b/img/products/adobe-blocked.png
index 5154990852067bb3776457eeab86d7977c81dc5a..4d07c1d66e8571217de3833ba5f98f318b16d3e2 100644 (file)
Binary files a/img/products/adobe-blocked.png and b/img/products/adobe-blocked.png differ

diff --git a/img/products/amazon-blocked.png b/img/products/amazon-blocked.png
index af65b979f6b0437596eeb10a0458bdd23187705b..ffc5e262f0a14eaa5e3c3c7cf6bcf8ec7c65eee9 100644 (file)
Binary files a/img/products/amazon-blocked.png and b/img/products/amazon-blocked.png differ

diff --git a/img/products/iphone-blocked.png b/img/products/iphone-blocked.png
index 706a4070479e99d6192dee1e3a7866a0729dade3..8e15b270412856b5f6cc9dc3d0dcba89c5d1943e 100644 (file)
Binary files a/img/products/iphone-blocked.png and b/img/products/iphone-blocked.png differ

diff --git a/img/products/itunes-blocked.png b/img/products/itunes-blocked.png
index 593613c4a11bf03449b03581c3fe52aeccec7427..f3ec11a777b8cc2050e601e12ae22a9a7c723c07 100644 (file)
Binary files a/img/products/itunes-blocked.png and b/img/products/itunes-blocked.png differ

diff --git a/img/products/lenovo-blocked.png b/img/products/lenovo-blocked.png
index 8ff0825ee19f13ab7a4e5f0a5ba6d23d93c00623..97335cfba59da5d825d3b2fe41ab3ef9d3f6bf44 100644 (file)
Binary files a/img/products/lenovo-blocked.png and b/img/products/lenovo-blocked.png differ

diff --git a/img/products/macbook-blocked.png b/img/products/macbook-blocked.png
index 10beb4ebdf0c7f78af86861af4f4a70e80e705ae..c9ac57accd94be95e9c38114ae108902362cf4e3 100644 (file)
Binary files a/img/products/macbook-blocked.png and b/img/products/macbook-blocked.png differ

diff --git a/img/products/printer-blocked.png b/img/products/printer-blocked.png
index b63b9baad3dd3646becd5ff34e7fc6146c10e908..6eb7b9dd7d74012ad1a8f6d8aee81adfdecc5c83 100644 (file)
Binary files a/img/products/printer-blocked.png and b/img/products/printer-blocked.png differ

diff --git a/img/products/router-blocked.png b/img/products/router-blocked.png
index 26a4cf8016ec764fc75557a3be0cf52824f3fcac..fddf9677b0cc5f0122409e1a42f733b2d83997f1 100644 (file)
Binary files a/img/products/router-blocked.png and b/img/products/router-blocked.png differ