From: Reda Lazri Date: Tue, 16 Aug 2016 18:15:13 +0000 (+0100) Subject: New sections, fixed issues... X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=2a0acd498cfc1daf95000a74fd4cb485c7411a0b;p=fsf-giving-guide.git New sections, fixed issues... --- diff --git a/css/master.css b/css/master.css index e526740..b210a0e 100644 --- a/css/master.css +++ b/css/master.css @@ -1,176 +1,236 @@ -/*Default Bootstrap overrides*/ - -.navbar { +/*Bootstrap overrides*/ +.navbar +{ margin-bottom: 0; + border: 0; } -.navbar-header { - background: #2CAF8F; +.navbar-header +{ border: 0; + background: #2caf8f; box-shadow: none; } -.navbar-toggle { +.navbar-toggle +{ border: 0; } -.navbar-default .navbar-toggle .icon-bar { +.navbar-default .navbar-toggle .icon-bar +{ background-color: #fff; } -.navbar-default .navbar-toggle:focus, .navbar-default .navbar-toggle:hover { +.navbar-default .navbar-toggle:focus, +.navbar-default .navbar-toggle:hover +{ background-color: transparent; } -.navbar-default .navbar-collapse, .navbar-default .navbar-form { +.navbar-default .navbar-collapse, +.navbar-default .navbar-form +{ border: 0; } -.navbar-collapse { - background: #2CAF8F; +.navbar-collapse +{ + background: #2caf8f; } -.navbar-default .navbar-nav>li>a { +.navbar-default .navbar-nav > li > a +{ color: white; } - /*Typography*/ - -@font-face { +@font-face +{ font-family: 'Signika Regular'; + src: local('Signika Regular'), url('fonts/Signika-Regular.ttf') format('truetype'); } -@font-face { +@font-face +{ font-family: 'Signika Light'; + src: local('Signika Light'), url('fonts/Signika-Light.ttf') format('truetype'); } -@font-face { +@font-face +{ font-family: 'Signika Bold'; + src: local('Signika Bold'), url('fonts/Signika-Bold.ttf') format('truetype'); } -@font-face { +@font-face +{ font-family: 'Open Sans'; + src: local('Open Sans'), url('fonts/OpenSans-Regular.ttf') format('truetype'); } -@font-face { +@font-face +{ font-family: 'Open Sans Bold'; + src: local('Open Sans Bold'), url('fonts/OpenSans-Bold.ttf') format('truetype'); } - /*Text Styles*/ - -h2 { +h2 +{ font-family: Signika-Regular; font-size: 22px; - color: #2CAF8F; + + color: #2caf8f; } -h3 { +h3 +{ font-family: Signika-Regular; font-size: 22px; - color: #333333; + + color: #333; } -h4 { +h4 +{ font-family: Signika-Light; font-size: 20px; - color: #9B9B9B; + padding-top: 20px; + + color: #9b9b9b; } -h5 { - font-family: Signika-Regular; - font-size: 19px; - color: #4A4A4A; - line-height: 20px; +h5 +{ + font-family: Signika-Regular; + font-size: 19px; + line-height: 20px; + + color: #4a4a4a; } -p, li { +li, +p +{ font-family: OpenSans; font-size: 16px; - color: #333333; + + color: #333; } -li { - margin-bottom: 20px; +li +{ + margin-bottom: 20px; } - /*Header*/ - -.intro, .intro-text { - background: #2CAF8F; +.intro, +.intro-text +{ padding-top: 20px; - padding-bottom: 0px; + padding-bottom: 0; + + background: #2caf8f; } -.illustration { +.illustration +{ padding-bottom: 60px; } -.intro-text { - background: #FFFFFF; +.intro-text +{ padding-bottom: 40px; -} -.intro p { + background: #fff; +} +.intro p +{ /*margin: 0;*/ } - /*Actions*/ - -.actions { - background: #FFFAE5; +.actions +{ padding-top: 30px; padding-bottom: 30px; + + background: #fffae5; } -.icon { +.icon +{ width: 140px; height: 140px; - background: #FFD429; -} -.share > .icon > img { - margin-top: 29%; + background: #ffd429; } - -.print > .icon > img { - margin-top: 30%; +.share > .icon > img +{ + margin-top: 29%; } - -.donate > .icon > img { - margin-top: 34%; +.print > .icon > img +{ + margin-top: 30%; +} +.donate > .icon > img +{ + margin-top: 34%; } - /*Comparisons*/ - -.good, -.bad { - padding-top: 30px; - padding-bottom: 30px; +.title +{ + padding-bottom: 8px; + margin-top: 40px; + + background-image: url('../img/underline.svg'); + background-repeat: no-repeat; + background-position: center bottom; +} +.bad, +.good +{ + padding-top: 30px; + padding-bottom: 30px; + margin-top: 30px; } - -.bad { - background-image: url('../img/bad-pattern.png'); - background-repeat: repeat; - background-size: 55px; - background-color: transparent; +.bad +{ + background-color: transparent; + background-image: url('../img/bad-pattern.png'); + background-repeat: repeat; + background-size: 50px; } - -.good li { - background-image: url(../img/good.svg); +.good li +{ + background-image: url('../img/good.svg'); } -.bad li { - background-image: url(../img/bad.svg); +.bad li +{ + background-image: url('../img/bad.svg'); } - -.good li, -.bad li { - background-repeat: no-repeat; - padding-left: 30px; - line-height: 20px; - list-style: none; +.bad li.neutral +{ + background-image: url('../img/neutral.svg'); +} +.bad ul, +.good ul +{ + padding-left: 15px; } +.bad li, +.good li +{ + line-height: 20px; -.good ul, -.bad ul { - padding-left: 15px; + padding-left: 30px; + + list-style: none; + + background-repeat: no-repeat; +} +.bad h5, +.bad img, +.good h5, +.good img +{ + margin-bottom: 25px; } +.buy +{ + /*box-shadow: 0 4px 0 0 #1D65B7;*/ + font-family: Signika-Regular; + font-size: 24px; -.buy { - background: #2B81E3; - box-shadow: 0 4px 0 0 #1D65B7; - border: 0; - border-radius: 100px; - padding: 6px 80px; + padding: 4px 50px; - font-family: Signika-Regular; - font-size: 30px; - color: #FFFFFF; + color: #fff; + border: 0; + border-radius: 100px; + background: #2b81e3; } diff --git a/givingguide.html b/givingguide.html index ec0efc8..a330148 100644 --- a/givingguide.html +++ b/givingguide.html @@ -1,150 +1,378 @@ - - - - - Ethical Tech | Giving Guide - - + + + + + Ethical Tech | Giving Guide - - + + - - + + - - - + + + + + - - - +
+ +
+
+
+ +
+
+

Are you giving your loved ones tech gifts they can use freely?

+

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. +

+
-
-

Are you giving your loved ones tech gifts they can use freely?

-

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. -

+
+
+ + +
+ +
+
+ +
+
+ print icon +
+

Print the guide

+

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

+
+
-
- -
-
-
-