From: Reda Lazri Date: Wed, 19 Nov 2014 14:47:24 +0000 (+0100) Subject: Added 'Share' button, fixed 'Buy/avoid' buttons, added img template, removed old img X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=dd0353ce009b93341fcb5552ef3633bfe87564b0;p=fsf-giving-guide.git Added 'Share' button, fixed 'Buy/avoid' buttons, added img template, removed old img --- diff --git a/Guidelines.md b/Guidelines.md index ffa035f..a48283e 100644 --- a/Guidelines.md +++ b/Guidelines.md @@ -3,7 +3,7 @@ ##Images: * Use high resolution images with transparent backgrounds. -* If it's a logo then export the images from its verctor source. +* If it's a logo then ALWAYS export the images from its verctor source. * Do not put a logo next to a product or vice-versa. Always use images with the same nature (i.e. product versus product; logo versus logo) * Always export images and logos to 500px*500px. diff --git a/givingguide.html b/givingguide.html index 7428ff9..86d371d 100755 --- a/givingguide.html +++ b/givingguide.html @@ -33,10 +33,6 @@ - - - - join @@ -69,330 +65,345 @@ +
+ +
+ -
-
-

Operating System

- -
-
- good - Linux -
- -

Trisquel

-
    -
  • - 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. -
    • -
  • Works great with the Wi-Fi adapters in this guide.
    • -
- -
- - 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 -
    • -
- -
- - avoid - -
-
+
+
+

Operating System

+ +
+
+ good + Linux +
+ +

Trisquel

+
    +
  • + 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. +
    • +
  • Works great with the Wi-Fi adapters in this guide.
    • +
+ + + +
+ +
+
+ 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 +
    • +
+ + +
+ +
+
+
+ Download +
+ +
+ avoid
+
+
+
-
-

3D Printers

-
-
- good - TAZ 4.0 -
+
+

3D Printers

-

Lulzbot TAZ 4.0

-
+ +
+
+ bad + Makerbot Replicator 2 +
+ +

Makerbot Replicator 2

+
    +
  • + MakerWare software is proprietary, + restricting freedom and stifling innovation +
    • + +
  • + Hardware patents threaten free printers like + the Lulzbot +
    • + +
  • + Recently announced an increasingly + proprietary approach, further distancing + itself from the free software community +
    • +
+ +
+ +
+
+
+ Download +
-
  • - Powered by free software, making 3D printing - more accessible and encouraging innovation -
    • +
    + avoid +
    +
    +
    +
    -
  • - Learn more about the Lulzbot at - - www.lulzbot.com - -
    • - -
    - Buy -
    +
    +

    Ebooks

    -
    +
    +
    + good + Project Gutenberg +
    -
    -
    - bad - Makerbot Replicator 2 -
    +

    Project Gutenberg

    + +
      +
    • + The original purveyor of DRM-free eBooks +
      • + +
    • + Enjoy the freedom to read your ebooks on any + device +
      • + +
    • + All of the ebooks on Project Gutenberg, + including classics like Peter Pan and Huck + Finn, are gratis +
      • + +
    • + Pick out the perfect books for the whole + family at + + www.gutenberg.org + + or from other + + DRM-free ebooks sites + +
      • +
    -

    Makerbot Replicator 2

    -
      -
    • - MakerWare software is proprietary, - restricting freedom and stifling innovation -
      • +
    -
  • - Hardware patents threaten free printers like - the Lulzbot -
    • +
    +
    + bad + Amazon +
    -
  • - Recently announced an increasingly - proprietary approach, further distancing - itself from the free software community -
    • - +

    Amazon

    +
      +
    • + Amazon can remotely block or delete + individual ebooks or your entire library + with no warning or explanation (they've done + it before--read about it + + here + ). +
      • + +
    • + DRM prevents you from sharing your favorite + books with friends, and Amazon uses DRM to + + maintain their monopoly + +
      • + +
    • + Amazon claims + + you don't actually own or control your + ebooks + +
      • + +
    • + Thanks to DRM, you won't be able to transfer + your books to any other reader +
      • +
    -
    +
    - avoid +
    +
    +
    + Download +
    -
    -
    +
    + avoid +
    +
    +
    +
    +

    Mobile OS

    +
    +
    + good + Replicant +
    + +

    Replicant

    +
      +
    • + Fully free software mobile OS based on + Android +
      • + +
    • + + Supported devices + + include both phones and tablets +
      • +
    • + Used devices can be purchased, so your + dollars won't go to proprietary OS + companies. +
      • +
    -
    -

    Ebooks

    - -
    -
    - good - Project Gutenberg -
    - -

    Project Gutenberg

    - -
      -
    • - The original purveyor of DRM-free eBooks -
      • - -
    • - Enjoy the freedom to read your ebooks on any - device -
      • - -
    • - All of the ebooks on Project Gutenberg, - including classics like Peter Pan and Huck - Finn, are gratis -
      • - -
    • - Pick out the perfect books for the whole - family at - - www.gutenberg.org - - or from other - - DRM-free ebooks sites - -
      • -
    - -
    - - Buy - -
    - -
    - -
    -
    - bad - Amazon -
    - -

    Amazon

    -
      -
    • - Amazon can remotely block or delete - individual ebooks or your entire library - with no warning or explanation (they've done - it before--read about it - - here - ). -
      • - -
    • - DRM prevents you from sharing your favorite - books with friends, and Amazon uses DRM to - - maintain their monopoly - -
      • - -
    • - Amazon claims - - you don't actually own or control your - ebooks - -
      • - -
    • - Thanks to DRM, you won't be able to transfer - your books to any other reader -
      • -
    - -
    - - avoid - -
    -
    + +
    + +
    +
    + bad + Apple iPhone, iPad and Watch +
    + +

    Apple iPhone, iPad and Watch

    +
      +
    • + iOS is a fully proprietary operating system, + giving Apple ultimate control over devices + running it +
      • + +
    • + Apple uses DRM to block competing software. +
      • + +
    • + The company claims to take away your freedom + + for your own good + . +
      • +
    +
    + +
    +
    +
    + Download
    - - - -
    -

    Mobile OS

    - -
    -
    - good - Replicant -
    - -

    Replicant

    -
      -
    • - Fully free software mobile OS based on - Android -
      • - -
    • - - Supported devices - - include both phones and tablets -
      • - -
    • - Used devices can be purchased, so your - dollars won't go to proprietary OS - companies. -
      • -
    - -
    - - Buy - -
    - -
    - -
    -
    - bad - Apple iPhone, iPad and Watch -
    - -

    Apple iPhone, iPad and Watch

    -
      -
    • - iOS is a fully proprietary operating system, - giving Apple ultimate control over devices - running it -
      • - -
    • - Apple uses DRM to block competing software. -
      • - -
    • - The company claims to take away your freedom - - for your own good - . -
      • -
    - -
    - - avoid - -
    -
    + +
    + avoid
    -
    +
    +
    +
    +
    + + +
    -

    Recomended Products

    +

    Recomended Products

    @@ -451,12 +462,10 @@
    -
    +
    +

    Licenses

    +
    +
    - - diff --git a/images/Template.png b/images/Template.png new file mode 100644 index 0000000..2ac96f3 Binary files /dev/null and b/images/Template.png differ diff --git a/images/separator.png b/images/separator.png deleted file mode 100644 index 4ebee7b..0000000 Binary files a/images/separator.png and /dev/null differ diff --git a/stylesheet.css b/stylesheet.css index 46f7c52..13b2ea8 100755 --- a/stylesheet.css +++ b/stylesheet.css @@ -50,7 +50,7 @@ li {list-style-type: circle; padding: 0.4em 0.2em; line-height: 1.4; } br {margin-bottom: 20em; margin-top: 20em;} -h1 { font-size: 2.75em; font-family: 'Signika Light'; margin-bottom: 0.5em; margin-top: 1em; } +h1 { font-size: 2.20em; font-family: 'Signika Light'; color: #2CAF8F; margin-bottom: 0.5em; margin-top: 1em; } h2 { font-size: 1.75em; font-family: 'Signika Light'; color: #2CAF8F; margin-bottom: 0.5em; margin-top: 2em; } h3 { font-size: 1.625em; font-family: 'Signika Bold'; color: #484848; margin-bottom: 0.5em; margin-top: 2em; } h4 { font-size: 1.375em; font-family: 'Signika Light'; color: #4d4d4d; margin-bottom: 0.5em; margin-top: 2em; } @@ -105,14 +105,24 @@ h6 { font-size: 1.125em; font-family: 'Signika Light'; color: #4d4d4d; margin-b } .share_wrapper { - padding: 1.2em; - float: right; - display: inline-block; } .share { - max-width: 36px; - min-width: 36px; + text-align: center; +} + +.share a{ + background-color: #FFE859; + border-bottom: 0; + padding: .6em 2em; + font-family: 'Signika Bold'; + font-size: 1.4em; + color: #2CAF8F; + border-radius: 50em; +} + +.share a:hover { + background-color: #FDDE56; } .navbar { @@ -188,16 +198,19 @@ h6 { font-size: 1.125em; font-family: 'Signika Light'; color: #4d4d4d; margin-b .wrapper, .section_wrapper, +.buy_avoid, .recommended { - width: 750px; + max-width: 750px; min-width: 750px; margin: auto; } .main_title { width: 100%; - text-align: center; + text-align: left; + border-bottom: 1px solid lightgray; margin-top: 3em; + margin-bottom: 2em; display: inline-block; } @@ -205,21 +218,29 @@ h6 { font-size: 1.125em; font-family: 'Signika Light'; color: #4d4d4d; margin-b border-bottom: none; } -.product_img, +.product_img { + margin: auto; + /* width: 168px; */ + height: 168px; +} + .product { margin: auto; - width: 168px; + display: block; + /* margin-bottom: 8em; */ + /* max-width: 168px; */ + max-height: 168px; } .good, .bad { + display: none; /* FIXME: This is temporary until I fix the sizes*/ position: relative; top: 175px; left: 84px; width: 60px; } -.buy, .avoid, .free, .proprietary { text-align: center; } @@ -231,24 +252,45 @@ h6 { font-size: 1.125em; font-family: 'Signika Light'; color: #4d4d4d; margin-b .buy img, .avoid img { - margin-top: 2em; max-width: 151px; height: 42px; } +.buy_avoid_wrapper { + margin-top: 2em; + min-width: 100%; + max-width: 100%; + display: inline-block; +} + +.buy { + text-align: center; + margin: auto; + width: 45.555555%; + float: left; + +} + +.avoid { + text-align: center; + margin: auto; + width: 45.555555%; + float: right; +} + .free { float: left; - width: 45%; + width: 45.555555%; } .proprietary { float: right; - width: 45%; + width: 45.555555%; } /* Recommended Section */ -.recommend_title { +.topic_title { border-bottom: 1px solid #2CAF8F; width: 100%; text-align: left; @@ -272,3 +314,9 @@ h6 { font-size: 1.125em; font-family: 'Signika Light'; color: #4d4d4d; margin-b .recommended_product_img { width: 120px; } + +.recommend_wrapper .buy { + float: none; + text-align: center; + width: 100%; +}