Tweaks

diff --git a/givingguide.html b/givingguide.html
index 25f55c7cbc7cf14018cfcf37fb345e936f089638..6a33f513fcbc5af29f2541ee62efe0341f6d2d7c 100755 (executable)
--- a/givingguide.html
+++ b/givingguide.html
@@ -82,7 +82,7 @@
 
       <div class="free">
         <div class="product">
-          <!-- <img class="good" src="images/good.png" alt="good" /> -->
+          <img class="good" src="images/good.png" alt="good" />
           <img class="product_img" src="http://www.gnu.org/graphics/trisquel/trisquel.svg" alt="Trisquel GNU/Linux" />
         </div>
 
@@ -108,7 +108,7 @@
 
       <div class="proprietary">
         <div class="product">
-          <!-- <img class="bad" src="images/bad.png" alt="bad" /> -->
+          <img class="bad" src="images/bad.png" alt="bad" />
           <img class="product_img" src="images/windows.png" alt="Windows" />
         </div>
 
@@ -156,7 +156,7 @@
 
       <div class="free">
         <div class="product">
-          <!-- <img class="good" src="images/good.png" alt="good" /> -->
+          <img class="good" src="images/good.png" alt="good" />
           <img class="product_img" src="http://static.fsf.org/nosvn/images/taz4.png" alt="TAZ 4.0" />
         </div>
 
@@ -180,7 +180,7 @@
 
       <div class="proprietary">
         <div class="product">
-          <!-- <img class="bad" src="images/bad.png" alt="bad" /> -->
+          <img class="bad" src="images/bad.png" alt="bad" />
           <img class="product_img" src="http://static.fsf.org/fsforg/img/MakerbotPrepped.png" alt="Makerbot Replicator 2" />
         </div>
 
@@ -226,7 +226,7 @@
 
       <div class="free">
         <div class="product">
-          <!-- <img class="good" src="images/good.png" alt="good" /> -->
+          <img class="good" src="images/good.png" alt="good" />
           <img class="product_img" src="http://static.fsf.org/fsforg/img/ProjectGutenbergPrepped.png" alt="Project Gutenberg" />
         </div>
 
@@ -242,7 +242,7 @@
 
       <div class="proprietary">
         <div class="product">
-          <!-- <img class="bad" src="images/bad.png" alt="bad" /> -->
+          <img class="bad" src="images/bad.png" alt="bad" />
           <img class="product_img" src="http://static.fsf.org/fsforg/img/amazon.jpg" alt="Amazon" />
         </div>
 
@@ -291,7 +291,7 @@
 
       <div class="free">
         <div class="product">
-          <!-- <img class="good" src="images/good.png" alt="good" /> -->
+          <img class="good" src="images/good.png" alt="good" />
           <img class="product_img" src="http://static.fsf.org/nosvn/images/Replicant_logo.png" alt="Replicant" />
         </div>
 
@@ -317,7 +317,7 @@
 
       <div class="proprietary">
         <div class="product">
-          <!-- <img class="bad" src="images/bad.png" alt="bad" /> -->
+          <img class="bad" src="images/bad.png" alt="bad" />
           <img class="product_img" src="images/iOS.png" alt="Apple iPhone, iPad and Watch" />
         </div>
 
@@ -360,7 +360,7 @@
 
         <div class="free">
           <div class="product">
-            <!-- <img class="good" src="images/good.png" alt="good" /> -->
+            <img class="good" src="images/good.png" alt="good" />
             <img class="product_img" src="images/givingguidethinkpenguin.png" alt="ThinkPenguin GNU/Linux Notebook" />
           </div>
 
@@ -379,7 +379,7 @@
 
         <div class="proprietary">
           <div class="product">
-            <!-- <img class="bad" src="images/bad.png" alt="bad" /> -->
+            <img class="bad" src="images/bad.png" alt="bad" />
             <img class="product_img" src="http://upload.wikimedia.org/wikipedia/commons/0/07/Macbook_Pro_PSD.png" alt="Apple Macbook Pro" />
           </div>
 
@@ -423,7 +423,7 @@
 
         <div class="free">
           <div class="product">
-            <!-- <img class="good" src="images/good.png" alt="good" /> -->
+            <img class="good" src="images/good.png" alt="good" />
             <img class="product_img" src="http://static.fsf.org/nosvn/images/gimp_inkscape.png" alt="GIMP and Inkscape" />
           </div>
 
@@ -440,7 +440,7 @@
 
         <div class="proprietary">
           <div class="product">
-            <!-- <img class="bad" src="images/bad.png" alt="bad" /> -->
+            <img class="bad" src="images/bad.png" alt="bad" />
             <img class="product_img" src="http://static.fsf.org/nosvn/images/photoshop_illustrator.png" alt="Photoshop and Illustrator" />
           </div>
 
@@ -477,7 +477,7 @@
 
         <div class="free">
           <div class="product">
-            <!-- <img class="good" src="images/good.png" alt="good" /> -->
+            <img class="good" src="images/good.png" alt="good" />
             <img class="product_img" src="http://static.fsf.org/fsforg/img/FSFCardPrepped.png" alt="FSF Membership Card" />
           </div>
 
@@ -492,7 +492,7 @@
 
         <div class="proprietary">
           <div class="product">
-            <!-- <img class="bad" src="images/bad.png" alt="bad" /> -->
+            <img class="bad" src="images/bad.png" alt="bad" />
             <img class="product_img" src="http://static.fsf.org/fsforg/img/iTunesCardPrepped.png" alt="iTunes Card" />
           </div>
 
@@ -533,7 +533,7 @@
 
         <div class="free">
           <div class="product">
-            <!-- <img class="good" src="images/good.png" alt="good" /> -->
+            <img class="good" src="images/good.png" alt="good" />
             <img class="product_img" src="images/leastauthority.png" alt="Least Authority" />
           </div>
 
@@ -557,7 +557,7 @@
 
         <div class="proprietary">
           <div class="product">
-            <!-- <img class="bad" src="images/bad.png" alt="bad" /> -->
+            <img class="bad" src="images/bad.png" alt="bad" />
             <img class="product_img" src="http://static.fsf.org/nosvn/images/googledrive.png" alt="Google Drive" />
           </div>
 
@@ -601,7 +601,7 @@
 
         <div class="free">
           <div class="product">
-            <!-- <img class="good" src="images/good.png" alt="good" /> -->
+            <img class="good" src="images/good.png" alt="good" />
             <img class="product_img" src="http://static.fsf.org/nosvn/images/mediagoblin.png" alt="GNU MediaGoblin" />
           </div>
 
@@ -623,7 +623,7 @@
 
         <div class="proprietary">
           <div class="product">
-            <!-- <img class="bad" src="images/bad.png" alt="bad" /> -->
+            <img class="bad" src="images/bad.png" alt="bad" />
             <img class="product_img" src="http://static.fsf.org/nosvn/images/YouTube.png" alt="YouTube" />
           </div>
 

diff --git a/images/Macbook_Pro.png b/images/Macbook_Pro.png
index 3bcd11224823b0fb8c80b7bbf79e24c486e7c829..180a7ebd3182adfa951a87946479bffb634f47a6 100644 (file)
Binary files a/images/Macbook_Pro.png and b/images/Macbook_Pro.png differ

diff --git a/images/givingguidethinkpenguin.png b/images/givingguidethinkpenguin.png
index 54c68d4029fe7c50e7990155202fd028530b9729..1590117393a01ee0e80496cc7ba11e296571a863 100644 (file)
Binary files a/images/givingguidethinkpenguin.png and b/images/givingguidethinkpenguin.png differ

diff --git a/stylesheet.css b/stylesheet.css
index 670b2381b78015222781518911375569fbca989d..d339cf8ba20c07cf4db65dbdd2b4bdb220e00c73 100755 (executable)
--- a/stylesheet.css
+++ b/stylesheet.css
@@ -226,17 +226,22 @@ h6 {  font-size: 1.125em; font-family: 'Signika Light'; color: #4d4d4d; margin-b
 
 .product_img {
   margin: auto;
+  max-width: 168px;
   max-height: 168px;
+  position: relative;
 }
 
 .product {
+  text-align: center;
+  position: relative;
   margin: auto;
   display: block;
   height: 168px;
+  width: 168px;
   /* margin-bottom: 8em; */
 /*   max-height: 168px; */
 }
-
+/* 
  .proprietary .product_img:after {
   content: "";
   background-image: url("images/bad.png");
@@ -256,19 +261,19 @@ h6 {  font-size: 1.125em; font-family: 'Signika Light'; color: #4d4d4d; margin-b
   height: 25px;
   position: absolute;
 }
+ */
 
 
-/*
 .good,
 .bad {
- FIXME: This is temporary until I fix the sizes
-  position: relative;
-
-  left: 60%;
-  width: 60px;
+  z-index: 999;
+  width: 65px;
+  top: 8em;
+  left: 9em;
+  position: absolute;
+  
 }
 
-*/
 
 .free, .proprietary {
   text-align: center;