From 188d675228ade02db99c475a85e7c28cb2addf20 Mon Sep 17 00:00:00 2001 From: Zak Rogoff Date: Thu, 3 Nov 2016 20:28:47 -0400 Subject: [PATCH] So much stuff --- css/master.css | 16 +- givingguide.html | 414 ++++++------ template.html | 1614 ++++++++++++++++++++++++---------------------- 3 files changed, 1033 insertions(+), 1011 deletions(-) diff --git a/css/master.css b/css/master.css index 9121c76..f6cb4cc 100644 --- a/css/master.css +++ b/css/master.css @@ -442,15 +442,27 @@ li.neutral { background-color: #F5FFF7; } +/*Promotion details*/ +.promotion-details { + margin-bottom: 0; + background-color: #fffae5; +} + +.promotion-details .panel-default .panel-heading { + border: 0; + background-color: #fffae5; + box-shadow: 0 0 0 transparent; +} + /*Licenses*/ .licenses { margin-bottom: 0; - background-color: #fffae5; + background-color: #F5FFF7; } .licenses .panel-default .panel-heading { border: 0; - background-color: #fffae5; + background-color: #F5FFF7; box-shadow: 0 0 0 transparent; } diff --git a/givingguide.html b/givingguide.html index 9c381e5..a3062eb 100644 --- a/givingguide.html +++ b/givingguide.html @@ -1,11 +1,6 @@ - - @@ -157,7 +152,7 @@
replicant phone -
Tehnoetic S3 with Replicant
+
Galaxy S3 with Replicant
- Tehnoetic store - -
+ Get it from + Tehnoetic

- PlaceholderUntil December 31st, buy this or this or this or this product, and get this or this free thing. Specify which thing you want in an email to sales@librepotato.biz.ru. Use the code IDONTHAVEANYFRIENDS2016 5% of proceeds will also be - donated to the FSF! + Tehnoetic promotion details.

-
- +
@@ -188,14 +180,10 @@

Get it from

- Tehnoetic store - -
+ Tehnoetic

- Until December 31st, buy this or this or this or this product, and get this or this free thing. Specify which thing you want in an email to sales@librepotato.biz.ru. Use the code IDONTHAVEANYFRIENDS2016 5% of proceeds will also be - donated to the FSF! + Tehnoetic promotion details.

-
@@ -228,65 +216,6 @@
- - - - -

Full-sized Laptops

@@ -302,8 +231,8 @@ @@ -315,8 +244,8 @@

Get it from

- Minifree store - Tehnoetic store
+ Minifree + @@ -345,6 +274,13 @@ +
+
  • +

    + Many of these items are certified to Respect Your Freedom (RYF-certified). +

    +
  • +
    @@ -355,7 +291,7 @@
    X200 with GNU/Linux
    -
    - Libiquity store -

    - Libiquity's X200 is RYF-certified. Placeholder sale details (could be longer than this). Use the code PLACEHOLDER for 5% off. -

    - Minifree store -

    - Minifree's X200 is RYF-certified. Placeholder sale details (could be longer than this). Use the code PLACEHOLDER for 5% off. -

    - Tehnoetic store + Get it from + + Libiquity

    - Tehnoetic's X200 has not yet undergone RYF certification. Placeholder sale details (could be longer than this). Use the code PLACEHOLDER for 5% off. + Libiquity promotion details.

    + Minifree
    @@ -386,18 +317,11 @@

    Get it from

    - Libiquity store -

    - Libiquity's X200 is RYF-certified. Placeholder sale details (could be longer than this). Use the code PLACEHOLDER for 5% off. -

    - Minifree store -

    - Minifree's X200 is RYF-certified. Placeholder sale details (could be longer than this). Use the code PLACEHOLDER for 5% off. -

    - Tehnoetic store -

    - Tehnoetic's X200 has not yet undergone RYF certification. Placeholder sale details (could be longer than this). Use the code PLACEHOLDER for 5% off. -

    + Libiquity +

    + Libiquity promotion details. +

    + Minifree
    @@ -444,14 +368,11 @@
    - Lulzbot store - -
    -

    - The Lulzbot Mini is RYF-certified. Placeholder sale details (could be longer than this). Use the code PLACEHOLDER for 5% off. -

    -
    - + Get it from + Lulzbot +

    + Lulzbot promotion details. +

    @@ -463,15 +384,10 @@

    Get it from

    - Lulzbot store - -
    -

    - - The Lulzbot Mini is RYF-certified. Placeholder sale details (could be longer than this). Use the code PLACEHOLDER for 5% off. -

    -
    - + Lulzbot +

    + Lulzbot promotion details. +

    @@ -520,6 +436,7 @@
    + Get it from Seller 1 Seller 2 @@ -582,6 +499,63 @@
    + + +
    @@ -668,70 +642,69 @@
    - -
    -

    Graphic Design

    -
    -
    - GIMP and Inskacape -
    GIMP and Inkscape
    - - - -
    -
    - GIMP - Inkscape -
    -
    + +
    +

    Graphic Design

    +
    +
    + GIMP and Inskacape +
    GIMP and Inkscape
    + + + +
    +
    + GIMP + Inkscape +
    +
    - -
    + + +
      +
    • Free software, with thriving developer communities.
    • +
    • Designed for free formats, but can also open files created in other programs.
    • +
    • Wide variety of plugins grants limitless features.
    • +
    • Easy to install on all major operating systems.
    • +
    - + + +
    + adobe +
    Photoshop and Illustrator
    +
      +
    • Proprietary software controlled by Adobe.
    • +
    • Shuts down when its DRM is unable to verify the costly required subscription, even if it's actually up to date.
    • +
    • Prefers locked-down proprietary formats.
    • +
    +
    + +
    + +
    +
    @@ -742,48 +715,9 @@
    FSF Membership Card
    - -
    -
    - Seller 1 - Seller 2 - -
    -

    - Until December 31st, buy this or this or this or this product, and get this or this free thing. Specify which thing you want in an email to sales@librepotato.biz.ru. Use the code IDONTHAVEANYFRIENDS2016 5% of proceeds will also be - donated to the FSF! -

    -
    - -
    -
    - - -
    • Join over 3,500 active members working to make a better world built on free software.
    • @@ -809,13 +743,7 @@
    -
    -
  • -

    - All the items recommended by the Free Software Foundation are RYF-Certified -

    -
  • -
    +
    @@ -855,6 +783,34 @@ + +
    +
    +
    +
    +
    +
    +

    Promotion details

    +
    +
    + +
      +
    • All ThinkPenguin promotion information.
    • +
    • All Libiquity promotion information.
    • +
    • All Tehnoetic promotion information.
    • +
    • All Lulzbot promotion information.
    • +
    +
    +
    +
    + +
    + +
    + +
    + +
    diff --git a/template.html b/template.html index aaadd8b..91d084d 100644 --- a/template.html +++ b/template.html @@ -45,9 +45,9 @@ + + + @@ -73,848 +73,902 @@
  • Campaigns
  • Donate
  • Shop - + -
  • -
    - - - - -
    -
    -
    -
    - large-illutration -
    -
    + +
    + + + + +
    +
    +
    +
    + large-illutration +
    +

    This version is kept as an HTML/CSS reference. It includes some small bells and whistles that were removed in the v7 launch, but might be useful later.

    -

    Or gifts which put someone else in control?

    -

    - Electronics are popular gifts, 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 take more than they give. -

    - -

    The good news

    -

    - The good news is that there are ethical companies making better devices that your loved ones can enjoy with freedom and privacy. This is the Free Software Foundation (FSF) guide to smarter gifts, compared with their restrictive counterparts. -

    -
    +

    Or gifts which put someone else in control?

    +

    + Electronics are popular gifts, 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 take more than they give. +

    + +

    The good news

    +

    + The good news is that there are ethical companies making better devices that your loved ones can enjoy with freedom and privacy. This is the Free Software Foundation (FSF) guide to smarter gifts, compared with their restrictive counterparts. +

    -
    - - - -
    -
    -
    - -
    - Share -

    - Use #givefreely. You might get a gift out of it! -

    -
    - - - -
    - Lead an event -

    - Print and distribute to holiday shoppers. -

    - -
    - - - -
    - Donate instead -

    - Help a free software organization, as a gift. -

    -
    - +
    +
    + + + +
    +
    +
    + +
    +

    Share

    +

    + Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt. +

    + #givefreely +
    + + + +
    +

    Organize

    +

    + Download the printable version and organize a Giving Guide Giveaway to share it with your community. +

    + Print the guide
    - + + + +
    +

    Non-profit

    +

    + Donating to a nonprofit in someone's name is at least as meaningful as buying them an electronic device. +

    + Donate +
    +
    - -
    - - - -
    - - -
    -

    Smartphones

    -
    -
    - replicant phone -
    Tehnoetic S3 with Replicant
    - - - -
    + +
    + +
    + + + +
    + + +
    +

    Smartphones

    +
    +
    + replicant phone +
    Tehnoetic S2 with Replicant
    + + + +
    +
    + Seller 1 + Seller 2 + +
    +

    + Until December 31st, buy this or this or this or this product, and get this or this free thing. Specify which thing you want in an email to sales@librepotato.biz.ru. Use the code IDONTHAVEANYFRIENDS2016 5% of proceeds will also be + donated to the FSF! +

    +
    + +
    +
    + + + + + +
      +
    • Fully free software, based on Android.
    • +
    • Supported devices include both phones and tablets.
    • +
    • Works on used devices, so your dollars won't go to proprietary OS companies. (All commercially available Android devices ship with some proprietary software.)
    • +
    +
    + + +
    + iphone +
    iPhone
    +
      +
    • Comes with no shortage of spyware.
    • +
    • + iOS is a fully proprietary operating system, giving Apple control over the software on the devices. +
    • +
    • + Apple uses DRM to block competing software. +
    • +
    +
    + +
    + +
    + + + + - - - -
    - - - -
    -
    -

    Recommended organizations for holiday donations

    -
    -
    - fsf -
    -
    - sfc -
    -
    - eff -
    -
    - cc -
    -
    - wikimedia -
    -
    - sflc -
    -
    - gnome -
    -
    - ceata -
    -
    + +
    + +
    +
  • +

    + All the items recommended by the Free Software Foundation are RYF-Certified +

    +
  • +
    +
    + +
    + + + +
    +
    +

    Recommended organizations for holiday donations

    +
    +
    + fsf
    -
    - - - -
    -
    -
    -
    -
    -
    -

    Licenses

    +
    + sfc +
    +
    + eff +
    +
    + cc +
    +
    + wikimedia +
    +
    + sflc +
    +
    + gnome +
    +
    + ceata +
    +
    +
    +
    + + + +
    +
    +
    +
    +
    +
    +

    Licenses

    -
    -
    -

    This page by the Free Software Foundation is licensed under a Creative Commons Attribution-ShareAlike 4.0 Unported. -

    -

    The graphics and photos used on this page have been modified by the Free Software Foundation and are licensed separately under the following terms:

    - -
    -
    - -
    - -
    - -
    - - - - - - - - - - - - - - - - - - - +
    + + + + + + + + + + + + + + + + + + + + + + + + + -- 2.25.1