From de88f3829b2036d065b9841469b3b3c3c7dd70d9 Mon Sep 17 00:00:00 2001
From: Reda Lazri <the.red.shortcut@gmail.com>
Date: Wed, 17 Aug 2016 19:10:29 +0100
Subject: [PATCH] More work
---
css/master.css | 12 +++++++++++-
givingguide.html | 49 +++++++++++++++++++++++++++++++++++++++++++-----
2 files changed, 55 insertions(+), 6 deletions(-)
diff --git a/css/master.css b/css/master.css
index f2d0e67..fc7b757 100644
--- a/css/master.css
+++ b/css/master.css
@@ -89,11 +89,20 @@ p {
font-family: OpenSans;
font-size: 16px;
color: #333;
+ line-height: 30px;
}
li {
margin-bottom: 20px;
}
+
+a {
+ padding: 1px 4px;
+ /*border-radius: 4px;*/
+ color: #2caf8f;
+ /*background: white;*/
+}
+
/*Header*/
.intro,
.intro-text {
@@ -180,7 +189,7 @@ li {
.bad li,
.good li {
- line-height: 20px;
+ line-height: 19px;
padding-left: 30px;
list-style: none;
background-repeat: no-repeat;
@@ -195,6 +204,7 @@ li {
/*box-shadow: 0 4px 0 0 #1D65B7;*/
font-family: Signika-Regular;
font-size: 24px;
+ text-transform: uppercase;
padding: 4px 50px;
color: #fff;
border: 0;
diff --git a/givingguide.html b/givingguide.html
index d77057a..d5c3501 100644
--- a/givingguide.html
+++ b/givingguide.html
@@ -55,8 +55,9 @@
</div>
<!-- /.container-fluid -->
</nav>
+
+ <!--Begin Intro-->
<div class="intro">
- <!--Begin Intro-->
<div class="container">
<div class="row">
<div class="illustration col-md-6">
@@ -79,8 +80,8 @@
</div>
<!--End Intro-->
+ <!--Begin Actions-->
<div class="actions">
- <!--Begin Actions-->
<div class="container">
<div class="row">
<div class="share col-md-4 text-center">
@@ -115,8 +116,9 @@
</div>
<!--End Actions-->
+ <!--Begin Comparisons-->
<div class="comparisons">
- <!--Begin Comparisons-->
+
<!--Smartphones-->
<div class="container">
<h3 class="title text-center">Smartphones</h3>
@@ -379,8 +381,7 @@
<img src="img/products/itunes-blocked.png" alt="printer" class="center-block" height="150px" />
<h5 class="text-center">iTunes Cards</h5></h5>
<ul>
- <li> <a href="http://www.defectivebydesign.org/what_is_drm_digital_restrictions_management">DRM</a>
- on everything (except music) controls what you can do with your purchases.
+ <li> <a href="http://www.defectivebydesign.org/what_is_drm_digital_restrictions_management">DRM</a> on everything (except music) controls what you can do with your purchases.
</li>
<li> Apple claims (wrongly) that you don't actually own anything you buy from the iTunes store.</li>
@@ -396,6 +397,44 @@
</div>
<!--End comparisons-->
+ <!--More certified products-->
+ <div class="certified">
+ <div class="container">
+ <h1>More Products Certified to Respect Your Freedom</h1>
+ <div class="row">
+ <!-- Begin Certified -->
+ <div class="col-md-4">
+ <img src="https://static.fsf.org/nosvn/images/tehnoetic_adapter.png" alt="" class="center-block" />
+ <h5 class="text-center">Tehnoetic Mini Wi-Fi Adapter</h5>
+ <p>
+ Great for all-free-software installations on laptops with incompatible Wi-Fi hardware.
+ </p>
+ </div>
+
+ <div class="col-md-4">
+ <img src="https://static.fsf.org/nosvn/images/givingguide/images/thinkpenguin-mini-router.png" alt="" class="center-block" />
+ <h5 class="text-center">ThinkPenguin VPN Router</h5>
+ <p>
+ Designed to complement your existing router by providing an easy-to-set up VPN that enhances privacy and security and circumvents network controls.
+ </p>
+ </div>
+
+ <div class="col-md-4">
+ <img src="https://static.fsf.org/nosvn/images/givingguide/images/thinkpenguin-long-range-adapter.png" alt="" class="center-block img-responsive" />
+ <h5 class="text-center">ThinkPenguin Long-Range Wi-Fi Adapter</h5>
+ <p>
+ More powerful than its smaller cousin, and can be further upgraded with a larger antenna.
+ </p>
+ </div>
+ <!-- End Certified -->
+ </p>
+ </div>
+ <!-- End Row -->
+ </div>
+ <p class="alert alert-success"> If you have ideas for more gifts that can be given freely, submit your recommendations to our <a href="http://libreplanet.org/wiki/Group:Giving_Guide_Suggestions">growing page</a>.
+ <!--End Container-->
+ </div>
+
<!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
<script src="js/jquery-2.2.2.min.js" charset="utf-8"></script>
<!-- Include all compiled plugins (below), or include individual files as needed -->
--
2.25.1