Completely new design!
authorReda Lazri <the.red.shortcut@gmail.com>
Mon, 10 Nov 2014 14:30:53 +0000 (15:30 +0100)
committerReda Lazri <the.red.shortcut@gmail.com>
Mon, 10 Nov 2014 14:30:53 +0000 (15:30 +0100)
14 files changed:
Guidelines.md [changed mode: 0755->0644]
fonts/OpenSans-Bold.ttf [new file with mode: 0644]
fonts/OpenSans-Regular.ttf [changed mode: 0755->0644]
fonts/Signika-Bold.ttf [new file with mode: 0644]
fonts/Signika-Light.ttf [changed mode: 0755->0644]
fonts/Signika-Regular.ttf [changed mode: 0755->0644]
givingguide.html [changed mode: 0755->0644]
images/banner.png [changed mode: 0755->0644]
images/linux.png [changed mode: 0755->0644]
images/logo.png [new file with mode: 0644]
images/separator.png [changed mode: 0755->0644]
images/sign.png [changed mode: 0755->0644]
images/windows.png [changed mode: 0755->0644]
stylesheet.css [changed mode: 0755->0644]

old mode 100755 (executable)
new mode 100644 (file)
diff --git a/fonts/OpenSans-Bold.ttf b/fonts/OpenSans-Bold.ttf
new file mode 100644 (file)
index 0000000..fd79d43
Binary files /dev/null and b/fonts/OpenSans-Bold.ttf differ
old mode 100755 (executable)
new mode 100644 (file)
diff --git a/fonts/Signika-Bold.ttf b/fonts/Signika-Bold.ttf
new file mode 100644 (file)
index 0000000..9cd28cf
Binary files /dev/null and b/fonts/Signika-Bold.ttf differ
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
index 8ba7ca6..b5a9d94
        </head>
 
        <body>
-               <div id="wrapper">
+               <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="upper_links">
+                                       <ul>
+                                               <li><a href="https://my.fsf.org/">Login</a></li>
+                                               <li><a href="http://www.fsf.org/help-menu">Help!</a></li>
+                                               <li><a href="https://www.fsf.org/associate/about-the-members-forum">Members forum</a></li>
+                                       </ul>
+                               </span>
+                       </div>
+                       <div class="navbar">
+                               <div class="nav_wrapper">
+                                       <ul>
+                                               <li><a href="https://www.fsf.org/about/">About</a></li>
+                                               <li><a href="https://www.fsf.org/campaigns/">Campaigns</a></li>
+                                               <li><a href="https://www.fsf.org/licensing/">Licensing</a></li>
+                                               <li><a href="https://www.fsf.org/associate/">Membership</a></li>
+                                               <li><a href="https://www.fsf.org/resources/">Resources</a></li>
+                                               <li><a href="https://www.fsf.org/community/">Community</a></li>
+                                               <li><a href="https://www.fsf.org/donate/">Donate</a></li>
+                                               <li><a href="http://shop.fsf.org/">Shop</a></li>
+                                       </ul>
+                               </div>
+                       </div>
+               </div>
+               <div class="wrapper">
 
                        <div>
-                               Top banner
-                               <div id="banner">
-                                       <img src="images/banner.png" alt="Main Banner">
-                               </div>
+                               <h1 class="intro_phrase">SAY SOMETHING CLEVER ABOUT GIVING GUIDE 2014</h1>
 
-                               <h2>Are you giving your loved ones holiday gifts they can use freely, or gifts which put someone else in control?</h2>
+                               <h2>Are you giving your loved ones holiday gifts they can use freely, or
+                                       gifts which put someone else in control?</h2>
 
                                <p>
-                                       Electronics are popular gifts for the holidays, but people often overlook the restrictions that manufacturers slip under the wrapping paper. Companies like Microsoft and Apple can and will use Digital Restrictions Management (DRM) to prevent your loved ones from sharing apps on the laptop you got them or remixing the songs on their expensive new iPad. If the recipient of your gift is as unlucky as one woman last year, <a href="http://www.defectivebydesign.org/node/2250">Amazon might even block all the books on their Kindle and refuse to explain why</a>. Companies want us to accept this kind of intrusive control, but when you think about, it's unethical (and annoying!).
+                                       Electronics are popular gifts for the holidays, but people often overlook
+                                       the restrictions that manufacturers slip under the wrapping paper.
+                                       Companies like Microsoft and Apple can and will use Digital
+                                       Restrictions Management (DRM) to prevent your loved ones from
+                                       sharing apps on the laptop you got them or remixing the songs on
+                                       their expensive new iPad. If the recipient of your gift is as
+                                       unlucky as one woman last year,
+                                       <a href="http://www.defectivebydesign.org/node/2250">
+                                               Amazon might even block all the books on their Kindle and refuse to explain why</a>.
+                                               Companies want us to accept this kind of intrusive control,
+                                               but when you think about, it's unethical (and annoying!).
                                </p>
 
                                <h2>Give freely</h2>
 
                                <p>
-                                       The good news is, for every device that uses DRM or has a remote "kill switch" like the Kindle, ethical companies have made a better one that doesn't, one that your loved ones will be free to enjoy however they wish. Here's a list of these smarter gifts, compared with their more well-known, but more restrictive alternatives. While you're reading, please remember that donating to a charity in your friend or family member's name is at least as meaningful as buying them an electronic device. Some of our favorite charities are the <a href="http://www.eff.org/">Electronic Frontier Foundation</a>, <a href="http://www.creativecommons.org/">Creative Commons</a>, <a href="http://wikimedia.org/">Wikimedia Foundation</a>, <a href="http://www.sfconservancy.org/">Software Freedom Conservancy</a>, <a href="http://www.softwarefreedom.org/">Software Freedom Law Center</a>, <a href="http://www.gnome.org/">GNOME Foundation</a> and Free Software Foundation.
+                                       The good news is, for every device that uses DRM or has a remote
+                                       "kill switch" like the Kindle, ethical companies have made a better
+                                       one that doesn't, one that your loved ones will be free to enjoy however
+                                        they wish. Here's a list of these smarter gifts, compared with their
+                                        more well-known, but more restrictive alternatives. While you're
+                                       reading, please remember that donating to a charity in your friend
+                                       or family member's name is at least as meaningful as buying them
+                                       an electronic device. Some of our favorite charities are the
+                                       <a href="http://www.eff.org/">Electronic Frontier Foundation</a>,
+                                       <a href="http://www.creativecommons.org/">Creative Commons</a>,
+                                       <a href="http://wikimedia.org/">Wikimedia Foundation</a>,
+                                       <a href="http://www.sfconservancy.org/">Software Freedom Conservancy</a>,
+                                       <a href="http://www.softwarefreedom.org/">Software Freedom Law Center</a>,
+                                       <a href="http://www.gnome.org/">GNOME Foundation</a>
+                                       and Free Software Foundation.
                                </p>
                                <h2>The Free Software Foundation's Holiday Giving Guide
        </h2>
 
                                <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> with your friends and family members, especially those that might give you presents! (We're using the hashtag #givefreely.)
+                                               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>
+                                               with your friends and family members, especially those that might give you
+                                                presents! (We're using the hashtag #givefreely.)
                                        </i>
                                </p>
 
                                <p>
-                               To make a really big splash, get some friends together, print the PDF version of the Giving Guide and hand it out near a local store that sells DRM-encumbered products. Be sure to take photos! Send us photos and any questions at <a href="mailto:campaigns@fsf.org">campaigns@fsf.org</a>.
+                               To make a really big splash, get some friends together, print the PDF
+                               version of the Giving Guide and hand it out near a local store that
+                               sells DRM-encumbered products. Be sure to take photos! Send us photos
+                               and any questions at <a href="mailto:campaigns@fsf.org">campaigns@fsf.org</a>.
                                </p>
 
                        </div>
 
-<!--We compare different products from here-->
-
-                       <div id="comparisons">
-                               <div class="section_wrapper">
-                                       <h3 class="main_title">Operating System: Give the gift of free, flexible, and ethical computing</h3>
-
-                                       <div id="free">
-                                               <img class="product" src="images/linux.png" alt="Windows"/>
-
-                                               <h4 class="title">Linux</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>
 
-                                       <div id="sign">
-                                               <img class="sign" src="images/sign.png" alt="compared"/>
-                                               <img class="separator" src="images/separator.png" alt="separator"/>
-                                       </div>
 
-                                       <div id="proprietary">
-                                               <img class="product" src="images/windows.png" alt="Windows"/>
-
-                                               <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>
-                               </div>
-
-<!--                           <div id="test">
-       <hr>
-</div> -->
-
-                               <div class="section_wrapper">
-                                       <h3 class="main_title">Operating System: Give the gift of free, flexible, and ethical computing</h3>
+               </div>
 
-                                       <div id="free">
-                                               <img class="product" src="images/linux.png" alt="Windows"/>
 
-                                               <h4 class="title">Linux</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>
+               <!--We compare different products from here-->
 
-                                       </div>
+               <!--                    <div id="comparisons">
+                       <div class="section_wrapper">
+                               <h3 class="main_title">Operating System: Give the gift of free, flexible, and ethical computing</h3>
 
-                                       <div id="sign">
-                                               <img class="sign" src="images/sign.png" alt="compared"/>
-                                               <img class="separator" src="images/separator.png" alt="separator"/>
-                                       </div>
+                               <div id="free">
+                                       <img class="product" src="images/linux.png" alt="Windows"/>
 
-                                       <div id="proprietary">
-                                               <img class="product" src="images/windows.png" alt="Windows"/>
+                                       <h4 class="title">Linux</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">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>
                                </div>
-                       </div>
 
+                               <div id="sign">
+                                       <img class="sign" src="images/sign.png" alt="compared"/>
+                                       <img class="separator" src="images/separator.png" alt="separator"/>
+                               </div>
 
+                               <div id="proprietary">
+                                       <img class="product" 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>
+                       </div> -->
+
+               <!--                            <div id="test">
+                       <hr>
+               </div> -->
+
+<!--                                           <div class="section_wrapper">
+       <h3 class="main_title">Operating System: Give the gift of free, flexible, and ethical computing</h3>
+
+       <div id="free">
+               <img class="product" src="images/linux.png" alt="Windows"/>
+
+               <h4 class="title">Linux</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>
+
+       <div id="sign">
+               <img class="sign" src="images/sign.png" alt="compared"/>
+               <img class="separator" src="images/separator.png" alt="separator"/>
+       </div>
+
+       <div id="proprietary">
+               <img class="product" src="images/windows.png" alt="Windows"/>
+
+               <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>
+</div>
+                                       </div> -->
        </body>
 
 </html>
old mode 100755 (executable)
new mode 100644 (file)
index 9ee1995..7d32cf4
Binary files a/images/banner.png and b/images/banner.png differ
old mode 100755 (executable)
new mode 100644 (file)
diff --git a/images/logo.png b/images/logo.png
new file mode 100644 (file)
index 0000000..67d77c9
Binary files /dev/null and b/images/logo.png differ
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
index 5bac547..228180b
 }
 
 @font-face {
+    font-family: 'Signika Bold';
+    src: local('Signika Bold'), url('fonts/Signika-Bold.ttf') format('truetype');
+}
+
+@font-face {
     font-family: 'Open Sans';
     src: local('Open Sans'), url('fonts/OpenSans-Regular.ttf') format('truetype');
 }
 
+@font-face {
+    font-family: 'Open Sans Bold';
+    src: local('Open Sans Bold'), url('fonts/OpenSans-Bold.ttf') format('truetype');
+}
+
 /*Style common HTML tags*/
 
 html {
-    line-height: 1.4em;
     font-family: 'Open Sans', 'DejaVu Sans', Arial, sans-serif;
-    font-size: 1em;
+    font-size: 0.9em;
+    line-height: 1.4em;
     color: #363636;
+    background-color: #fffefb;
     width: 100%;
 }
 
-a { color: #b495d3;}
-a:link { text-decoration: none; }
-a:visited { text-decoration: none; }
-a:hover { text-decoration: underline; }
-a:active { text-decoration: underline; }
 
+/* Type something: */
 
-p { line-height: 1.4em; margin-bottom: 1.2em; }
+a { color: #1F8A70; border-bottom: 1px solid #dbd145; text-decoration: none;}
+
+p { line-height: 1.4em; margin-bottom: 1.5em; font-size: 1em;}
 
 i { font-style: italic; }
 b { font-style: oblique; }
 
 li {list-style-type: circle; padding: 0.4em 0.2em; line-height: 1.4em; }
-ul {margin: 1em 2em 0em 4em;}
+/* ul {margin: 1em 2em 0em 4em;} */
 
 br {margin-bottom: 20em; margin-top: 20em;}
 
 h1 {  font-size: 2.75em;  font-family: 'Signika Light'; margin-bottom: 0.5em; margin-top: 1em; }
-h2 {  font-size: 1.75em;  font-family: 'Signika Light';        color: #6c6c6c; margin-bottom: 0.5em; margin-top: 1em; }
-h3 {  font-size: 1.625em; font-family: 'Signika Light';        color: #b495d3; margin-bottom: 0.5em; margin-top: 1em; }
-h4 {  font-size: 1.375em; font-family: 'Signika Light'; color: #4d4d4d;        margin-bottom: 0.5em; margin-top: 1em; }
-h5 {  font-size: 1.25em;  font-family: 'Signika Light'; color: #4d4d4d; margin-bottom: 0.5em; margin-top: 1em; }
-h6 {  font-size: 1.125em; font-family: 'Signika Light'; color: #4d4d4d; margin-bottom: 0.5em; margin-top: 1em; }
+h2 {  font-size: 1.75em;  font-family: 'Signika Light';        color: #2CAF8F; margin-bottom: 0.5em; margin-top: 2em; }
+h3 {  font-size: 1.625em; font-family: 'Signika Light';        color: #b495d3; margin-bottom: 0.5em; margin-top: 2em; }
+h4 {  font-size: 1.375em; font-family: 'Signika Light'; color: #4d4d4d;        margin-bottom: 0.5em; margin-top: 2em; }
+h5 {  font-size: 1.25em;  font-family: 'Signika Light'; color: #4d4d4d; margin-bottom: 0.5em; margin-top: 2em; }
+h6 {  font-size: 1.125em; font-family: 'Signika Light'; color: #4d4d4d; margin-bottom: 0.5em; margin-top: 2em; }
 
 /*Site-specific*/
 
-#banner > img {
-  width: 100%;
+  /* Header */
+
+.header {
+  background-image: url("images/banner.png");
+  background-color: #2CAF8F;
+  background-repeat: no-repeat;
+  height: 776px;
+  background-size: 110%;
+  background-position: bottom;
+}
+
+.logo {
+  width: 180px;
+  height: 21px;
+  padding: 1.3em;
+
+}
+
+.logo_wrapper {
 }
 
-#wrapper {
-  margin: auto 5em;
+.top {
+  position: relative;
+}
+
+.top a {
+  border-bottom: 0;
+  color: white;
+}
+
+.upper_links {
+  position: absolute;
+  text-align: center;
+  margin-left: 23%;
+}
+
+.upper_links li {
+  list-style: none;
+  display: inline-block;
+  padding: 1em;
+  float: left;
+}
+
+.navbar ul {
+  background-color: white;
+  border-radius: 100px;
+  text-align: center;
+  width: 875px;
+  height: 3.55556em;
+  margin: auto;
+  -webkit-transition: background 3s;
+  transition:  background-color 3s;
 }
 
-#comparisons {
-  /* padding-top: 10em; */
+ .navbar li {
+  font-weight: bold;
+  list-style-type: none;
+  border-right: 1px #9BD2BF solid;
+  padding: 0 10px 0 10px;
+  line-height: 3.7;
+  float: left;
+  width: 91px;
+  height: 3.55556em;
+}
+
+.navbar li:first-child {
+  border-radius: 100px 0 0 100px;
+  width: 81px;
+}
+
+.navbar li:last-child {
+  border-right: 0;
+  border-radius: 0 100px 100px 0;
+  width: 81px;
+}
+.navbar li:hover {
+  background-color: #FFDD55;
+
+}
+
+.navbar li a {
+  display: block;
+  text-decoration: none;
+  border: 0;
+
+}
+
+.navbar li a:hover {
+  color: #4B423B;
+}
+
+.wrapper {
+  width: 700px;
+  margin: auto;
+}
+
+.wrapper .intro_phrase {
+  width: 450px;
+  text-align: center;
+  font-family: Signika Bold;
+  margin: 1.2em auto;
+  color: #bababa;
+
+}
+
+/* #comparisons {
+  padding-top: 100px;
   background-color: #fbfbfb;
+  background-size: cover;
   position: absolute;
   width: 100%;
   max-width: 1150px;
@@ -78,7 +185,7 @@ h6 {  font-size: 1.125em; font-family: 'Signika Light'; color: #4d4d4d; margin-b
 
 #free {
   position: relative;
-  /* background-color: red; */
+  background-color: red;
   float: left;
   width: 45%;
   max-width: 450px;
@@ -86,7 +193,7 @@ h6 {  font-size: 1.125em; font-family: 'Signika Light'; color: #4d4d4d; margin-b
 
 #sign {
   position: relative;
-  /* background-color: green; */
+  background-color: green;
   width: 240px;
   float: left;
   margin-top: 3em;
@@ -94,7 +201,7 @@ h6 {  font-size: 1.125em; font-family: 'Signika Light'; color: #4d4d4d; margin-b
 
 #proprietary {
   position: relative;
-  /* background-color: blue; */
+  background-color: blue;
   width: 45%;
   max-width: 450px;
   float: right;
@@ -119,17 +226,8 @@ h6 {  font-size: 1.125em; font-family: 'Signika Light'; color: #4d4d4d; margin-b
   height: 324px;
   margin: auto;
   margin-left: 7.5em;
-  margin-top: 3em;
-}
+  margin-top: 3em;}
 
 #section_wrapper {
   position: relative;
-}
-
-/* #test {
-  height: 10em;
-  position: relative;
-  background-color: white;
-  display: block;
-  float: left;
 } */