From d3fcd0ac3d1dfaf2f1b06af9caa205649bac7c20 Mon Sep 17 00:00:00 2001 From: Reda Lazri Date: Thu, 20 Nov 2014 11:30:34 +0100 Subject: [PATCH] Code Cleanups --- givingguide.html | 1433 ++++++++++++++++++++++++---------------------- stylesheet.css | 13 +- 2 files changed, 753 insertions(+), 693 deletions(-) diff --git a/givingguide.html b/givingguide.html index a9008bf..3b60cf5 100755 --- a/givingguide.html +++ b/givingguide.html @@ -1,729 +1,780 @@ - - 2014 Holiday Giving Guide | Free Software Foundation | Working together for free software + - + 2014 Holiday Giving Guide | Free Software Foundation | Working together for free software - - - + - - - + + + - + + + - -
-
-
- - - + -
- -
+ +
+
- - join - -
- -
- -
- Giving Guide -
-
-

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. From remote deletion of files to harsh rules about copying and sharing, some gifts almost take more than they give. The good news is that there are ethical companies making better devices that your loved ones can enjoy with freedom and privacy. Here's a list of these smarter gifts, compared with their more well-known, but more restrictive alternatives.

-

Like this guide? Organize a Giving Guide Giveaway to share it with the masses. And remember: donating to a charity in your friend or family member's name (see our recommendations below) is at least as meaningful as buying them an electronic device.

- - - -
-
-
-
- - -
-
- Tehnoetic dongle Wi-Fi adapter -

Tehnoetic dongle Wi-Fi adapter

-

Great for all-free-software installations on laptops with incompatible Wi-Fi hardware. Certified to Respects Your Freedom.

-
- Buy -
-
+ +
+
+
+ Download + +
-
- ThinkPenguin Wi-Fi N router -

ThinkPenguin Wi-Fi N router

-

High speed wireless router running FSF-endorsed LibreCMC operating system. Certified to Respects Your Freedom.

-
- Buy -
-
+
+ avoid +
+
+
+ -
+
- + -
-

If you have ideas for more gifts that can be given - freely, submit your recommendations to our growing page. -

-
-

Recommended charities for holiday donations

-

Electronic Frontier Foundation, Creative Commons, Wikimedia Foundation, Software Freedom Conservancy, Software Freedom Law Center, GNOME Foundation and Free Software Foundation.

+
+

More Recommended Products

- +
-
+
+ Tehnoetic dongle Wi-Fi adapter +

Tehnoetic dongle Wi-Fi adapter

+

Great for all-free-software installations on laptops with incompatible Wi-Fi hardware. Certified to Respects Your Freedom.

+
+ Buy + +
+
+ +
+ ThinkPenguin Wi-Fi N router +

ThinkPenguin Wi-Fi N router

+

High speed wireless router running FSF-endorsed LibreCMC operating system. Certified to Respects Your Freedom.

-

Licenses

+
+ Buy + +
+
-

This page is licensed under a Creative Commons Attribution-ShareAlike 3.0 Unported.

-

Lulzbot by FSF is licensed under a Creative Commons Attribution-ShareAlike 3.0 Unported. -
Based on a work at https://static.fsf.org/nosvn/ryf/taz2.jpg.

+
-

Replicator 2 by FSF is licensed under a Creative Commons Attribution 2.0 Generic. -
Based on a work at http://www.flickr.com/photos/creative_tools/8080029032/.

+ -

FSF USB membership card by FSF is licensed under a Creative Commons Attribution-ShareAlike 3.0 Unported. -
Based on a work at http://static.fsf.org/nosvn/dontcardomebro.jpg.

+

Recommended charities for holiday donations

+

Electronic Frontier Foundation, + Creative Commons, + Wikimedia Foundation, + Software Freedom Conservancy, + Software Freedom Law Center, + GNOME Foundation and + Free Software Foundation.

-

iTunes gift card by FSF is licensed under a Creative Commons Attribution-ShareAlike 3.0 Unported. -
Based on a work at http://www.flickr.com/photos/bmiphone/4640570159/.

+

If you have ideas for more gifts that can be given freely, submit your recommendations to our growing page. +

-

ThinkPenguin with GNU by FSF is licensed under a Creative Commons Attribution-ShareAlike 3.0 Unported. -
Based on a work at https://www.thinkpenguin.com/gnu-linux/royal-penguin-gnu-linux-notebook.

+
+ -

Macbook Pro PSD by andrew-gw is licensed under a Creative Commons Attribution-ShareAlike 3.0 Unported. -
Retrieved from http://commons.wikimedia.org/wiki/File:Macbook_Pro_PSD.png.

+ -

Astounding Stories by FSF is licensed under a Creative Commons Attribution-ShareAlike 3.0 Unported. -
Retrieved from http://www.gutenberg.org.

+
-

The Amazon.com logo is public domain but is a registered trademark.

+

Licenses

+ +

This page is licensed under a Creative Commons Attribution-ShareAlike 3.0 Unported. +

+

Lulzbot by FSF is licensed under a Creative Commons Attribution-ShareAlike 3.0 Unported. +
Based on a work at https://static.fsf.org/nosvn/ryf/taz2.jpg. +

+ +

Replicator 2 by FSF is licensed under a Creative Commons Attribution 2.0 Generic. +
Based on a work at http://www.flickr.com/photos/creative_tools/8080029032/.

+ +

FSF USB membership card by FSF is licensed under a Creative Commons Attribution-ShareAlike 3.0 Unported. +
Based on a work at http://static.fsf.org/nosvn/dontcardomebro.jpg.

+ +

iTunes gift card by FSF is licensed under a Creative Commons Attribution-ShareAlike 3.0 Unported. +
Based on a work at http://www.flickr.com/photos/bmiphone/4640570159/.

+ +

ThinkPenguin with GNU by FSF is licensed under a Creative Commons Attribution-ShareAlike 3.0 Unported. +
Based on a work at https://www.thinkpenguin.com/gnu-linux/royal-penguin-gnu-linux-notebook.

+ +

Macbook Pro PSD by andrew-gw is licensed under a Creative Commons Attribution-ShareAlike 3.0 Unported. +
Retrieved from http://commons.wikimedia.org/wiki/File:Macbook_Pro_PSD.png.

+ +

Astounding Stories by FSF is licensed under a Creative Commons Attribution-ShareAlike 3.0 Unported. +
Retrieved from http://www.gutenberg.org.

+ +

The Amazon.com logo is public domain but is a registered trademark.

+ +

Replicant by Paul Kocialkowski is licensed under a Creative Commons Attribution-ShareAlike 3.0 Unported. +
Retrieved from https://en.wikipedia.org/wiki/File:Replicant_logo_alpha.svg.

+ +

The iOS logo is a registered trademark.

+

The Least Authority logo is copyright Least Authority Enterprises.

+

The Google Drive logo is public domain but may be subject to trademark laws.

+

The Media Goblin graphic is public domain.

+

The YouTube logo is public domain but may be subject to trademark laws.

-

Replicant by Paul Kocialkowski is licensed under a Creative Commons Attribution-ShareAlike 3.0 Unported. -
Retrieved from https://en.wikipedia.org/wiki/File:Replicant_logo_alpha.svg.

+
+ -

The iOS logo is a registered trademark.

-

The Least Authority logo is copyright Least Authority Enterprises.

-

The Google Drive logo is public domain but may be subject to trademark laws.

-

The Media Goblin graphic is public domain.

-

The YouTube logo is public domain but may be subject to trademark laws.

+ -
-
+ + - diff --git a/stylesheet.css b/stylesheet.css index 535938b..e36c636 100755 --- a/stylesheet.css +++ b/stylesheet.css @@ -68,7 +68,7 @@ h6 { font-size: 1.125em; font-family: 'Signika Light'; color: #4d4d4d; margin-b .header_wrapper { background-color: #2CAF8F; - height: 450px; + height: 486px; } .header a { @@ -189,7 +189,13 @@ h6 { font-size: 1.125em; font-family: 'Signika Light'; color: #4d4d4d; margin-b color: #FFDD55; } +.intro_wrapper a { + border-bottom: 1px solid #FDD53A; + color: #FDD53A; +} + .intro_img img{ + padding-top: 1.7em; width: 100%; } @@ -198,7 +204,8 @@ h6 { font-size: 1.125em; font-family: 'Signika Light'; color: #4d4d4d; margin-b .wrapper, .section_wrapper, .buy_avoid, -.recommended { +.recommended, +.licenses { max-width: 750px; min-width: 750px; margin: auto; @@ -330,3 +337,5 @@ h6 { font-size: 1.125em; font-family: 'Signika Light'; color: #4d4d4d; margin-b .licenses h1 { margin-top: 0.6em; } + +/* Footer */ -- 2.25.1