From: Reda Lazri Date: Mon, 17 Nov 2014 16:00:09 +0000 (+0100) Subject: Updates. X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=82460b0320ee6933a596509e6478a931d8b7cc03;p=fsf-giving-guide.git Updates. --- diff --git a/givingguide.html b/givingguide.html index 2aac010..6c257a5 100755 --- a/givingguide.html +++ b/givingguide.html @@ -35,74 +35,98 @@ Logo - - - -
- -
-

SAY SOMETHING CLEVER ABOUT GIVING GUIDE 2014

- -

Are you giving your loved ones holiday gifts they can use freely, or - gifts which put someone else in control?

- -

- 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, - - Amazon might even block all the books on their Kindle and refuse to explain why. - Companies want us to accept this kind of intrusive control, - but when you think about, it's unethical (and annoying!). -

- -

Give freely

- -

- 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 - Electronic Frontier Foundation, - Creative Commons, - Wikimedia Foundation, - Software Freedom Conservancy, - Software Freedom Law Center, - GNOME Foundation - and Free Software Foundation. -

-

The Free Software Foundation's Holiday Giving Guide

- -

- The gifts in the left column respect your freedom much more than those in the right column. -

- -

- - Please share the Giving Guide - with your friends and family members, especially those that might give you - presents! (We're using the hashtag #givefreely.) - -

- -

- 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 campaigns@fsf.org. -

+
+
+ Giving Guide +
+
+

Are you giving your loved ones holiday gifts they can use freely, + or gifts which put someone else in control?

+

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. +

+ +
+
-
+ diff --git a/stylesheet.css b/stylesheet.css index 8c77ecb..7968f86 100755 --- 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; }