From dd0353ce009b93341fcb5552ef3633bfe87564b0 Mon Sep 17 00:00:00 2001 From: Reda Lazri Date: Wed, 19 Nov 2014 15:47:24 +0100 Subject: [PATCH] Added 'Share' button, fixed 'Buy/avoid' buttons, added img template, removed old img --- Guidelines.md | 2 +- givingguide.html | 617 ++++++++++++++++++++++--------------------- images/Template.png | Bin 0 -> 518 bytes images/separator.png | Bin 140 -> 0 bytes stylesheet.css | 78 ++++-- 5 files changed, 377 insertions(+), 320 deletions(-) create mode 100644 images/Template.png delete mode 100644 images/separator.png 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 0000000000000000000000000000000000000000..2ac96f38b6d17c551b8a08ee1be1c62cdfbe1e20 GIT binary patch literal 518 zcmeAS@N?(olHy`uVBq!ia0y~yUzopr0N33X&j0`b literal 0 HcmV?d00001 diff --git a/images/separator.png b/images/separator.png deleted file mode 100644 index 4ebee7b233d0b8aee3f01bcf865240d4b7fcba9f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 140 zcmeAS@N?(olHy`uVBq!ia0vp^OhDAZ!3JbSF==lGQjEnx?oJHr&dIz4a@;&!977^F z-(KD*$e_T%;<)uc-+l>EokJ;{5=qa>)NVdLw<`4UhZa6ZPK!MPQx>qO1~@RXil7qn aMP*(za4gW=`EnW1L