Build and cleanups
authorReda Lazri <the.red.shortcut@gmail.com>
Thu, 6 Nov 2014 19:43:53 +0000 (20:43 +0100)
committerReda Lazri <the.red.shortcut@gmail.com>
Thu, 6 Nov 2014 19:43:53 +0000 (20:43 +0100)
36 files changed:
Guidelines.md [changed mode: 0644->0755]
fonts/OpenSans-Regular.ttf [new file with mode: 0755]
fonts/Signika-Light.ttf [new file with mode: 0755]
fonts/Signika-Regular.ttf [new file with mode: 0755]
givingguide.html [changed mode: 0644->0755]
images/._Windows.png [new file with mode: 0755]
images/._compare.png [new file with mode: 0755]
images/._separator.png [new file with mode: 0755]
images/._sign.png [new file with mode: 0755]
images/.dat0699.006 [new file with mode: 0755]
images/Windows.png [new file with mode: 0755]
images/banner.png [new file with mode: 0755]
images/linux.png [new file with mode: 0755]
images/separator.png [new file with mode: 0755]
images/sign.png [new file with mode: 0755]
images_old/FSFCardPrepped.png [moved from images/FSFCardPrepped.png with 100% similarity]
images_old/Macbook_Pro_PSD.png [moved from images/Macbook_Pro_PSD.png with 100% similarity]
images_old/MakerbotPrepped.png [moved from images/MakerbotPrepped.png with 100% similarity]
images_old/ProjectGutenbergPrepped.png [moved from images/ProjectGutenbergPrepped.png with 100% similarity]
images_old/Replicant_logo.png [moved from images/Replicant_logo.png with 100% similarity]
images_old/WindowsPrepped.png [moved from images/WindowsPrepped.png with 100% similarity]
images_old/YouTube.png [moved from images/YouTube.png with 100% similarity]
images_old/amazon.jpg [moved from images/amazon.jpg with 100% similarity]
images_old/givingguidethinkpenguin.png [moved from images/givingguidethinkpenguin.png with 100% similarity]
images_old/googledrive.png [moved from images/googledrive.png with 100% similarity]
images_old/gt.png [moved from images/gt.png with 100% similarity]
images_old/gt_002.png [moved from images/gt_002.png with 100% similarity]
images_old/iOS.png [moved from images/iOS.png with 100% similarity]
images_old/iTunesCardPrepped.png [moved from images/iTunesCardPrepped.png with 100% similarity]
images_old/image.png [moved from images/image.png with 100% similarity]
images_old/join.png [moved from images/join.png with 100% similarity]
images_old/leastauthority.png [moved from images/leastauthority.png with 100% similarity]
images_old/taz2.jpg [moved from images/taz2.jpg with 100% similarity]
images_old/trisquel.svg [moved from images/trisquel.svg with 100% similarity]
reset.css [changed mode: 0644->0755]
stylesheet.css [changed mode: 0644->0755]

old mode 100644 (file)
new mode 100755 (executable)
index 4f65fe0..ffa035f
@@ -5,7 +5,9 @@
 * Use high resolution images with transparent backgrounds.
 * If it's a logo then export the images from its verctor source.
 * Do not put a logo next to a product or vice-versa. Always use images with the same nature (i.e. product versus product; logo versus logo)
+* Always export images and logos to 500px*500px.
+
 
 ##Text:
 
-* Be brief, people do not usually read long text.
\ No newline at end of file
+* Be brief, people do not usually read long text.
diff --git a/fonts/OpenSans-Regular.ttf b/fonts/OpenSans-Regular.ttf
new file mode 100755 (executable)
index 0000000..db43334
Binary files /dev/null and b/fonts/OpenSans-Regular.ttf differ
diff --git a/fonts/Signika-Light.ttf b/fonts/Signika-Light.ttf
new file mode 100755 (executable)
index 0000000..7fa6e24
Binary files /dev/null and b/fonts/Signika-Light.ttf differ
diff --git a/fonts/Signika-Regular.ttf b/fonts/Signika-Regular.ttf
new file mode 100755 (executable)
index 0000000..5845c93
Binary files /dev/null and b/fonts/Signika-Regular.ttf differ
old mode 100644 (file)
new mode 100755 (executable)
index 27ae29f..8ba7ca6
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html> 
+<html>
        <head>
 
                <title> 2014 Holiday Giving Guide | Free Software Foundation | Working together for free software</title>
                <!--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/">
-               
+
                <!--Stylesheets-->
                <link rel="stylesheet" type="text/css" href="reset.css">
                <link rel="stylesheet" type="text/css" href="stylesheet.css">
 
        </head>
-       
+
        <body>
+               <div id="wrapper">
+
+                       <div>
+                               Top banner
+                               <div id="banner">
+                                       <img src="images/banner.png" alt="Main Banner">
+                               </div>
+
+                               <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!).
+                               </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.
+                               </p>
+                               <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>
+
+                               <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.)
+                                       </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>.
+                               </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 class="custom-doc yui-t5">
-        <div id="bd">
-          <div id="yui-main">
-            <h1>2014 Holiday Giving Guide</h1>
-
-            <div>
-              <h2> Are you giving your loved ones holiday gifts they can use freely, or gifts which put someone else </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!).
-              </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
-                <a href="http://www.fsf.org/">Free Software Foundation</a>.
-              </p>
-
-              <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>
-
-              <p>
-                <i>
-                  Please
-                  <a href="http://www.fsf.org/share?u=http://www.fsf.org/givingguide&amp;t=Give%20tech%20gifts%20that%20support%20user%20freedom%20">
-                    share 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
-                <a href="https://static.fsf.org/nosvn/misc/GivingGuide2013.pdf">
-                  PDF version of the Giving Guide
-                </a>
-                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>
 
+                                       <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 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>
+
+
+
+               </div>
        </body>
+
 </html>
diff --git a/images/._Windows.png b/images/._Windows.png
new file mode 100755 (executable)
index 0000000..36e0438
Binary files /dev/null and b/images/._Windows.png differ
diff --git a/images/._compare.png b/images/._compare.png
new file mode 100755 (executable)
index 0000000..6065a34
Binary files /dev/null and b/images/._compare.png differ
diff --git a/images/._separator.png b/images/._separator.png
new file mode 100755 (executable)
index 0000000..c472d28
Binary files /dev/null and b/images/._separator.png differ
diff --git a/images/._sign.png b/images/._sign.png
new file mode 100755 (executable)
index 0000000..96b61ad
Binary files /dev/null and b/images/._sign.png differ
diff --git a/images/.dat0699.006 b/images/.dat0699.006
new file mode 100755 (executable)
index 0000000..55dd8e0
Binary files /dev/null and b/images/.dat0699.006 differ
diff --git a/images/Windows.png b/images/Windows.png
new file mode 100755 (executable)
index 0000000..3fbb1ab
Binary files /dev/null and b/images/Windows.png differ
diff --git a/images/banner.png b/images/banner.png
new file mode 100755 (executable)
index 0000000..9ee1995
Binary files /dev/null and b/images/banner.png differ
diff --git a/images/linux.png b/images/linux.png
new file mode 100755 (executable)
index 0000000..b6cd96e
Binary files /dev/null and b/images/linux.png differ
diff --git a/images/separator.png b/images/separator.png
new file mode 100755 (executable)
index 0000000..4ebee7b
Binary files /dev/null and b/images/separator.png differ
diff --git a/images/sign.png b/images/sign.png
new file mode 100755 (executable)
index 0000000..ddb3935
Binary files /dev/null and b/images/sign.png differ
similarity index 100%
rename from images/YouTube.png
rename to images_old/YouTube.png
similarity index 100%
rename from images/amazon.jpg
rename to images_old/amazon.jpg
similarity index 100%
rename from images/gt.png
rename to images_old/gt.png
similarity index 100%
rename from images/gt_002.png
rename to images_old/gt_002.png
similarity index 100%
rename from images/iOS.png
rename to images_old/iOS.png
similarity index 100%
rename from images/image.png
rename to images_old/image.png
similarity index 100%
rename from images/join.png
rename to images_old/join.png
similarity index 100%
rename from images/taz2.jpg
rename to images_old/taz2.jpg
similarity index 100%
rename from images/trisquel.svg
rename to images_old/trisquel.svg
old mode 100644 (file)
new mode 100755 (executable)
index af94440..ed11813
--- a/reset.css
+++ b/reset.css
@@ -1,4 +1,4 @@
-/* http://meyerweb.com/eric/tools/css/reset/ 
+/* http://meyerweb.com/eric/tools/css/reset/
    v2.0 | 20110126
    License: none (public domain)
 */
@@ -12,8 +12,8 @@ b, u, i, center,
 dl, dt, dd, ol, ul, li,
 fieldset, form, label, legend,
 table, caption, tbody, tfoot, thead, tr, th, td,
-article, aside, canvas, details, embed, 
-figure, figcaption, footer, header, hgroup, 
+article, aside, canvas, details, embed,
+figure, figcaption, footer, header, hgroup,
 menu, nav, output, ruby, section, summary,
 time, mark, audio, video {
        margin: 0;
@@ -24,7 +24,7 @@ time, mark, audio, video {
        vertical-align: baseline;
 }
 /* HTML5 display-role reset for older browsers */
-article, aside, details, figcaption, figure, 
+article, aside, details, figcaption, figure,
 footer, header, hgroup, menu, nav, section {
        display: block;
 }
@@ -45,4 +45,4 @@ q:before, q:after {
 table {
        border-collapse: collapse;
        border-spacing: 0;
-}
\ No newline at end of file
+}
old mode 100644 (file)
new mode 100755 (executable)
index e69de29..5bac547
@@ -0,0 +1,135 @@
+/*Typography*/
+
+@font-face {
+    font-family: 'Signika Light';
+    src: local('Signika Light'), url('fonts/Signika-Light.ttf') format('truetype');
+}
+
+@font-face {
+    font-family: 'Open Sans';
+    src: local('Open Sans'), url('fonts/OpenSans-Regular.ttf') format('truetype');
+}
+
+/*Style common HTML tags*/
+
+html {
+    line-height: 1.4em;
+    font-family: 'Open Sans', 'DejaVu Sans', Arial, sans-serif;
+    font-size: 1em;
+    color: #363636;
+    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; }
+
+
+p { line-height: 1.4em; margin-bottom: 1.2em; }
+
+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;}
+
+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; }
+
+/*Site-specific*/
+
+#banner > img {
+  width: 100%;
+}
+
+#wrapper {
+  margin: auto 5em;
+}
+
+#comparisons {
+  /* padding-top: 10em; */
+  background-color: #fbfbfb;
+  position: absolute;
+  width: 100%;
+  max-width: 1150px;
+}
+
+.main_title {
+  margin-left: 2em;
+  margin-bottom: 3em;
+}
+
+.section_wrapper {
+  margin-bottom: 4em;
+}
+
+.title {
+  text-align: center;
+  font-size: 1.5em;
+}
+
+#free {
+  position: relative;
+  /* background-color: red; */
+  float: left;
+  width: 45%;
+  max-width: 450px;
+}
+
+#sign {
+  position: relative;
+  /* background-color: green; */
+  width: 240px;
+  float: left;
+  margin-top: 3em;
+}
+
+#proprietary {
+  position: relative;
+  /* background-color: blue; */
+  width: 45%;
+  max-width: 450px;
+  float: right;
+}
+
+.product {
+  display: block;
+  margin: auto;
+  width: 250px;
+  height: 250px;
+}
+
+.sign  {
+  display: block;
+  margin: auto;
+  width: 149px;
+  height: 149px;
+}
+
+.separator {
+  width: 1px;
+  height: 324px;
+  margin: auto;
+  margin-left: 7.5em;
+  margin-top: 3em;
+}
+
+#section_wrapper {
+  position: relative;
+}
+
+/* #test {
+  height: 10em;
+  position: relative;
+  background-color: white;
+  display: block;
+  float: left;
+} */