Lots of changes and work on the desktop version

diff --git a/css/master.css b/css/master.css
index fc7b757aec5864d37855d8428438028596c8ba83..efc900560b543ce19b1e738d3ab62ba8ca40b503 100644 (file)
--- a/css/master.css
+++ b/css/master.css
@@ -1,7 +1,10 @@
 /*Bootstrap overrides*/
+
 .navbar {
   margin-bottom: 0;
   border: 0;
+  background: #2caf8f;
+  border-radius: 0;
 }
 
 .navbar-header {
@@ -14,8 +17,15 @@
   border: 0;
 }
 
+.navbar-brand {
+  padding-top: 10px;
+}
+
 .navbar-default .navbar-toggle .icon-bar {
-  background-color: #fff;
+  background-color: #ffd429;
+  width: 40px;
+  height: 5px;
+  border-radius: 6px;
 }
 
 .navbar-default .navbar-toggle:focus,
@@ -36,48 +46,78 @@
   color: white;
 }
 /*Typography*/
+
+/* Generated by Font Squirrel (https://www.fontsquirrel.com) on August 20, 2016 */
 @font-face {
-  font-family: "Signika Regular";
-  src: local('Signika Regular'), url("fonts/Signika-Regular.ttf") format('truetype');
+  font-family: "Open Sans Bold";
+  src: url("../fonts/opensans-bold-webfont.eot");
+  src: url("../fonts/opensans-bold-webfont.eot?#iefix") format('embedded-opentype'), url("../fonts/opensans-bold-webfont.woff2") format('woff2'), url("../fonts/opensans-bold-webfont.woff") format('woff'), url("../fonts/opensans-bold-webfont.ttf") format('truetype');
+  font-weight: bold;
+  font-style: normal;
+
 }
 @font-face {
-  font-family: "Signika Light";
-  src: local('Signika Light'), url("fonts/Signika-Light.ttf") format('truetype');
+  font-family: "Open Sans";
+  src: url("../fonts/opensans-regular-webfont.eot");
+  src: url("../fonts/opensans-regular-webfont.eot?#iefix") format('embedded-opentype'), url("../fonts/opensans-regular-webfont.woff2") format('woff2'), url("../fonts/opensans-regular-webfont.woff") format('woff'), url("../fonts/opensans-regular-webfont.ttf") format('truetype');
+  font-weight: 400;
+  font-style: normal;
+
 }
 @font-face {
   font-family: "Signika Bold";
-  src: local('Signika Bold'), url("fonts/Signika-Bold.ttf") format('truetype');
+  src: url("../fonts/signika-bold-webfont.eot");
+  src: url("../fonts/signika-bold-webfont.eot?#iefix") format('embedded-opentype'), url("../fonts/signika-bold-webfont.woff2") format('woff2'), url("../fonts/signika-bold-webfont.woff") format('woff'), url("../fonts/signika-bold-webfont.ttf") format('truetype');
+  font-weight: 600;
+  font-style: normal;
+
 }
 @font-face {
-  font-family: "Open Sans";
-  src: local('Open Sans'), url("fonts/OpenSans-Regular.ttf") format('truetype');
+  font-family: "Signika Light";
+  src: url("../fonts/signika-light-webfont.eot");
+  src: url("../fonts/signika-light-webfont.eot?#iefix") format('embedded-opentype'), url("../fonts/signika-light-webfont.woff2") format('woff2'), url("../fonts/signika-light-webfont.woff") format('woff'), url("../fonts/signika-light-webfont.ttf") format('truetype');
+  font-weight: 100;
+  font-style: normal;
+
 }
 @font-face {
-  font-family: "Open Sans Bold";
-  src: local('Open Sans Bold'), url("fonts/OpenSans-Bold.ttf") format('truetype');
+  font-family: "Signika Regular";
+  src: url("../fonts/signika-regular-webfont.eot");
+  src: url("../fonts/signika-regular-webfont.eot?#iefix") format('embedded-opentype'), url("../fonts/signika-regular-webfont.woff2") format('woff2'), url("../fonts/signika-regular-webfont.woff") format('woff'), url("../fonts/signika-regular-webfont.ttf") format('truetype');
+  font-weight: 400;
+  font-style: normal;
 }
+
 /*Text Styles*/
+h1 {
+  font-family: "Signika Bold";
+  font-size: 25px;
+  color: #2caf8f;
+  margin-top: 40px;
+  margin-bottom: 30px;
+}
+
 h2 {
-  font-family: Signika-Regular;
-  font-size: 22px;
+  font-family: "Signika Regular";
+  font-size: 24px;
   color: #2caf8f;
 }
 
 h3 {
-  font-family: Signika-Regular;
+  font-family: "Signika Regular";
   font-size: 22px;
   color: #333;
 }
 
 h4 {
-  font-family: Signika-Light;
+  font-family: "Signika Light";
   font-size: 20px;
   padding-top: 20px;
   color: #9b9b9b;
 }
 
 h5 {
-  font-family: Signika-Regular;
+  font-family: "Signika Regular";
   font-size: 19px;
   line-height: 20px;
   margin-bottom: 25px;
@@ -86,10 +126,11 @@ h5 {
 
 li,
 p {
-  font-family: OpenSans;
+  font-family: "Open Sans";
   font-size: 16px;
   color: #333;
   line-height: 30px;
+  list-style: outside;
 }
 
 li {
@@ -97,13 +138,25 @@ li {
 }
 
 a {
-  padding: 1px 4px;
-  /*border-radius: 4px;*/
   color: #2caf8f;
-  /*background: white;*/
 }
 
 /*Header*/
+
+/*Navbar*/
+
+.navbar li {
+  font-family: "Signika Regular";
+  font-size: 30px;
+  padding-top: 20px;
+  color: #9b9b9b;
+  text-align: center;
+}
+
+/*.intro {
+  min-height: 100%;
+}*/
+
 .intro,
 .intro-text {
   padding-top: 20px;
@@ -120,9 +173,6 @@ a {
   background: #fff;
 }
 
-.intro p {
-  /*margin: 0;*/
-}
 /*Actions*/
 .actions {
   padding-top: 30px;
@@ -130,23 +180,18 @@ a {
   background: #fffae5;
 }
 
-.icon {
-  width: 140px;
-  height: 140px;
-  background: #ffd429;
-}
-
-.share > .icon > img {
-  margin-top: 29%;
-}
-
-.print > .icon > img {
-  margin-top: 30%;
+.actions button {
+  border: 0;
+  background: #FFD429;
+  border-radius: 100px;
+  padding: 6px 45px;
+  /* Print the guide: */
+  font-family: "Signika Regular";
+  font-size: 22px;
+  color: #333333;
+  margin-bottom: 30px;
 }
 
-.donate > .icon > img {
-  margin-top: 34%;
-}
 /*Comparisons*/
 .title {
   padding-bottom: 8px;
@@ -167,7 +212,7 @@ a {
   background-color: transparent;
   background-image: url("../img/bad-pattern.png");
   background-repeat: repeat;
-  background-size: 50px;
+  background-size: 40px;
 }
 
 .good li {
@@ -178,7 +223,7 @@ a {
   background-image: url("../img/bad.svg");
 }
 
-.bad li.neutral {
+.bad .neutral {
   background-image: url("../img/neutral.svg");
 }
 
@@ -202,7 +247,7 @@ a {
 
 .buy {
   /*box-shadow: 0 4px 0 0 #1D65B7;*/
-  font-family: Signika-Regular;
+  font-family: "Signika Regular";
   font-size: 24px;
   text-transform: uppercase;
   padding: 4px 50px;
@@ -211,3 +256,143 @@ a {
   border-radius: 100px;
   background: #2b81e3;
 }
+
+/*Licenses*/
+.panel-collapse-button {
+  float: right;
+}
+
+/*Footer*/
+footer {
+  background-color: #1a1a1a;
+  padding-top: 30px;
+  padding-bottom: 30px;
+}
+
+footer p {
+  color: white;
+}
+
+.footer-logo {
+  margin-bottom: 15px;
+}
+
+/* Media Queries */
+
+/* Small devices (tablets, 768px and up) */
+@media (min-width: 768px) {
+  /*Navbar*/
+  .navbar-nav {
+    margin: 10px;
+    float: right;
+    /*margin-left: 100px;*/
+  }
+
+  .navbar-default .navbar-nav > li > a {
+    color: #2caf8f;
+    padding: 7px;
+  }
+
+  .navbar li {
+    font-family: "Signika Regular";
+    background-color: white;
+    list-style-type: none;
+    border-right: 1px #9BD2BF solid;
+    padding: 0 25px;
+  }
+
+  .navbar li:first-child {
+    border-radius: 100px 0 0 100px;
+  }
+
+  .navbar li:last-child {
+    border-right: 0;
+    border-radius: 0 100px 100px 0;
+  }
+
+  .navbar li:hover {
+    background-color: #FFDD55;
+  }
+
+  .navbar li a {
+    display: block;
+    text-decoration: none;
+  }
+
+  .navbar li a:hover {
+    color: #4B423B;
+  }
+
+  .join {
+    display: none;
+  }
+  /*Footer*/
+  .footer-logo {
+    margin-bottom: 0;
+  }
+
+  .footer-logo img {
+    width: 80%;
+  }
+}
+/* Medium devices (desktops, 992px and up) */
+@media (min-width: 992px) {
+
+  /*Navbar*/
+  .navbar-nav {
+    margin: 10px 10px 10px 100px;
+    float: none;
+  }
+
+  .navbar-default .navbar-nav > li > a {
+    color: #2caf8f;
+    padding: 7px;
+  }
+
+  .navbar li {
+    font-family: "Signika Regular";
+    font-size: 1em;
+    background-color: white;
+    list-style-type: none;
+    border-right: 1px #9BD2BF solid;
+    padding: 0 30px;
+  }
+
+  .navbar li:first-child {
+    border-radius: 100px 0 0 100px;
+  }
+
+  .navbar li:last-child {
+    border-right: 0;
+    border-radius: 0 100px 100px 0;
+  }
+
+  .navbar li:hover {
+    background-color: #FFDD55;
+  }
+
+  .navbar li a {
+    display: block;
+    text-decoration: none;
+  }
+
+  .navbar li:hover a {
+    color: #4B423B;
+  }
+
+  .join {
+    display: block;
+  }
+
+  .join img {
+    width: 200px;
+    margin: 10px;
+  }
+  /*Footer*/
+  .footer-logo img {
+    width: 50%;
+  }
+}
+
+/* Large devices (large desktops, 1200px and up) */
+@media (min-width: 1200px) {}

diff --git a/fonts/OpenSans-Bold.ttf b/fonts/OpenSans-Bold.ttf
deleted file mode 100644 (file)
index fd79d43..0000000
Binary files a/fonts/OpenSans-Bold.ttf and /dev/null differ

diff --git a/fonts/OpenSans-Regular.ttf b/fonts/OpenSans-Regular.ttf
deleted file mode 100644 (file)
index db43334..0000000
Binary files a/fonts/OpenSans-Regular.ttf and /dev/null differ

diff --git a/fonts/Signika-Bold.ttf b/fonts/Signika-Bold.ttf
deleted file mode 100644 (file)
index 9cd28cf..0000000
Binary files a/fonts/Signika-Bold.ttf and /dev/null differ

diff --git a/fonts/Signika-Light.ttf b/fonts/Signika-Light.ttf
deleted file mode 100644 (file)
index 7fa6e24..0000000
Binary files a/fonts/Signika-Light.ttf and /dev/null differ

diff --git a/fonts/Signika-Regular.ttf b/fonts/Signika-Regular.ttf
deleted file mode 100644 (file)
index 5845c93..0000000
Binary files a/fonts/Signika-Regular.ttf and /dev/null differ

diff --git a/fonts/opensans-bold-webfont.eot b/fonts/opensans-bold-webfont.eot
new file mode 100755 (executable)
index 0000000..178d39b
Binary files /dev/null and b/fonts/opensans-bold-webfont.eot differ

diff --git a/fonts/opensans-bold-webfont.ttf b/fonts/opensans-bold-webfont.ttf
new file mode 100755 (executable)
index 0000000..d7bfbe0
Binary files /dev/null and b/fonts/opensans-bold-webfont.ttf differ

diff --git a/fonts/opensans-bold-webfont.woff b/fonts/opensans-bold-webfont.woff
new file mode 100755 (executable)
index 0000000..772dfe1
Binary files /dev/null and b/fonts/opensans-bold-webfont.woff differ

diff --git a/fonts/opensans-bold-webfont.woff2 b/fonts/opensans-bold-webfont.woff2
new file mode 100755 (executable)
index 0000000..54de939
Binary files /dev/null and b/fonts/opensans-bold-webfont.woff2 differ

diff --git a/fonts/opensans-regular-webfont.eot b/fonts/opensans-regular-webfont.eot
new file mode 100755 (executable)
index 0000000..7b1dee6
Binary files /dev/null and b/fonts/opensans-regular-webfont.eot differ

diff --git a/fonts/opensans-regular-webfont.ttf b/fonts/opensans-regular-webfont.ttf
new file mode 100755 (executable)
index 0000000..bc195d4
Binary files /dev/null and b/fonts/opensans-regular-webfont.ttf differ

diff --git a/fonts/opensans-regular-webfont.woff b/fonts/opensans-regular-webfont.woff
new file mode 100755 (executable)
index 0000000..e39a87b
Binary files /dev/null and b/fonts/opensans-regular-webfont.woff differ

diff --git a/fonts/opensans-regular-webfont.woff2 b/fonts/opensans-regular-webfont.woff2
new file mode 100755 (executable)
index 0000000..2ff88d6
Binary files /dev/null and b/fonts/opensans-regular-webfont.woff2 differ

diff --git a/fonts/signika-bold-webfont.eot b/fonts/signika-bold-webfont.eot
new file mode 100755 (executable)
index 0000000..3a193ad
Binary files /dev/null and b/fonts/signika-bold-webfont.eot differ

diff --git a/fonts/signika-bold-webfont.ttf b/fonts/signika-bold-webfont.ttf
new file mode 100755 (executable)
index 0000000..c337da5
Binary files /dev/null and b/fonts/signika-bold-webfont.ttf differ

diff --git a/fonts/signika-bold-webfont.woff b/fonts/signika-bold-webfont.woff
new file mode 100755 (executable)
index 0000000..b97f940
Binary files /dev/null and b/fonts/signika-bold-webfont.woff differ

diff --git a/fonts/signika-bold-webfont.woff2 b/fonts/signika-bold-webfont.woff2
new file mode 100755 (executable)
index 0000000..46cdf74
Binary files /dev/null and b/fonts/signika-bold-webfont.woff2 differ

diff --git a/fonts/signika-light-webfont.eot b/fonts/signika-light-webfont.eot
new file mode 100755 (executable)
index 0000000..be3a358
Binary files /dev/null and b/fonts/signika-light-webfont.eot differ

diff --git a/fonts/signika-light-webfont.ttf b/fonts/signika-light-webfont.ttf
new file mode 100755 (executable)
index 0000000..d728b8b
Binary files /dev/null and b/fonts/signika-light-webfont.ttf differ

diff --git a/fonts/signika-light-webfont.woff b/fonts/signika-light-webfont.woff
new file mode 100755 (executable)
index 0000000..b39910f
Binary files /dev/null and b/fonts/signika-light-webfont.woff differ

diff --git a/fonts/signika-light-webfont.woff2 b/fonts/signika-light-webfont.woff2
new file mode 100755 (executable)
index 0000000..a1b9393
Binary files /dev/null and b/fonts/signika-light-webfont.woff2 differ

diff --git a/fonts/signika-regular-webfont.eot b/fonts/signika-regular-webfont.eot
new file mode 100755 (executable)
index 0000000..cbb2d38
Binary files /dev/null and b/fonts/signika-regular-webfont.eot differ

diff --git a/fonts/signika-regular-webfont.ttf b/fonts/signika-regular-webfont.ttf
new file mode 100755 (executable)
index 0000000..50fe1eb
Binary files /dev/null and b/fonts/signika-regular-webfont.ttf differ

diff --git a/fonts/signika-regular-webfont.woff b/fonts/signika-regular-webfont.woff
new file mode 100755 (executable)
index 0000000..c6c18a0
Binary files /dev/null and b/fonts/signika-regular-webfont.woff differ

diff --git a/fonts/signika-regular-webfont.woff2 b/fonts/signika-regular-webfont.woff2
new file mode 100755 (executable)
index 0000000..1af7ab0
Binary files /dev/null and b/fonts/signika-regular-webfont.woff2 differ

diff --git a/givingguide.html b/givingguide.html
index d5c350101efa06f070b4b7a34adac217a604e564..f56d3a0e036a3d8dcadeb84c63eec116eefb8468 100644 (file)
--- a/givingguide.html
+++ b/givingguide.html
@@ -35,21 +35,18 @@
           <span class="icon-bar"></span>
           <span class="icon-bar"></span>
         </button>
-        <a class="navbar-brand" href="#"><img class="brand" src="img/logo.png" alt="FSF" width="130px" /></a>
+        <a class="navbar-brand" href="#"><img class="brand" src="img/logo.png" alt="FSF" width="180px" /></a>
       </div>
 
       <!-- Collect the nav links, forms, and other content for toggling -->
       <div class="collapse navbar-collapse" id="navbar-links">
-        <ul class="nav navbar-nav">
+        <ul class="nav navbar-nav pull-right">
           <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/donate/">Donate</a></li>
           <li><a href="http://shop.fsf.org/">Shop</a>
-            <li role="separator" class="divider"></li>
         </ul>
-        <span class="join_wrapper">
-                <a href="http://fsf.org/jfb"><img class="join" src="//static.fsf.org/nosvn/images/givingguide/images/join.png" alt="join" /></a>
-              </span>
+
       </div>
       <!-- /.navbar-collapse -->
     </div>
@@ -64,7 +61,7 @@
           <img src="img/Illustration.png" alt="" class="img-responsive" />
         </div>
         <div class="intro-text col-md-6">
-          <h2>Are you giving your loved ones tech gifts they can use freely?</h2>
+          <h1>Are you giving your loved ones tech gifts they can use freely?</h1>
           <h4>Or gifts which put someone else in control?</h4>
           <p>
             Electronics are popular gifts, but people often overlook the restrictions that manufacturers slip under the wrapping paper. From remote deletion of files to harsh rules about copying and sharing, some gifts take more than they give.
@@ -84,35 +81,39 @@
   <div class="actions">
     <div class="container">
       <div class="row">
-        <div class="share col-md-4 text-center">
-          <div class="icon center-block img-circle">
-            <img src="img/icon-share.png" alt="sharing icon" width="60px" class="text-center" />
-          </div>
-          <h3>Share</h3>
+        <!-- Begin Share -->
+        <div class="share col-md-4 col-sm-4 text-center">
+          <h2>Share</h2>
           <p>
-            Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt.
+            Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
           </p>
+          <button type="button" name="share"><a href="https://www.fsf.org/share?u=https://www.fsf.org/givingguide/&amp;t=Check out the Free Software Foundation Ethical Tech Giving Guide">#givefreely</a></button>
         </div>
-        <div class="print col-md-4 text-center">
-          <div class="icon center-block img-circle">
-            <img src="img/icon-print.png" alt="print icon" width="60px" class="text-center" />
-          </div>
-          <h3>Print the guide</h3>
+        <!-- End Share -->
+
+        <!-- Begin Share -->
+        <div class="print col-md-4 col-sm-4 text-center">
+          <h2>Organize</h2>
           <p>
-            Download the printable version and organize a Giving Guide Giveaway to share it with your community
+            Like this guide? Download the printable version and organize a <a href="https://www.fsf.org/givingguide/giving-guide-giveaway-primer">Giving Guide Giveaway</a> to share it with your community.
           </p>
+          <button type="button" name="print"><a href="https://www.fsf.org/givingguide/giving-guide-giveaway-primer#printable">Print the guide</a></button>
         </div>
-        <div class="donate col-md-4 text-center">
-          <div class="icon center-block img-circle">
-            <img src="img/icon-donate.png" alt="donate icon" width="60px" class="text-center" />
-          </div>
-          <h3>Donate</h3>
+        <!-- End Share -->
+
+        <!-- Begin Share -->
+        <div class="donate col-md-4 col-sm-4 text-center">
+          <h2>Non-profit</h2>
           <p>
-            Remember that donating to a nonprofit in someone's name is at least as meaningful as buying them an electronic device.
+            Remember: donating to a <a href="#charities">nonprofit</a> in someone's name is at least as meaningful as buying them an electronic device.
           </p>
+          <button type="button" name="donate">Donate</button>
         </div>
+        <!-- End Share -->
       </div>
+      <!-- End Row -->
     </div>
+    <!-- End Container -->
   </div>
   <!--End Actions-->
 
@@ -402,16 +403,17 @@
     <div class="container">
       <h1>More Products Certified to Respect Your Freedom</h1>
       <div class="row">
+
         <!-- Begin Certified -->
-        <div class="col-md-4">
-          <img src="https://static.fsf.org/nosvn/images/tehnoetic_adapter.png" alt="" class="center-block" />
+        <div class="col-md-4 col-sm-4">
+          <img src="img/products/tehnoetic-wifi.png" alt="" class="center-block" />
           <h5 class="text-center">Tehnoetic Mini Wi-Fi Adapter</h5>
           <p>
             Great for all-free-software installations on laptops with incompatible Wi-Fi hardware.
           </p>
         </div>
 
-        <div class="col-md-4">
+        <div class="col-md-4 col-sm-4">
           <img src="https://static.fsf.org/nosvn/images/givingguide/images/thinkpenguin-mini-router.png" alt="" class="center-block" />
           <h5 class="text-center">ThinkPenguin VPN Router</h5>
           <p>
@@ -419,21 +421,129 @@
           </p>
         </div>
 
-        <div class="col-md-4">
+        <div class="col-md-4 col-sm-4">
           <img src="https://static.fsf.org/nosvn/images/givingguide/images/thinkpenguin-long-range-adapter.png" alt="" class="center-block img-responsive" />
           <h5 class="text-center">ThinkPenguin Long-Range Wi-Fi Adapter</h5>
           <p>
             More powerful than its smaller cousin, and can be further upgraded with a larger antenna.
           </p>
         </div>
-        <!-- End Certified -->
-        </p>
+      </div>
+      <!-- End Row -->
+      <div class="row">
+        <div class="col-md-12">
+          <p class="alert alert-info"> If you have ideas for more gifts that can be given freely, submit your recommendations to our <a class="alert-link" href="http://libreplanet.org/wiki/Group:Giving_Guide_Suggestions">growing page</a>.
+        </div>
+        <div class="col-md-12">
+          <p class="alert alert-success">To learn more about which hardware supports free software and which doesn't, explore the community-run <a href="https://www.h-node.org/" class="alert-link">h-node database</a>.</p>
+        </div>
+      </div>
+    </div>
+    <!--End Container-->
+
+  </div>
+  <!-- End Certified -->
+
+  <!-- Begin Donations -->
+  <div class="donations">
+    <div class="container">
+      <h1>Recommended organizations for holiday donations</h1>
+      <div class="row">
+        <div class="col-md-3 col-xs-6">
+          <a href="http://www.fsf.org/"><img src="https://upload.wikimedia.org/wikipedia/commons/d/d2/FSF_Logo.menor.jpg" alt="" class="center-block img-responsive" width="300px" /></a>
+        </div>
+        <div class="col-md-3 col-xs-6">
+          <a href="http://www.sfconservancy.org/"><img src="https://sfconservancy.org/img/conservancy-logo.png" alt="" class="center-block img-responsive" width="300px" /></a>
+        </div>
+        <div class="col-md-3 col-xs-6">
+          <a href="https://www.fsf.org/"><img src="https://upload.wikimedia.org/wikipedia/commons/d/d2/FSF_Logo.menor.jpg" alt="" class="center-block img-responsive" width="300px" /></a>
+        </div>
+        <div class="col-md-3 col-xs-4">
+          <a href="http://www.eff.org/"><img src="https://www.eff.org/files/2014/01/24/eff-logo-plain-72.jpg" alt="" class="center-block img-responsive" width="300px" /></a>
+        </div>
+        <div class="col-md-3 col-xs-4">
+          <a href="http://www.creativecommons.org/"><img src="http://mirrors.creativecommons.org/presskit/icons/cc.large.png" alt="" class="center-block img-responsive" width="300px" /></a>
+        </div>
+        <div class="col-md-3 col-xs-4">
+          <a href="http://wikimedia.org/"><img src="http://static.myce.com/images_posts/2015/06/wikimedia-logo.jpg" alt="" class="center-block img-responsive" width="300px" /></a>
+        </div>
+        <div class="col-md-3 col-xs-4">
+          <a href="http://www.softwarefreedom.org/"><img src="" alt="" class="center-block img-responsive" width="300px" /></a>
+        </div>
+        <div class="col-md-3 col-xs-4">
+          <a href="http://www.gnome.org/"><img src="https://upload.wikimedia.org/wikipedia/commons/thumb/6/68/Gnomelogo.svg/2000px-Gnomelogo.svg.png" alt="" class="center-block img-responsive" width="300px" /></a>
+        </div>
+        <div class="col-md-3 col-xs-4">
+          <a href="https://ceata.org/"><img src="https://ceata.org/files/images/ceata.png" alt="" class="center-block img-responsive" width="300px" /></a>
+        </div>
+      </div>
+    </div>
+  </div>
+  <!-- End Donations -->
+
+  <!-- Begin Licenses -->
+  <div class="Licenses">
+    <div class="container">
+      <div class="row">
+        <div class="col-md-12">
+          <div class="panel panel-default">
+            <div class="panel-heading">
+              <h1 class="panel-title">Licenses</h1>
+            </div>
+            <div class="panel-body">
+              <p>This page by the Free Software Foundation is licensed under a <a href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 Unported.</a>
+              </p>
+              <p>The graphics and photos used on this page have been modified by the Free Software Foundation and are licensed separately under the following terms: </p>
+              <ul style="list-style: none inside none;">
+                <li>X200, T400, iPhone, and ISP-provided router images are in the public domain.</li>
+                <li>Lulzbot 3D printer photo by Aleph Objects is licensed under a <a href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0 Unported.</a></li>
+                <li>FSF USB membership card by FSF is licensed under a <a href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0 Unported.</a></li>
+                <li>iTunes gift card is licensed under a <a href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0 Unported.</a></li>
+                <li>ThinkPenguin with GNU and both ThinkPenguin router images by ThinkPenguin are licensed under a <a href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0 Unported.</a></li>
+                <li>Macbook Pro PSD by andrew-gw is licensed under a <a href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0 Unported.</a></li>
+                <li>Astounding Stories is licensed under a <a href="http://creativecommons.org/licenses/by-sa/3.0/deed.en_US">Creative Commons Attribution-ShareAlike 3.0 Unported.</a></li>
+                <li>The Inkscape and GIMP logos are licensed under the <a href="https://www.gnu.org/copyleft/gpl.html">GNU General Public License</a>.</li>
+                <li>The Amazon, iOS, YouTube, Google Drive and Adobe Photoshop and Illustrator logos are registered trademarks.</li>
+                <li>Tehnoetic Replicant s2 and Wi-Fi Dongle by Tehnoetic 2014 licensed under <a href="https://creativecommons.org/licenses/by-sa/4.0/">CC BY-SA 4.0</a>.</li>
+                <li>The Lenovo U31 image is copyright Lenovo.</li>
+                <li>The MakerBot logo is copyright MakerBot Industries.</li>
+                <li>The Least Authority logo is copyright Least Authority Enterprises.</li>
+              </ul>
+            </div>
+          </div>
+        </div>
+        <!-- End Panel -->
       </div>
       <!-- End Row -->
     </div>
-    <p class="alert alert-success"> If you have ideas for more gifts that can be given freely, submit your recommendations to our <a href="http://libreplanet.org/wiki/Group:Giving_Guide_Suggestions">growing page</a>.
-      <!--End Container-->
+    <!-- End Container -->
   </div>
+  <!-- End Licenses   -->
+
+  <!--Begin Footer-->
+  <footer>
+    <div class="container-fluid">
+      <div class="row">
+        <div class="col-md-3 col-sm-3 footer-logo">
+          <img src="../img/FSF_footer.png" alt="FSF" class="center-block" width="30%" />
+        </div>
+        <div class="col-md-9 col-sm-9">
+          <p>The FSF is a nonprofit with a worldwide mission to advance software freedom —
+            <a href="https://fsf.org/about">learn about our history and work.</a>
+          </p>
+          <p>Version 7.0. Copyright © 2004-2016
+            <a href="https://fsf.org/about/contact.html" title="Find out how to contact us">
+        Free Software Foundation
+        </a>, Inc.
+            <a href="https://my.fsf.org/donate/privacypolicy.html"> Privacy Policy</a>.
+          </p>
+        </div>
+      </div>
+      <!-- End Row -->
+    </div>
+    <!-- End Container -->
+  </footer>
+  <!-- End Footer -->
 
   <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
   <script src="js/jquery-2.2.2.min.js" charset="utf-8"></script>

diff --git a/img/FSF_footer.png b/img/FSF_footer.png
new file mode 100644 (file)
index 0000000..a98fb29
Binary files /dev/null and b/img/FSF_footer.png differ

diff --git a/img/products/tehnoetic-wifi.png b/img/products/tehnoetic-wifi.png
new file mode 100644 (file)
index 0000000..ed02427
Binary files /dev/null and b/img/products/tehnoetic-wifi.png differ

diff --git a/img/unfold less.svg b/img/unfold less.svg
new file mode 100644 (file)
index 0000000..e845b12
--- /dev/null
+++ b/img/unfold less.svg
@@ -0,0 +1 @@
+<svg width="11.484375" height="20.039062" viewBox="9.257812 -45.058594 11.484375 20.039062" xmlns="http://www.w3.org/2000/svg"><path d="M20.742188 -43.300781L15.000000 -37.558594L9.257812 -43.300781L11.015625 -45.058594L15.000000 -41.074219L18.984375 -45.058594ZM9.257812 -26.777344L15.000000 -32.519531L20.742188 -26.777344L18.984375 -25.019531L15.000000 -29.003906L11.015625 -25.019531ZM9.257812 -26.777344"></path></svg>
\ No newline at end of file

diff --git a/img/unfold more.svg b/img/unfold more.svg
new file mode 100644 (file)
index 0000000..c31fc8b
--- /dev/null
+++ b/img/unfold more.svg
@@ -0,0 +1 @@
+<svg width="11.484375" height="22.500000" viewBox="9.257812 -48.750000 11.484375 22.500000" xmlns="http://www.w3.org/2000/svg"><path d="M15.000000 -29.765625L18.984375 -33.750000L20.742188 -31.992188L15.000000 -26.250000L9.257812 -31.992188L11.015625 -33.750000ZM15.000000 -45.234375L11.015625 -41.250000L9.257812 -43.007812L15.000000 -48.750000L20.742188 -43.007812L18.984375 -41.250000ZM15.000000 -45.234375"></path></svg>
\ No newline at end of file

diff --git a/js/magic.js b/js/magic.js
index 018ccec04e464bfcaa6f7be599db4f3e61ff2e03..518cb7f04ae8fe58f91e2473e3cd55e0bee90a10 100644 (file)
--- a/js/magic.js
+++ b/js/magic.js
@@ -1,47 +1,2 @@
 $(document).ready(function() {
-
-    // Slider
-    $("#lightSlider").lightSlider({
-        item: 3,
-        autoWidth: true,
-        slideMove: 1, // slidemove will be 1 if loop is true
-        slideMargin: 10,
-
-        addClass: '',
-
-        speed: 400, //ms'
-        auto: true,
-        loop: true,
-        slideEndAnimation: true,
-        pause: 2000,
-
-        keyPress: true,
-        controls: true,
-
-        rtl: false,
-
-        thumbItem: 10,
-        pager: true,
-
-
-        responsive: [],
-
-    });
-
-    // Dismiss the menu when we click on an item
-
-    // $(".nav li a").on('click', function() {
-    //   if $(".navbar-toggle").getElementsByClass('collapsed') == false {
-    //     $(this).toggleClass('collapsed');
-    //   }
-    // });
-
-    $('#crotator').crotator({
-        timeOfExistence: 2, // in seconds
-        typeofTag: "<h3/>",
-        tagClass: "elClass",
-        cycle: true, // true, false
-        startEmpty: false // true, false
-    });
-
 });