Tweaks and fixes

diff --git a/css/master.css b/css/master.css
index 3142e92cfb06a951243f20bc893778b002d93c0b..97a76b40a67172202195b125e86b2e6ba53a7915 100644 (file)
--- a/css/master.css
+++ b/css/master.css
@@ -122,7 +122,6 @@ h3 {
 }
 
 h4 {
-  /*padding-top: 23px;*/
   color: #9b9b9b;
   font-size: 24px;
   font-family: "Signika Light";
@@ -394,6 +393,10 @@ li.neutral {
 }
 /*Recommended Lines*/
 
+.certified {
+  display: none;
+}
+
 .recommended-img img{
     width: 300px;
     height: 300px;
@@ -402,6 +405,7 @@ li.neutral {
 .recommended-section {
   padding-top: 30px;
   padding-bottom: 30px;
+  background: #fffae5;
 }
 /*Charities*/
 .charities {
@@ -410,13 +414,13 @@ li.neutral {
 }
 
 .charities img {
-  -webkit-filter: brightness(0.5) opacity(0.8) sepia(1);
-  filter: brightness(10) opacity(0.8) sepia(1);
+  -webkit-filter: brightness(0.4) opacity(0.8) sepia(1);
+  filter: brightness(0.4) opacity(0.8) sepia(1);
   -webkit-transition: .3s all ease;
   -moz-transition: .3s all ease;
   transition: .3s all ease;
 
-  -moz-filter: brightness(0.5) opacity(0.8) sepia(1);
+  -moz-filter: brightness(0.4) opacity(0.8) sepia(1);
 }
 
 .charities img:hover {
@@ -446,7 +450,7 @@ li.neutral {
 /*Footer*/
 footer {
   padding-top: 30px;
-  padding-bottom: 30px;
+  /*padding-bottom: 30px;*/
   background-color: #4B423B;
 }
 
@@ -468,6 +472,12 @@ footer a:hover {
   margin-bottom: 15px;
   max-height: 220px;
 }
+
+.ornament {
+  margin-top: 20px;
+  height: 5px;
+  background: linear-gradient(90deg, #FFD429 15%, #2B81E3 15%, #2B81E3 30%,#2CAF8F 30%, #2CAF8F 45%, #F3FAFF 45%, #F3FAFF 60%, #0AD778 60%, #0AD778 75%, #D70A0A 75%, #D70A0A 85%);
+}
 /* Media Queries */
 /* Small devices (tablets, 768px and up) */
 @media (min-width: 768px) {
@@ -527,6 +537,11 @@ footer a:hover {
   .join {
     display: none;
   }
+
+  .recommended-section h5 {
+    text-align: left;
+    padding-left: 46px;
+  }
   /*Footer*/
   .footer-logo {
     margin-bottom: 0;

diff --git a/givingguide.html b/givingguide.html
index 072746a28fc8243f749ba7f1f591830283d56f69..d82f5abcac8e314719abf976a689f0a8d31eead5 100644 (file)
--- a/givingguide.html
+++ b/givingguide.html
@@ -82,46 +82,6 @@
   </section>
   <!--End Intro-->
 
-  <!--Begin Actions-->
-  <section class="actions">
-    <div class="container">
-      <div class="row">
-        <!-- Begin Share -->
-        <div class="action col-md-4 col-sm-4 text-center">
-          <h2>Share</h2>
-          <p>
-            Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt.
-          </p>
-          <a class="action-button" href="https://www.fsf.org/share?u=https://www.fsf.org/givingguide/&amp;t=Check out the Free Software Foundation Ethical Tech Giving Guide">#givefreely</a>
-        </div>
-        <!-- End Share -->
-
-        <!-- Begin Share -->
-        <div class="action col-md-4 col-sm-4 text-center">
-          <h2>Organize</h2>
-          <p>
-            Download the printable version and organize a <a href="https://www.fsf.org/givingguide/giving-guide-giveaway-primer">Giving Guide Giveaway</a> to share it with your community.
-          </p>
-          <a class="action-button" href="https://www.fsf.org/givingguide/giving-guide-giveaway-primer#printable">Print the guide</a>
-        </div>
-        <!-- End Share -->
-
-        <!-- Begin Share -->
-        <div class="action col-md-4 col-sm-4 text-center">
-          <h2>Non-profit</h2>
-          <p>
-            Donating to a <a href="#charities">nonprofit</a> in someone's name is at least as meaningful as buying them an electronic device.
-          </p>
-          <a class="action-button" href="#charities">Donate</a>
-        </div>
-        <!-- End Share -->
-      </div>
-      <!-- End Row -->
-    </div>
-    <!-- End Container -->
-  </section>
-  <!--End Actions-->
-
   <!--Begin Comparisons-->
   <section class="comparisons">
 
@@ -202,12 +162,13 @@
     <!--End Container-->
 
     <!-- Begin Recommended Template -->
-    <div class="container recommended-section">
+    <div class="container-fluid recommended-section">
+      <h1 class="text-center">Products Certified to Respect Your Freedom</h1>
       <div class="row">
-        <div class="col-md-6 col-sm-6 recommended-img">
+        <div class="col-md-5 col-sm-6 recommended-img">
           <img src="img/products/t400.png" alt="t400" class="center-block" />
         </div>
-        <div class="col-md-6 col-sm-6">
+        <div class="col-md-7 col-sm-6">
           <h5 class="text-center">Minifree T400 with GNU/Linux</h5>
           <ul class="pros">
             <li>As free as can be: runs the <a href="https://www.gnu.org/distros/free-distros.en.html">FSF-endorsed</a> Trisquel operating system and libreboot firmware on hardware that is <a href="https://www.fsf.org/ryf">certified to Respect Your Freedom</a>.</li>
@@ -508,6 +469,47 @@
   </section>
   <!-- End Certified -->
 
+
+  <!--Begin Actions-->
+  <section class="actions">
+    <div class="container">
+      <div class="row">
+        <!-- Begin Share -->
+        <div class="action col-md-4 col-sm-4 text-center">
+          <h2>Share</h2>
+          <p>
+            Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt.
+          </p>
+          <a class="action-button" href="https://www.fsf.org/share?u=https://www.fsf.org/givingguide/&amp;t=Check out the Free Software Foundation Ethical Tech Giving Guide">#givefreely</a>
+        </div>
+        <!-- End Share -->
+
+        <!-- Begin Share -->
+        <div class="action col-md-4 col-sm-4 text-center">
+          <h2>Organize</h2>
+          <p>
+            Download the printable version and organize a <a href="https://www.fsf.org/givingguide/giving-guide-giveaway-primer">Giving Guide Giveaway</a> to share it with your community.
+          </p>
+          <a class="action-button" href="https://www.fsf.org/givingguide/giving-guide-giveaway-primer#printable">Print the guide</a>
+        </div>
+        <!-- End Share -->
+
+        <!-- Begin Share -->
+        <div class="action col-md-4 col-sm-4 text-center">
+          <h2>Non-profit</h2>
+          <p>
+            Donating to a <a href="#charities">nonprofit</a> in someone's name is at least as meaningful as buying them an electronic device.
+          </p>
+          <a class="action-button" href="#charities">Donate</a>
+        </div>
+        <!-- End Share -->
+      </div>
+      <!-- End Row -->
+    </div>
+    <!-- End Container -->
+  </section>
+  <!--End Actions-->
+
   <!-- Begin Donations -->
   <section class="charities" id="charities">
     <div class="container">
@@ -603,6 +605,7 @@
       <!-- End Row -->
     </div>
     <!-- End Container -->
+    <div class="ornament"></div>
   </footer>
   <!-- End Footer -->
 

diff --git a/img/charities/ceata.png b/img/charities/ceata.png
index dde90d7291e08db0be8a5305c31f76d566ec73c8..0b8e69d0865748ba3aba1412fc05deeed3be1075 100644 (file)
Binary files a/img/charities/ceata.png and b/img/charities/ceata.png differ

diff --git a/img/charities/fsf.png b/img/charities/fsf.png
index f627bf6e326de438001a1e61222c140f4107b167..0ef2c04c45463cd91b7bdc8a5f185db8395f0e69 100644 (file)
Binary files a/img/charities/fsf.png and b/img/charities/fsf.png differ

diff --git a/img/charities/gnome.png b/img/charities/gnome.png
index 9a0567f28170e9689acbd6aedba62b739d49a0cf..191f8a278bdff617de21e2cabb702b6a020fbb58 100644 (file)
Binary files a/img/charities/gnome.png and b/img/charities/gnome.png differ

diff --git a/img/charities/sflc.png b/img/charities/sflc.png
index bcda4dc569b5babbef432342b4ae7bcce7c43cb5..78080d6b9e81f1ffb453b950e7f4c0d28c845dd3 100644 (file)
Binary files a/img/charities/sflc.png and b/img/charities/sflc.png differ

diff --git a/img/charities/wikimedia.png b/img/charities/wikimedia.png
index 018b8b7dac0828fc9dcfe16a7af8cea1ab0d76fd..466f99ba48e2ba59e326d1c4146771ec350c1ffe 100644 (file)
Binary files a/img/charities/wikimedia.png and b/img/charities/wikimedia.png differ

diff --git a/img/fsf-footer.png b/img/fsf-footer.png
index 1aacd31b0adfec5eb0f38f5135e54313f76b7142..046d31379e9b5c2963eaa623e50dde6a122facae 100644 (file)
Binary files a/img/fsf-footer.png and b/img/fsf-footer.png differ

diff --git a/img/logo.png b/img/logo.png
index 9cc852bdec4e90eaf1fa9fb0a425cc13625e112b..8d7aacff623fe7f7b0df3221dcc2cf8bfaf84d55 100644 (file)
Binary files a/img/logo.png and b/img/logo.png differ

diff --git a/img/products/replicant.jpg b/img/products/replicant.jpg
deleted file mode 100644 (file)
index 6f1c010..0000000
Binary files a/img/products/replicant.jpg and /dev/null differ

diff --git a/img/products/x200.jpg b/img/products/x200.jpg
deleted file mode 100644 (file)
index 617b8e6..0000000
Binary files a/img/products/x200.jpg and /dev/null differ