From c862406bbbce39d2213da67343420cdc6bafff84 Mon Sep 17 00:00:00 2001 From: Reda Lazri Date: Mon, 5 Sep 2016 17:35:38 +0100 Subject: [PATCH] Better logos and everything! --- css/master.css | 55 ++++++++++++++++++------------- givingguide.html | 42 +++++++++++------------ img/FSF_footer.png | Bin 5482 -> 0 bytes img/charities/cc.jpg | Bin 33814 -> 0 bytes img/charities/cc.png | Bin 0 -> 29716 bytes img/charities/ceata.jpg | Bin 31673 -> 0 bytes img/charities/ceata.png | Bin 0 -> 39369 bytes img/charities/eff.jpg | Bin 32934 -> 0 bytes img/charities/eff.png | Bin 0 -> 29895 bytes img/charities/fsf.jpg | Bin 25912 -> 0 bytes img/charities/fsf.png | Bin 0 -> 21386 bytes img/charities/gnome.jpg | Bin 19682 -> 0 bytes img/charities/gnome.png | Bin 0 -> 22467 bytes img/charities/sfc.jpg | Bin 49091 -> 0 bytes img/charities/sfc.png | Bin 0 -> 54766 bytes img/charities/sflc.jpg | Bin 35614 -> 0 bytes img/charities/sflc.png | Bin 0 -> 60394 bytes img/charities/wikimedia.jpg | Bin 48395 -> 0 bytes img/charities/wikimedia.png | Bin 0 -> 46702 bytes img/fsf-footer.png | Bin 0 -> 23414 bytes img/products/adobe-blocked.png | Bin 26913 -> 32526 bytes img/products/amazon-blocked.png | Bin 13771 -> 14272 bytes img/products/iphone-blocked.png | Bin 3749 -> 11700 bytes img/products/itunes-blocked.png | Bin 46008 -> 57494 bytes img/products/lenovo-blocked.png | Bin 39608 -> 75172 bytes img/products/macbook-blocked.png | Bin 12501 -> 32454 bytes img/products/printer-blocked.png | Bin 26717 -> 40157 bytes img/products/router-blocked.png | Bin 35321 -> 33591 bytes 28 files changed, 54 insertions(+), 43 deletions(-) delete mode 100644 img/FSF_footer.png delete mode 100644 img/charities/cc.jpg create mode 100644 img/charities/cc.png delete mode 100644 img/charities/ceata.jpg create mode 100644 img/charities/ceata.png delete mode 100644 img/charities/eff.jpg create mode 100644 img/charities/eff.png delete mode 100644 img/charities/fsf.jpg create mode 100644 img/charities/fsf.png delete mode 100644 img/charities/gnome.jpg create mode 100644 img/charities/gnome.png delete mode 100644 img/charities/sfc.jpg create mode 100644 img/charities/sfc.png delete mode 100644 img/charities/sflc.jpg create mode 100644 img/charities/sflc.png delete mode 100644 img/charities/wikimedia.jpg create mode 100644 img/charities/wikimedia.png create mode 100644 img/fsf-footer.png diff --git a/css/master.css b/css/master.css index 4c99f7d..1870252 100644 --- a/css/master.css +++ b/css/master.css @@ -67,15 +67,6 @@ } /*Typography*/ -@font-face { - font-family: "Open Sans Bold"; - font-weight: bold; - font-style: normal; - - src: url("../fonts/opensans-bold-webfont.eot"); - src: url("../fonts/opensans-bold-webfont.eot?#iefix") format('embedded-opentype'), url("../fonts/opensans-bold-webfont.woff2") format('woff2'), url("../fonts/opensans-bold-webfont.woff") format('woff'), url("../fonts/opensans-bold-webfont.ttf") format('truetype'); - -} @font-face { font-family: "Open Sans"; font-weight: 400; @@ -83,7 +74,14 @@ src: url("../fonts/opensans-regular-webfont.eot"); src: url("../fonts/opensans-regular-webfont.eot?#iefix") format('embedded-opentype'), url("../fonts/opensans-regular-webfont.woff2") format('woff2'), url("../fonts/opensans-regular-webfont.woff") format('woff'), url("../fonts/opensans-regular-webfont.ttf") format('truetype'); +} +@font-face { + font-family: "Open Sans Bold"; + font-weight: 700; + font-style: normal; + src: url("../fonts/opensans-bold-webfont.eot"); + src: url("../fonts/opensans-bold-webfont.eot?#iefix") format('embedded-opentype'), url("../fonts/opensans-bold-webfont.woff2") format('woff2'), url("../fonts/opensans-bold-webfont.woff") format('woff'), url("../fonts/opensans-bold-webfont.ttf") format('truetype'); } @font-face { font-family: "Signika Bold"; @@ -92,7 +90,6 @@ src: url("../fonts/signika-bold-webfont.eot"); src: url("../fonts/signika-bold-webfont.eot?#iefix") format('embedded-opentype'), url("../fonts/signika-bold-webfont.woff2") format('woff2'), url("../fonts/signika-bold-webfont.woff") format('woff'), url("../fonts/signika-bold-webfont.ttf") format('truetype'); - } @font-face { font-family: "Signika Light"; @@ -101,7 +98,6 @@ src: url("../fonts/signika-light-webfont.eot"); src: url("../fonts/signika-light-webfont.eot?#iefix") format('embedded-opentype'), url("../fonts/signika-light-webfont.woff2") format('woff2'), url("../fonts/signika-light-webfont.woff") format('woff'), url("../fonts/signika-light-webfont.ttf") format('truetype'); - } @font-face { font-family: "Signika Regular"; @@ -117,7 +113,7 @@ h1 { margin-top: 10px; margin-bottom: 20px; - color: #2caf8f; + color: #4B423B; font-family: "Signika Light"; font-size: 35px; @@ -148,7 +144,6 @@ h4 { } h5 { - margin-bottom: 25px; color: #4a4a4a; @@ -192,6 +187,8 @@ a:hover { } section { + padding-top: 20px; + padding-bottom: 20px; margin-bottom: 20px; } /*Header*/ @@ -496,8 +493,8 @@ li.neutral { /*Charities*/ .charities { - /*padding-top: 30px;*/ - padding-bottom: 50px; + background-color: #E4F5F1; + margin-bottom: 0; } .charities img { @@ -512,8 +509,12 @@ li.neutral { /*Licenses*/ -.licenses .well, -.licenses .panel-default .panel-heading { +.licenses { + background-color: #fffae5; + margin-bottom: 0; +} + +.licenses .panel-default .panel-heading { background-color: #fffae5; border: 0; box-shadow: 0 0 0 transparent; @@ -528,11 +529,21 @@ footer { padding-top: 30px; padding-bottom: 30px; - background-color: #1a1a1a; + background-color: #4B423B; } footer p { color: white; + color: rgba(255,255,255,0.72); +} + +footer a { + color: #FFD429; + font-weight: 700; +} + +footer a:hover { + color: white; } .footer-logo { @@ -617,7 +628,7 @@ footer p { /*Fixes*/ /*This sections fixes the inevitable difference in height of the comparison panes with margin-top where a simpler isn't possible*/ - .fix-iphone { + /*.fix-iphone { margin-top: 15px; } @@ -632,7 +643,7 @@ footer p { .fix-itunes { margin-top: 50px; - } + }*/ } /* Medium devices (desktops, 992px and up) */ @media (min-width: 992px) { @@ -738,7 +749,7 @@ footer p { /*Fixes*/ /*This sections fixes the inevitable difference in height of the comparison panes with margin-top where a simpler isn't possible*/ - .fix-iphone { + /*.fix-iphone { margin-top: 15px; } @@ -753,7 +764,7 @@ footer p { .fix-itunes { margin-top: 50px; - } + } */ } /* Large devices (large desktops, 1200px and up) */ diff --git a/givingguide.html b/givingguide.html index 45c2b73..28a715e 100644 --- a/givingguide.html +++ b/givingguide.html @@ -38,7 +38,7 @@ - FSF + FSF @@ -46,10 +46,10 @@ @@ -181,7 +181,7 @@
- iphone + iphone
iPhone
@@ -545,7 +545,7 @@
-
+

Licenses

@@ -583,10 +583,10 @@