From b190b1f58143cd52a66c596f9969406b6eba2694 Mon Sep 17 00:00:00 2001 From: Reda Lazri Date: Sat, 15 Nov 2014 23:49:07 +0100 Subject: [PATCH] Clean-ups. --- givingguide.html | 169 ++++++++++++++++++++--------------------------- stylesheet.css | 13 ++-- 2 files changed, 80 insertions(+), 102 deletions(-) diff --git a/givingguide.html b/givingguide.html index b0b5440..2aac010 100755 --- a/givingguide.html +++ b/givingguide.html @@ -2,13 +2,13 @@ - 2014 Holiday Giving Guide | Free Software Foundation | Working together for free software + 2014 Holiday Giving Guide | Free Software Foundation | Working together for free software - + @@ -38,26 +38,6 @@ -
@@ -99,8 +79,7 @@ GNOME Foundation and Free Software Foundation.

-

The Free Software Foundation's Holiday Giving Guide -

+

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. @@ -108,8 +87,7 @@

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

- -
-
-
-

Operating System: Give the gift of free, flexible, and ethical computing

+
+
+

Operating System: Give the gift of free, flexible, and ethical computing

-
-
- Windows - Linux -
+
+
+ Windows + Linux +
-

Fedora

-
    -
  • Completely free operating system: transparent and modifiable
    • -
  • Break the cycle of forced upgrades and planned obsolescence
    • -
  • Comes with all the software you need and an easy software manager to find more.
    • -
+

Fedora

+
    +
  • Completely free operating system: transparent and modifiable
    • +
  • Break the cycle of forced upgrades and planned obsolescence
    • +
  • Comes with all the software you need and an easy software manager to find more.
    • +
-
+
- download + download -
+
-
- -
-
- bad - Windows
-

Windows

-
    -
  • Proprietary software that profits from controlling how you use your computer
    • -
  • Invades privacy and exposes personal data to Microsoft, the NSA, and other malicious attackers
    • -
  • Dependent on mandatory upgrades and devices that don't support older versions of Windows
    • -
+
+
+ bad + Windows +
-
+

Windows

+
    +
  • Proprietary software that profits from controlling how you use your computer
    • +
  • Invades privacy and exposes personal data to Microsoft, the NSA, and other malicious attackers
    • +
  • Dependent on mandatory upgrades and devices that don't support older versions of Windows
    • +
- avoid +
+ + avoid +
-
+
+
+
+

Operating System: Give the gift of free, flexible, and ethical computing

-
-

Operating System: Give the gift of free, flexible, and ethical computing

+
+
+ Windows + Linux +
-
-
- Windows - Linux -
+

Fedora

+
    +
  • Completely free operating system: transparent and modifiable
    • +
  • Break the cycle of forced upgrades and planned obsolescence
    • +
  • Comes with all the software you need and an easy software manager to find more.
    • +
-

Fedora

-
    -
  • Completely free operating system: transparent and modifiable
    • -
  • Break the cycle of forced upgrades and planned obsolescence
    • -
  • Comes with all the software you need and an easy software manager to find more.
    • -
+
-
+ download - download +
-
- -
-
- bad - Windows -
+
+
+ bad + Windows +
-

Windows

-
    -
  • Proprietary software that profits from controlling how you use your computer
    • -
  • Invades privacy and exposes personal data to Microsoft, the NSA, and other malicious attackers
    • -
  • Dependent on mandatory upgrades and devices that don't support older versions of Windows
    • -
+

Windows

+
    +
  • Proprietary software that profits from controlling how you use your computer
    • +
  • Invades privacy and exposes personal data to Microsoft, the NSA, and other malicious attackers
    • +
  • Dependent on mandatory upgrades and devices that don't support older versions of Windows
    • +
-
+
- avoid + avoid +
-
- +
-
+
+

Operating System: Give the gift of free, flexible, and ethical computing

@@ -267,9 +245,8 @@
-
- - +
+ diff --git a/stylesheet.css b/stylesheet.css index 947ff25..8c77ecb 100755 --- a/stylesheet.css +++ b/stylesheet.css @@ -71,6 +71,8 @@ h6 { font-size: 1.125em; font-family: 'Signika Light'; color: #4d4d4d; margin-b background-position: 5% 30%; } +/* Navbar */ + .navbar { background-color: #2CAF8F; height: 64px; @@ -97,6 +99,7 @@ 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 { @@ -132,11 +135,13 @@ h6 { font-size: 1.125em; font-family: 'Signika Light'; color: #4d4d4d; margin-b color: #4B423B; } +/* Comparisons */ + .wrapper, .section_wrapper { width: 750px; margin: auto; -} +} .main_title { text-align: center; @@ -147,7 +152,7 @@ h6 { font-size: 1.125em; font-family: 'Signika Light'; color: #4d4d4d; margin-b .wrapper .intro_phrase { width: 450px; text-align: center; - font-family: Signika Bold; + font-family: 'Signika Bold'; margin: 1.2em auto; color: #bababa; } @@ -196,7 +201,3 @@ h6 { font-size: 1.125em; font-family: 'Signika Light'; color: #4d4d4d; margin-b float: right; width: 45%; } - -section { - padding: 3em; -} -- 2.25.1