From: Zak Rogoff Date: Thu, 12 Jan 2017 18:03:37 +0000 (-0500) Subject: Adding convertible laptop/tablets. X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=efc4efe8c5d8183f5077e143714ea65d8bf076ee;p=fsf-giving-guide.git Adding convertible laptop/tablets. --- diff --git a/v7/Guidelines.md b/v7/Guidelines.md deleted file mode 100644 index 48b652c..0000000 --- a/v7/Guidelines.md +++ /dev/null @@ -1,32 +0,0 @@ -# Guidelines for future use ---- -## Images: - -* If it's a logo then ALWAYS export the images from its VECTOR (.svg, .eps, .pdf) source. If a vector source isn't available, use a very large image and scale it down. - -* 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) - -* Charities' logos should be exported to 580px × 580px, transparent PNG - -* Products' images, "good" or "naughty" should be put inside transparent, square PNG files at 350px × 350px, and a padding consistent with existing images. - -## BUY/GET button - -* Copy the entire block of code including the two lines for comments before and after the Divs. - -* Paste it just after the **h5** line. - -* Append a unique string to the `id` `href` `aria-controls` of the **a** elements, as well as the `id` of the next div and the content of `document.getElementById('...')` so that all have the same text. Example: `get-iem-smartphone` `get-item-compact` ... - -* Change the content of the Anchor link **a** and its `href` attributes to link to different sellers. - -* If the product has only one source use this code instead: - -`BUY` - - -## General Best Practices - -* Resist the urge to add another list-element **li** to announce a SALE, a BONUS, or anything unrelated to being a PROS or CONS. Instead use the SALE triangle, and Bootstrap's *alert* (Check its documentation, or existing code if unsure) - -* Avoid using very long titles as they tend to wrap into multiple lines on mobile devices. Be concise. diff --git a/v7/README.md b/v7/README.md index b7478d3..dc090ea 100644 --- a/v7/README.md +++ b/v7/README.md @@ -12,3 +12,37 @@ run `make` at the root of the source tree, then visit `localhost:8000`. The `Makefile` relies on Python for starting the development web server, but it's trivial to serve the page using the web server of your preference if you do not have Python. + + +# Guidelines for future use +--- +## Images: + +* If it's a logo then ALWAYS export the images from its VECTOR (.svg, .eps, .pdf) source. If a vector source isn't available, use a very large image and scale it down. + +* 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) + +* Charities' logos should be exported to 580px × 580px, transparent PNG + +* Products' images, "good" or "naughty" should be put inside transparent, square PNG files at 350px × 350px, and a padding consistent with existing images. + +## BUY/GET button + +* Copy the entire block of code including the two lines for comments before and after the Divs. + +* Paste it just after the **h5** line. + +* Append a unique string to the `id` `href` `aria-controls` of the **a** elements, as well as the `id` of the next div and the content of `document.getElementById('...')` so that all have the same text. Example: `get-iem-smartphone` `get-item-compact` ... + +* Change the content of the Anchor link **a** and its `href` attributes to link to different sellers. + +* If the product has only one source use this code instead: + +`BUY` + + +## General Best Practices + +* Resist the urge to add another list-element **li** to announce a SALE, a BONUS, or anything unrelated to being a PROS or CONS. Instead use the SALE triangle, and Bootstrap's *alert* (Check its documentation, or existing code if unsure) + +* Avoid using very long titles as they tend to wrap into multiple lines on mobile devices. Be concise. diff --git a/v7/givingguide.html b/v7/givingguide.html index 8f7fd32..7ba059e 100644 --- a/v7/givingguide.html +++ b/v7/givingguide.html @@ -323,6 +323,7 @@ Many of these items are

Compact Laptops

@@ -558,6 +559,74 @@ Many of these items are +

Convertible Laptops/Tablets

+
+
+ Technoethical convertible tablet laptop +
X200t with GNU/Linux
+ + + +
+
+

+ Get it from +

+ + Technoethical +

+ Sale details. +

+
+
+ + + + +
    +
  • Runs the FSF-endorsed Trisquel operating system with libreboot firmware.
    • +
  • Durable hardware is meant to last and is easy to repair.
    • +
  • Created by a small business that replaces all restrictive components from a stock laptop.
    • +
+ +
+ + +
+ lenovo +
Microsoft Surface
+ +
+ +
+ + + +
diff --git a/v7/img/products/microsoft-surface-blocked.png b/v7/img/products/microsoft-surface-blocked.png new file mode 100644 index 0000000..8cc012d Binary files /dev/null and b/v7/img/products/microsoft-surface-blocked.png differ diff --git a/v7/img/products/microsoft-surface-blocked.xcf b/v7/img/products/microsoft-surface-blocked.xcf new file mode 100644 index 0000000..3eab340 Binary files /dev/null and b/v7/img/products/microsoft-surface-blocked.xcf differ diff --git a/v7/img/products/technoethical-x200t.png b/v7/img/products/technoethical-x200t.png new file mode 100644 index 0000000..bfd9d3a Binary files /dev/null and b/v7/img/products/technoethical-x200t.png differ diff --git a/v7/img/products/technoethical-x200t.xcf b/v7/img/products/technoethical-x200t.xcf new file mode 100644 index 0000000..026bb81 Binary files /dev/null and b/v7/img/products/technoethical-x200t.xcf differ