Clean-ups.
authorReda Lazri <the.red.shortcut@gmail.com>
Sat, 15 Nov 2014 22:49:07 +0000 (23:49 +0100)
committerReda Lazri <the.red.shortcut@gmail.com>
Sat, 15 Nov 2014 22:49:07 +0000 (23:49 +0100)
givingguide.html
stylesheet.css

index b0b544065dddcebd51086bb7ba75a7375688394e..2aac0102cb1ee6d572edd30e0f74cbe26beb8cad 100755 (executable)
@@ -2,13 +2,13 @@
 <html>
        <head>
 
-               <title> 2014 Holiday Giving Guide | Free Software Foundation | Working together for free software</title>
+               <title> 2014 Holiday Giving Guide | Free Software Foundation | Working together for free software </title>
 
                <meta charset="UTF-8">
 
                <!--FIXME: Is this necessary?-->
                <link rel="copyright" title="Copyright information" href="http://creativecommons.org/licenses/by-nd/3.0/rdf">
-               <link rel="author" title="Author information" href="http://www.fsf.org/about/staff/">
+               <link rel="author" title="Author information" href="http://www.fsf.org/about/staff">
 
                <!--Stylesheets-->
                <link rel="stylesheet" type="text/css" href="reset.css">
                        </div>
                </div>
 
-       <!--    <div class="header">
-               <div class="top">
-                       <span class="logo_wrapper">
-                               <a href="https://www.fsf.org/"><img class="logo" src="images/logo.png" alt="Logo" /></a>
-                       </span>
-                       <span class="join_wrapper">
-                               <a href="http://fsf.org/jfb"><img class="join" src="images/join.png" alt="Logo" /></a>
-                       </span>
-               </div>
-               <div class="navbar">
-                       <div class="nav_wrapper">
-                               <ul>
-                                       <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/licensing/">Software Licensing</a></li>
-                                       <li><a href="http://shop.fsf.org/">Shop</a></li>
-                               </ul>
-                       </div>
-               </div>
-       </div> -->
                <div class="wrapper">
 
                        <div>
@@ -99,8 +79,7 @@
                                        <a href="http://www.gnome.org/">GNOME Foundation</a>
                                        and Free Software Foundation.
                                </p>
-                               <h2>The Free Software Foundation's Holiday Giving Guide
-       </h2>
+                               <h2>The Free Software Foundation's Holiday Giving Guide</h2>
 
                                <p>
                                        The gifts in the left column respect your freedom much more than those in the right column.
 
                                <p>
                                        <i>
-                                               Please share <a href="http://www.fsf.org/share?u=http://www.fsf.org/givingguide&t=
-                                               Give%20tech%20gifts%20that%20support%20user%20freedom%20">the Giving Guide</a>
+                                               Please share <a href="#">the Giving Guide</a>
                                                with your friends and family members, especially those that might give you
                                                 presents! (We're using the hashtag #givefreely.)
                                        </i>
 
                        </div>
 
-
-
                </div>
 
 
                <!--We compare different products from here-->
 
-                       <div class="comparisons">
-                                       <section class="section_wrapper">
-                                               <h3 class="main_title">Operating System: Give the gift of free, flexible, and ethical computing</h3>
+                               <div class="comparisons">
+                                               <div class="section_wrapper">
+                                                       <h3 class="main_title">Operating System: Give the gift of free, flexible, and ethical computing</h3>
 
-                                               <div class="free">
-                                                       <div class="product">
-                                                               <img class="good" src="images/good.png" alt="Windows"/>
-                                                               <img class="product_img" src="images/linux.png" alt="Linux"/>
-                                                       </div>
+                                                       <div class="free">
+                                                               <div class="product">
+                                                                       <img class="good" src="images/good.png" alt="Windows"/>
+                                                                       <img class="product_img" src="images/linux.png" alt="Linux"/>
+                                                               </div>
 
-                                                       <h4 class="title">Fedora</h4>
-                                                       <ul>
-                                                               <li>Completely free operating system: transparent and modifiable</li>
-                                                               <li>Break the cycle of forced upgrades and planned obsolescence</li>
-                                                               <li>Comes with all the software you need and an easy software manager to find more.</li>
-                                                       </ul>
+                                                               <h4 class="title">Fedora</h4>
+                                                               <ul>
+                                                                       <li>Completely free operating system: transparent and modifiable</li>
+                                                                       <li>Break the cycle of forced upgrades and planned obsolescence</li>
+                                                                       <li>Comes with all the software you need and an easy software manager to find more.</li>
+                                                               </ul>
 
-                                                       <div class="buy">
+                                                               <div class="buy">
 
-                                                               <a href="http://fedoraproject.org/"><img src="images/download.png" alt="download" /></a>
+                                                                       <a href="http://fedoraproject.org/"><img src="images/download.png" alt="download" /></a>
 
-                                                       </div>
+                                                               </div>
 
-                                               </div>
-
-                                               <div class="proprietary">
-                                                       <div class="product">
-                                                               <img class="bad" src="images/bad.png" alt="bad"/>
-                                                               <img class="product_img" src="images/windows.png" alt="Windows"/>
                                                        </div>
 
-                                                       <h4 class="title">Windows</h4>
-                                                       <ul>
-                                                               <li>Proprietary software that profits from controlling how you use your computer</li>
-                                                               <li>Invades privacy and exposes personal data to Microsoft, <a href="http://www.theguardian.com/world/2013/sep/05/nsa-how-to-remain-secure-surveillance">the NSA</a>, and other malicious attackers</li>
-                                                               <li>Dependent on mandatory upgrades and devices that don't support older versions of Windows</li>
-                                                       </ul>
+                                                       <div class="proprietary">
+                                                               <div class="product">
+                                                                       <img class="bad" src="images/bad.png" alt="bad"/>
+                                                                       <img class="product_img" src="images/windows.png" alt="Windows"/>
+                                                               </div>
 
-                                                       <div class="avoid">
+                                                               <h4 class="title">Windows</h4>
+                                                               <ul>
+                                                                       <li>Proprietary software that profits from controlling how you use your computer</li>
+                                                                       <li>Invades privacy and exposes personal data to Microsoft, <a href="http://www.theguardian.com/world/2013/sep/05/nsa-how-to-remain-secure-surveillance">the NSA</a>, and other malicious attackers</li>
+                                                                       <li>Dependent on mandatory upgrades and devices that don't support older versions of Windows</li>
+                                                               </ul>
 
-                                                               <img src="images/avoid.png" alt="avoid" />
+                                                               <div class="avoid">
+
+                                                                       <img src="images/avoid.png" alt="avoid" />
 
+                                                               </div>
                                                        </div>
                                                </div>
-                                       </section>
+                                       </div>
 
+                                       <div class="comparisons">
+                                               <div class="section_wrapper">
+                                                       <h3 class="main_title">Operating System: Give the gift of free, flexible, and ethical computing</h3>
 
-                                       <section class="section_wrapper">
-                                               <h3 class="main_title">Operating System: Give the gift of free, flexible, and ethical computing</h3>
+                                                       <div class="free">
+                                                               <div class="product">
+                                                                       <img class="good" src="images/good.png" alt="Windows"/>
+                                                                       <img class="product_img" src="images/linux.png" alt="Linux"/>
+                                                               </div>
 
-                                               <div class="free">
-                                                       <div class="product">
-                                                               <img class="good" src="images/good.png" alt="Windows"/>
-                                                               <img class="product_img" src="images/linux.png" alt="Linux"/>
-                                                       </div>
+                                                               <h4 class="title">Fedora</h4>
+                                                               <ul>
+                                                                       <li>Completely free operating system: transparent and modifiable</li>
+                                                                       <li>Break the cycle of forced upgrades and planned obsolescence</li>
+                                                                       <li>Comes with all the software you need and an easy software manager to find more.</li>
+                                                               </ul>
 
-                                                       <h4 class="title">Fedora</h4>
-                                                       <ul>
-                                                               <li>Completely free operating system: transparent and modifiable</li>
-                                                               <li>Break the cycle of forced upgrades and planned obsolescence</li>
-                                                               <li>Comes with all the software you need and an easy software manager to find more.</li>
-                                                       </ul>
+                                                               <div class="buy">
 
-                                                       <div class="buy">
+                                                                       <a href="http://fedoraproject.org/"><img src="images/download.png" alt="download" /></a>
 
-                                                               <a href="http://fedoraproject.org/"><img src="images/download.png" alt="download" /></a>
+                                                               </div>
 
                                                        </div>
 
-                                               </div>
-
-                                               <div class="proprietary">
-                                                       <div class="product">
-                                                               <img class="bad" src="images/bad.png" alt="bad"/>
-                                                               <img class="product_img" src="images/windows.png" alt="Windows"/>
-                                                       </div>
+                                                       <div class="proprietary">
+                                                               <div class="product">
+                                                                       <img class="bad" src="images/bad.png" alt="bad"/>
+                                                                       <img class="product_img" src="images/windows.png" alt="Windows"/>
+                                                               </div>
 
-                                                       <h4 class="title">Windows</h4>
-                                                       <ul>
-                                                               <li>Proprietary software that profits from controlling how you use your computer</li>
-                                                               <li>Invades privacy and exposes personal data to Microsoft, <a href="http://www.theguardian.com/world/2013/sep/05/nsa-how-to-remain-secure-surveillance">the NSA</a>, and other malicious attackers</li>
-                                                               <li>Dependent on mandatory upgrades and devices that don't support older versions of Windows</li>
-                                                       </ul>
+                                                               <h4 class="title">Windows</h4>
+                                                               <ul>
+                                                                       <li>Proprietary software that profits from controlling how you use your computer</li>
+                                                                       <li>Invades privacy and exposes personal data to Microsoft, <a href="http://www.theguardian.com/world/2013/sep/05/nsa-how-to-remain-secure-surveillance">the NSA</a>, and other malicious attackers</li>
+                                                                       <li>Dependent on mandatory upgrades and devices that don't support older versions of Windows</li>
+                                                               </ul>
 
-                                                       <div class="avoid">
+                                                               <div class="avoid">
 
-                                                               <img src="images/avoid.png" alt="avoid" />
+                                                                       <img src="images/avoid.png" alt="avoid" />
 
+                                                               </div>
                                                        </div>
                                                </div>
-                                       </section>
-
+                               </div>
 
-                                       <section class="section_wrapper">
+                               <div class="comparisons">
+                                       <div class="section_wrapper">
                                                <h3 class="main_title">Operating System: Give the gift of free, flexible, and ethical computing</h3>
 
                                                <div class="free">
 
                                                        </div>
                                                </div>
-                                       </section>
-
-
+                                       </div>
+                       </div>
        </body>
 
 </html>
index 947ff25cf586cf392fec451866946ba343a3b424..8c77ecb3f99d249255fe22b947e4a7a5d3a9f312 100755 (executable)
@@ -71,6 +71,8 @@ h6 {  font-size: 1.125em; font-family: 'Signika Light'; color: #4d4d4d; margin-b
   background-position: 5% 30%;
 }
 
+/* Navbar */
+
 .navbar {
   background-color: #2CAF8F;
   height: 64px;
@@ -97,6 +99,7 @@ h6 {  font-size: 1.125em; font-family: 'Signika Light'; color: #4d4d4d; margin-b
   padding: 1em 5em 1em 9em;
   height: 2.55556em;
   float: left;
+
 }
 
  .navbar li {
@@ -132,11 +135,13 @@ h6 {  font-size: 1.125em; font-family: 'Signika Light'; color: #4d4d4d; margin-b
   color: #4B423B;
 }
 
+/* Comparisons */
+
 .wrapper,
 .section_wrapper {
   width: 750px;
   margin: auto;
-}
+} 
 
 .main_title {
   text-align: center;
@@ -147,7 +152,7 @@ h6 {  font-size: 1.125em; font-family: 'Signika Light'; color: #4d4d4d; margin-b
 .wrapper .intro_phrase {
   width: 450px;
   text-align: center;
-  font-family: Signika Bold;
+  font-family: 'Signika Bold';
   margin: 1.2em auto;
   color: #bababa;
 }
@@ -196,7 +201,3 @@ h6 {  font-size: 1.125em; font-family: 'Signika Light'; color: #4d4d4d; margin-b
   float: right;
   width: 45%;
 }
-
-section {
-  padding: 3em;
-}