Updates.

diff --git a/givingguide.html b/givingguide.html
index 2aac0102cb1ee6d572edd30e0f74cbe26beb8cad..6c257a5a32be1b5427bc51b50721cf33329d9dd5 100755 (executable)
--- a/givingguide.html
+++ b/givingguide.html
@@ -35,74 +35,98 @@
                                <span class="join_wrapper">
                                        <a href="http://fsf.org/jfb"><img class="join" src="images/join.png" alt="Logo" /></a>
                                </span>
-                       </div>
-               </div>
-
-               <div class="wrapper">
-
-                       <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>
-
-                               <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="#">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 class="intro">
 
+                                       <div class="intro_img">
+                                               <img src="images/banner.png" alt="Giving Guide" />
+                                       </div>
+                                       <div class="intro_wrapper">
+                                               <h2>Are you giving your loved ones holiday gifts they can use freely,
+                                                       or gifts which put someone else in control?</h2>
+                                               <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. In vitae nisl
+                                                       et lacus vestibulum scelerisque. Fusce vitae vestibulum mauris, quis
+                                                       eleifend turpis. Mauris placerat laoreet nisi, nec pellentesque magna
+                                                       gravida id. Nulla nisi est, auctor in arcu eu, sodales condimentum elit.
+                                                       Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam vel
+                                                       gravida risus, non porttitor nibh. Suspendisse mattis maximus mauris,
+                                                       ut ullamcorper turpis commodo non. Aenean a condimentum quam, ac finibus
+                                                       erat. Duis iaculis iaculis diam, sit amet rutrum nisl lobortis ut.
+                                                       Sed accumsan dolor id lectus pretium, at semper tellus dictum. Proin
+                                                       fringilla efficitur justo, et posuere metus aliquam vestibulum.
+                                                       Vivamus ullamcorper nulla in urna mollis, a bibendum erat tempus.
+                                                       Integer luctus neque non magna aliquam congue. Nullam gravida
+                                                       lectus urna, ut vulputate elit lobortis non.
+                                               </p>
+                                               
+                                               </div>
+                               </div>
                        </div>
-
                </div>
+<!--           <div class="wrapper">
+
+       <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>
+
+               <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="#">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>
+
+</div> -->
 
 
                <!--We compare different products from here-->

diff --git a/stylesheet.css b/stylesheet.css
index 8c77ecb3f99d249255fe22b947e4a7a5d3a9f312..7968f86369de602fa33e43b84ed4e28f1ccf656f 100755 (executable)
--- a/stylesheet.css
+++ b/stylesheet.css
@@ -63,20 +63,21 @@ h6 {  font-size: 1.125em; font-family: 'Signika Light'; color: #4d4d4d; margin-b
   /* Header */
 
 .header {
-  background-image: url("images/banner.png");
+/*   background-image: url("images/banner.png"); */
 /*   background-color: #2CAF8F; */
-  background-repeat: no-repeat;
-  height: 710px;
-  background-size: 550px;
-  background-position: 5% 30%;
+/*   background-repeat: no-repeat; */
+/*   height: 710px; */
+/*   background-size: 550px; */
+/*   background-position: 5% 30%; */
 }
 
 /* Navbar */
 
 .navbar {
   background-color: #2CAF8F;
-  height: 64px;
+  height: 500px;
 }
+
 .header a {
   border-bottom: 0;
 }
@@ -99,10 +100,9 @@ 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 {
+.navbar li {
   font-family: 'Signika Regular';
   font-size: 1em;
   background-color: white;
@@ -141,7 +141,7 @@ h6 {  font-size: 1.125em; font-family: 'Signika Light'; color: #4d4d4d; margin-b
 .section_wrapper {
   width: 750px;
   margin: auto;
-} 
+}
 
 .main_title {
   text-align: center;
@@ -157,6 +157,25 @@ h6 {  font-size: 1.125em; font-family: 'Signika Light'; color: #4d4d4d; margin-b
   color: #bababa;
 }
 
+.intro_wrapper {
+  width: 40%;
+  float: right;
+  color: white !important;
+  padding-top: 2em;
+  padding-right: 6em;
+}
+
+.intro_wrapper h2 {
+  color: #FFDD55;
+}
+
+.intro_img img{
+  width: 40%;
+  float: left;
+  padding: 2em;
+  padding-left: 6em;
+
+}
 .buy a {
   border-bottom: none;
 }