Changes after feedback. Added new ribbons.

diff --git a/css/master.css b/css/master.css
index f523799574d49780abeab4eae25fe43c88f94f2d..22f8bf0fed7f9791e66b2ecea37c9d761ba3539c 100644 (file)
--- a/css/master.css
+++ b/css/master.css
@@ -107,6 +107,7 @@ h1 {
 
   font-family: "Signika Light";
   font-size: 35px;
+
 }
 
 h2 {
@@ -176,13 +177,17 @@ a:hover {
   color: #0f4639;
 }
 
+section {
+  margin-bottom: 20px;
+}
 /*Header*/
 
 /*Navbar*/
-.icon-bar{
+.icon-bar {
   -webkit-transition: 0.3s all ease;
   transition: 0.3s all ease;
 }
+
 .bar2 {
   width: 30px !important;
 }
@@ -198,6 +203,7 @@ a:hover {
 .navbar-toggle:hover .bar2 {
   width: 25px !important;
 }
+
 .navbar-toggle:hover .bar3 {
   width: 15px !important;
 }
@@ -289,23 +295,27 @@ a:hover {
 
 .sale {
   position: absolute;
-  z-index: -999;
-  top: 0;
-
-  width: 0;
-  height: 0;
+  top: 10px;
+  left: -67px;
 
-  text-overflow: clip;
+  width: 180px;
+  padding: 6px 0;
 
-  border-width: 100px 100px 0 0;
-  border-style: solid;
-  border-color: #2caf8f transparent transparent transparent;
+  -webkit-transform: rotate(-45deg);
+  -moz-transform: rotate(-45deg);
+  -ms-transform: rotate(-45deg);
+  transform: rotate(-45deg);
+  text-align: center;
+  text-transform: uppercase;
 
-  line-height: 0px;
+  color: #fff;
+  background: #0AD778;
 
+  font-size: 14px;
+  font-weight: 700;
 }
 
-.sale-text P {
+/*.sale-text P {
   position: absolute;
   top: 18px;
   left: 23px;
@@ -319,10 +329,33 @@ a:hover {
   font-size: 20px;
   font-weight: bold;
 
-}
+}*/
+
+.rfy {
+  position: absolute;
+  top: 30px;
+  left: -42px;
 
+  width: 180px;
+  padding: 6px 0;
+
+  -webkit-transform: rotate(-45deg);
+  -moz-transform: rotate(-45deg);
+  -ms-transform: rotate(-45deg);
+  transform: rotate(-45deg);
+  text-align: center;
+  text-transform: uppercase;
+
+  color: #fff;
+  background: #1e33f6;
+
+  font-size: 14px;
+  font-weight: 700;
+}
 .bad,
 .good {
+  overflow: hidden;
+
   margin-top: 30px;
   padding-top: 30px;
   padding-bottom: 30px;
@@ -367,18 +400,18 @@ a:hover {
 }
 
 .get-item {
-  width: 50%;
-  margin: 0 auto;
-  margin-bottom: 25px;
+  width: 40%;
+  margin: 0 auto 25px;
+  padding: 6px 35px;
 
-text-align: center;
+  text-align: center;
 
   color: white;
   border-bottom: 0;
   border-radius: 100px;
   background: #2B81E3;
 
-  font-family: Signika-Regular;
+  font-family: "Signika Regular";
   font-size: 24px;
 }
 
@@ -401,8 +434,8 @@ text-align: center;
 }
 
 .charities img:hover {
-  -webkit-transform: scale(1.2);
-          transform: scale(1.2);
+  -webkit-transform: scale(1.1);
+  transform: scale(1.1);
 }
 
 /*Licenses*/
@@ -486,6 +519,10 @@ footer p {
     color: #4B423B;
   }
 
+  .intro {
+    margin-bottom: 0;
+  }
+
   .join {
     display: none;
   }
@@ -508,8 +545,8 @@ footer p {
     margin-top: 90px;
   }
 
-  .fix-router,
-  .fix-amazon {
+  .fix-amazon,
+  .fix-router {
     margin-top: 100px;
   }
 
@@ -584,6 +621,10 @@ footer p {
 
   /*Intro*/
 
+  .intro {
+    margin-bottom: 0;
+  }
+
   .intro-text {
     background: transparent;
   }
@@ -607,6 +648,8 @@ footer p {
 
   .illustration img {
     width: 80%;
+    margin-top: 80px;
+
   }
   /*Footer*/
   .footer-logo img {
@@ -623,8 +666,8 @@ footer p {
     margin-top: 90px;
   }
 
-  .fix-router,
-  .fix-amazon {
+  .fix-amazon,
+  .fix-router {
     margin-top: 100px;
   }
 

diff --git a/givingguide.html b/givingguide.html
index ee5bf886e7bf577383dbc9deaa90e124fa42e242..1ef527bf5021a824492ad857219ceb3f247d4ef1 100644 (file)
--- a/givingguide.html
+++ b/givingguide.html
@@ -132,15 +132,13 @@
         <div class="good col-md-6 col-sm-6">
 
           <!-- Begin Sale -->
-          <div class="sale-text">
-            <p>
-              Sale!
-            </p>
-          </div>
-          <div class="sale">
-          </div>
+          <div class="sale">Sale!</div>
           <!-- End Sale -->
 
+          <!-- Begin RFY -->
+          <div class="rfy">RYF-certified</div>
+          <!-- End RFY -->
+
           <img src="https://static.fsf.org/nosvn/images/givingguide/images/tehnoetic-s2.png" alt="replicant phone" class="center-block" width="80"/>
           <h5 class="text-center">Tehnoetic S2 with Replicant</h5>
           <div class=" center-block get-item">

diff --git a/img/products/adobe-blocked.png b/img/products/adobe-blocked.png
index 77e1562a4d0148ff4ccb1c4e7e57dbcfb280b14f..5154990852067bb3776457eeab86d7977c81dc5a 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 9353e3643b01ef4297307467052f529e7ec8f4a4..af65b979f6b0437596eeb10a0458bdd23187705b 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 1214accbe163ad76d1ff26f0dd8ec1fab3339b03..706a4070479e99d6192dee1e3a7866a0729dade3 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 c0b364d0b65be1997642d4c88e3dbed075a98a5d..593613c4a11bf03449b03581c3fe52aeccec7427 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 8337d5e3ac31e8075a571512a7cad9a8d1374519..8ff0825ee19f13ab7a4e5f0a5ba6d23d93c00623 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 ce1001f801f36db2e345978a1ae86a60593e830e..10beb4ebdf0c7f78af86861af4f4a70e80e705ae 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 af32d1cdd1e827f50850548a78b15b0573016f8e..b63b9baad3dd3646becd5ff34e7fc6146c10e908 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 bffd0d55ab0fb7a7af2a60282579e7cc5355fbf2..26a4cf8016ec764fc75557a3be0cf52824f3fcac 100644 (file)
Binary files a/img/products/router-blocked.png and b/img/products/router-blocked.png differ