Even more tweaks

diff --git a/css/master.css b/css/master.css
index e1a3615dec4726f399c122c857aaa358a412024b..3142e92cfb06a951243f20bc893778b002d93c0b 100644 (file)
--- a/css/master.css
+++ b/css/master.css
@@ -102,7 +102,7 @@
 }
 /*Text Styles*/
 h1 {
-  margin-top: 10px;
+  /*margin-top: 10px;*/
   margin-bottom: 20px;
   color: #4B423B;
   font-size: 35px;
@@ -122,7 +122,7 @@ h3 {
 }
 
 h4 {
-  padding-top: 23px;
+  /*padding-top: 23px;*/
   color: #9b9b9b;
   font-size: 24px;
   font-family: "Signika Light";
@@ -154,6 +154,7 @@ a {
   color: #2caf8f;
   text-decoration: none;
   -webkit-transition: .3s all ease;
+  -moz-transition: .3s all ease;
   transition: .3s all ease;
 }
 
@@ -163,9 +164,8 @@ a:hover {
 }
 
 section {
-  margin-bottom: 20px;
-  padding-top: 20px;
-  padding-bottom: 20px;
+  padding-top: 30px;
+  padding-bottom: 30px;
 }
 /*Header*/
 /*Navbar*/
@@ -217,6 +217,10 @@ section {
   background: #2caf8f;
 }
 
+.intro-text h1 {
+  color: #2caf8f;
+}
+
 .illustration {
   padding-bottom: 60px;
 }
@@ -227,13 +231,11 @@ section {
 }
 /*Actions*/
 .actions {
-  padding-top: 30px;
   background: #fffae5;
 }
 
 .action {
   position: relative;
-  margin-bottom: 50px;
 }
 
 .action-button {
@@ -391,6 +393,12 @@ li.neutral {
   text-align: center;
 }
 /*Recommended Lines*/
+
+.recommended-img img{
+    width: 300px;
+    height: 300px;
+}
+
 .recommended-section {
   padding-top: 30px;
   padding-bottom: 30px;
@@ -398,25 +406,27 @@ li.neutral {
 /*Charities*/
 .charities {
   margin-bottom: 0;
-  background-color: #E4F5F1;
+  background-color: #FFD429;
 }
 
 .charities img {
-  -webkit-filter: brightness(0.5) opacity(0.5) grayscale(1);
-  filter: brightness(0.5) opacity(0.5) grayscale(1);
+  -webkit-filter: brightness(0.5) opacity(0.8) sepia(1);
+  filter: brightness(10) 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.5) grayscale(1);
+  -moz-filter: brightness(0.5) opacity(0.8) sepia(1);
 }
 
 .charities img:hover {
-  -webkit-filter: brightness(1) opacity(1) grayscale(0);
-  filter: brightness(1) opacity(1) grayscale(0);
+  -webkit-filter: brightness(1) opacity(1) sepia(0);
+  filter: brightness(1) opacity(1) sepia(0);
   -webkit-transform: scale(1.1);
   -moz-transform: scale(1.1);
   transform: scale(1.1);
+
+  -moz-filter: brightness(1) opacity(1) sepia(0);
 }
 /*Licenses*/
 .licenses {

diff --git a/givingguide.html b/givingguide.html
index fa7b7f4cd4db5cc6b6475490033817103f4dfad6..072746a28fc8243f749ba7f1f591830283d56f69 100644 (file)
--- a/givingguide.html
+++ b/givingguide.html
@@ -143,7 +143,7 @@
           <a class="rfy" href="https://www.fsf.org/resources/hw/endorsement/respects-your-freedom">RFY-Certified</a>
           <!-- End RFY -->
 
-          <img src="https://static.fsf.org/nosvn/images/givingguide/images/tehnoetic-s2.png" alt="replicant phone" class="center-block" />
+          <img src="img/products/replicant.png" alt="replicant phone" class="center-block" />
           <h5 class="text-center">Tehnoetic S2 with Replicant</h5>
 
           <!-- Buy/Download Button   -->
@@ -205,7 +205,7 @@
     <div class="container recommended-section">
       <div class="row">
         <div class="col-md-6 col-sm-6 recommended-img">
-          <img src="https://static.fsf.org/nosvn/images/givingguide/images/minifree-t400.png" alt="t400" class="center-block" />
+          <img src="img/products/t400.png" alt="t400" class="center-block" />
         </div>
         <div class="col-md-6 col-sm-6">
           <h5 class="text-center">Minifree T400 with GNU/Linux</h5>
@@ -226,7 +226,7 @@
       <h3 class="title text-center">Full-sized Laptops</h3>
       <div class="row">
         <div class="good col-md-6 col-sm-6">
-          <img src="https://static.fsf.org/nosvn/images/givingguide/images/minifree-t400.png" alt="t400" class="center-block" />
+          <img src="img/products/t400.png" alt="t400" class="center-block" />
           <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>
@@ -259,7 +259,7 @@
       <h3 class="title text-center">Compact Laptops</h3>
       <div class="row">
         <div class="good col-md-6 col-sm-6">
-          <img src="img/products/x200.jpg" alt="x200" class="center-block" />
+          <img src="img/products/x200.png" alt="x200" class="center-block" />
           <h5 class="text-center">Libiquity Taurinus X200 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 certified to Respect Your Freedom.</li>
@@ -292,7 +292,7 @@
       <h3 class="title text-center">3D Printers</h3>
       <div class="row">
         <div class="good col-md-6 col-sm-6">
-          <img src="https://static.fsf.org/nosvn/images/givingguide/images/lulzbot-mini.png" alt="lulzbot" class="center-block" />
+          <img src="img/products/lulzbot.png" alt="lulzbot" class="center-block" />
           <h5 class="text-center">Lulzbot Mini</h5>
           <ul class="pros">
             <li><a href="https://www.fsf.org/ryf">Respects Your Freedom-certified</a> by the FSF to run with all free software, making 3D printing more accessible and encouraging innovation.</li>
@@ -327,7 +327,7 @@
       <h3 class="title text-center">Wi-Fi Routers</h3>
       <div class="row">
         <div class="good col-md-6 col-sm-6">
-          <img src="https://static.fsf.org/nosvn/images/givingguide/images/librecmc-router.jpg" alt="free-router" class="center-block" />
+          <img src="img/products/thinkpenguin-router.png" alt="free-router" class="center-block" />
           <h5 class="text-center">ThinkPenguin Router</h5>
           <ul class="pros">
             <li>
@@ -362,7 +362,7 @@
       <h3 class="title text-center">eBooks</h3>
       <div class="row">
         <div class="good col-md-6 col-sm-6">
-          <img src="https://static.fsf.org/fsforg/img/ProjectGutenbergPrepped.png" alt="gutenberg" class="center-block" />
+          <img src="img/products/gutenberg.png" alt="gutenberg" class="center-block" />
           <h5 class="text-center">Project Gutenberg</h5>
           <ul class="pros">
             <li>All of the ebooks are gratis, including classics like Peter Pan and Huck Finn.</li>
@@ -400,7 +400,7 @@
       <h3 class="title text-center">Graphic Design</h3>
       <div class="row">
         <div class="good col-md-6 col-sm-6">
-          <img src="https://static.fsf.org/nosvn/images/gimp_inkscape.png" alt="GIMP and Inskacape" class="center-block" />
+          <img src="img/products/gimp-inkscape.png" alt="GIMP and Inskacape" class="center-block" />
           <h5 class="text-center">GIMP and Inkscape</h5>
           <ul class="pros">
             <li>Free software, with thriving developer communities.</li>
@@ -431,7 +431,7 @@
       <h3 class="title text-center">Gift Cards</h3>
       <div class="row">
         <div class="good col-md-6 col-sm-6">
-          <img src="https://static.fsf.org/fsforg/img/FSFCardPrepped.png" alt="fsf card" class="center-block" />
+          <img src="img/products/fsf-card.png" alt="fsf card" class="center-block" />
           <h5 class="text-center">FSF Membership Card</h5>
           <ul class="pros">
             <li>Join over 3,500 active members working to make a better world built on free software.</li>

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

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

diff --git a/img/products/gimp-inkscape.png b/img/products/gimp-inkscape.png
new file mode 100644 (file)
index 0000000..3591ca7
Binary files /dev/null and b/img/products/gimp-inkscape.png differ

diff --git a/img/products/gutenberg.png b/img/products/gutenberg.png
new file mode 100644 (file)
index 0000000..c79364c
Binary files /dev/null and b/img/products/gutenberg.png differ

diff --git a/img/products/lulzbot.png b/img/products/lulzbot.png
new file mode 100644 (file)
index 0000000..1cc6874
Binary files /dev/null and b/img/products/lulzbot.png differ

diff --git a/img/products/replicant.png b/img/products/replicant.png
new file mode 100644 (file)
index 0000000..3839d35
Binary files /dev/null and b/img/products/replicant.png differ

diff --git a/img/products/t400.png b/img/products/t400.png
new file mode 100644 (file)
index 0000000..36f0dcf
Binary files /dev/null and b/img/products/t400.png differ

diff --git a/img/products/thinkpenguin-router.png b/img/products/thinkpenguin-router.png
new file mode 100644 (file)
index 0000000..7978f43
Binary files /dev/null and b/img/products/thinkpenguin-router.png differ

diff --git a/img/products/x200.png b/img/products/x200.png
new file mode 100644 (file)
index 0000000..ec0f710
Binary files /dev/null and b/img/products/x200.png differ