From: Reda Lazri Date: Mon, 5 Sep 2016 17:36:10 +0000 (+0100) Subject: More tweaks X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=30d7c40082547824ec6b0bbe76cc7def819544e4;p=fsf-giving-guide.git More tweaks --- diff --git a/css/master.css b/css/master.css index 1870252..e1a3615 100644 --- a/css/master.css +++ b/css/master.css @@ -1,8 +1,6 @@ /*Bootstrap overrides*/ - .navbar { margin-bottom: 0; - border: 0; border-radius: 0; background: #2caf8f; @@ -25,7 +23,6 @@ .navbar-default .navbar-toggle .icon-bar { width: 40px; height: 5px; - border-radius: 6px; background-color: #ffd429; } @@ -58,145 +55,123 @@ .alert-success { background: #0AD778; + color: #E8FBF2; color: rgba(255,255,255,0.9); } .alert-info { background: #6eadf5; + color: #F1F7FE; color: rgba(255,255,255,0.9); } - /*Typography*/ @font-face { - font-family: "Open Sans"; font-weight: 400; font-style: normal; - + font-family: "Open Sans"; 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; - + font-family: "Open Sans Bold"; 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"; font-weight: 600; font-style: normal; - + font-family: "Signika Bold"; 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"; font-weight: 100; font-style: normal; - + font-family: "Signika Light"; 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"; font-weight: 400; font-style: normal; - + font-family: "Signika Regular"; src: url("../fonts/signika-regular-webfont.eot"); src: url("../fonts/signika-regular-webfont.eot?#iefix") format('embedded-opentype'), url("../fonts/signika-regular-webfont.woff2") format('woff2'), url("../fonts/signika-regular-webfont.woff") format('woff'), url("../fonts/signika-regular-webfont.ttf") format('truetype'); } - /*Text Styles*/ h1 { margin-top: 10px; margin-bottom: 20px; - color: #4B423B; - - font-family: "Signika Light"; font-size: 35px; - + font-family: "Signika Light"; } h2 { color: #4B423B; - - font-family: "Signika Light"; font-size: 28px; + font-family: "Signika Light"; } h3 { color: #333; - - font-family: "Signika Regular"; font-size: 25px; + font-family: "Signika Regular"; } h4 { padding-top: 23px; - color: #9b9b9b; - - font-family: "Signika Light"; font-size: 24px; + font-family: "Signika Light"; } h5 { - color: #4a4a4a; - - font-family: "Signika Regular"; font-size: 20px; + font-family: "Signika Regular"; } li, p { margin-bottom: 20px; - - list-style: outside; - color: #1c1c1c; - - font-family: "Open Sans"; + list-style: outside; font-size: 17px; + font-family: "Open Sans"; line-height: 30px; } li { margin-bottom: 20px; - list-style-type: disc; } a { - -webkit-transition: 0.3s all ease; - transition: 0.3s all ease; - text-decoration: none; - - color: #2caf8f; border-bottom: 2px solid #ffd429; - + color: #2caf8f; + text-decoration: none; + -webkit-transition: .3s all ease; + transition: .3s all ease; } a:hover { - text-decoration: none; - color: #0f4639; + text-decoration: none; } section { + margin-bottom: 20px; padding-top: 20px; padding-bottom: 20px; - margin-bottom: 20px; } /*Header*/ - /*Navbar*/ .icon-bar { - -webkit-transition: 0.3s all ease; - transition: 0.3s all ease; + -webkit-transition: .3s all ease; + transition: .3s all ease; } .bar2 { @@ -221,13 +196,10 @@ section { .navbar li { padding-top: 20px; - - text-align: center; - color: #9b9b9b; - - font-family: "Signika Regular"; + text-align: center; font-size: 30px; + font-family: "Signika Regular"; } .navbar-brand { @@ -237,14 +209,11 @@ section { .navbar-nav li a { border-bottom: 0; } - /*Intro*/ - .intro, .intro-text { padding-top: 20px; padding-bottom: 0; - background: #2caf8f; } @@ -254,135 +223,92 @@ section { .intro-text { padding-bottom: 40px; - background: #fff; } - /*Actions*/ .actions { padding-top: 30px; - /*padding-bottom: 30px;*/ - background: #fffae5; } .action { position: relative; - margin-bottom: 50px; } .action-button { position: relative; bottom: 10px; - margin-bottom: 30px; padding: 6px 35px; - - color: #4B423B; border: 0; border-bottom: 0; border-radius: 100px; background: #FFD429; - - font-family: "Signika Regular"; + color: #4B423B; font-size: 22px; + font-family: "Signika Regular"; } .action-button:hover { - color: white; background: #2caf8f; + color: white; } - /*Comparisons*/ - .title { margin-top: 40px; padding-bottom: 8px; - background-image: url("../img/underline.svg"); - background-repeat: no-repeat; background-position: center bottom; + background-repeat: no-repeat; } -/*.sale { - position: absolute; - top: 10px; - left: -67px; - - width: 180px; - padding: 6px 0; - - -webkit-transform: rotate(-45deg); - -moz-transform: rotate(-45deg); - -ms-transform: rotate(-45deg); - transform: rotate(-45deg); - text-align: center; - text-transform: uppercase; - - color: #fff; - background: #0AD778; - - font-size: 14px; - font-weight: 700; -}*/ - .sale { position: absolute; top: 0; left: 0; - width: 0; height: 0; - - color: #fff; border-width: 113px 113px 0 0; border-style: solid; border-color: #0AD778 transparent transparent transparent; + color: #fff; } .sale-text { position: absolute; top: -93px; left: 4px; - - -webkit-transform: rotate(-45deg); - transform: rotate(-45deg); - text-transform: uppercase; - color: white; - - font-size: 20px; + text-transform: uppercase; font-weight: bold; - + font-size: 20px; + -webkit-transform: rotate(-45deg); + transform: rotate(-45deg); } .rfy { position: absolute; top: 44px; left: -71px; - - width: 266px; padding: 10px 0; - - -webkit-transform: rotate(-45deg); - transform: rotate(-45deg); + width: 266px; + border-bottom: 0; + background: #2B81E3; + color: #fff; text-align: center; text-decoration: underline; text-transform: uppercase; - - color: #fff; - border-bottom: 0; - background: #2B81E3; - - font-size: 14px; font-weight: 700; + font-size: 14px; + -webkit-transform: rotate(-45deg); + -moz-transform: rotate(-45deg); + transform: rotate(-45deg); } .bad, .good { overflow: hidden; - margin-top: 30px; padding-top: 30px; padding-bottom: 30px; @@ -391,8 +317,8 @@ section { .bad { background-color: transparent; background-image: url("../img/bad-pattern.png"); - background-repeat: repeat; background-size: 40px; + background-repeat: repeat; } .pros li { @@ -415,32 +341,29 @@ li.neutral { .cons li, .pros li { padding-left: 30px; - - list-style: none; - background-repeat: no-repeat; + list-style: none; } .bad img, .good img { - margin-bottom: 25px; + margin-bottom: 20px; + width: 250px; + height: 250px; } .get-item { - width: 140px; margin: 0 auto 13px; padding: 4px 35px; - - text-align: center; - text-decoration: none; - - color: white; + width: 140px; border-bottom: 0; border-radius: 100px; background: #2B81E3; - - font-family: "Signika Regular"; + color: white; + text-align: center; + text-decoration: none; font-size: 24px; + font-family: "Signika Regular"; } .get-item:active, @@ -449,10 +372,9 @@ li.neutral { .rfy:active, .rfy:focus, .rfy:hover { - text-decoration: none; - - color: white; background: #6eadf5; + color: white; + text-decoration: none; } .get-item:active { @@ -461,74 +383,60 @@ li.neutral { .seller-group { padding: 10px; - text-align: center; } .seller { display: inline-block; - text-align: center; } - /*Recommended Lines*/ - .recommended-section { padding-top: 30px; padding-bottom: 30px; } - -/*.recommended-img { - position: relative; -} - -.recommended-img > img { - position: absolute; - top: 50%; - left: 50%; - -webkit-transform: translate(-50%, -50%); - transform: translate(-50%, -50%); -}*/ - /*Charities*/ - .charities { - background-color: #E4F5F1; margin-bottom: 0; + background-color: #E4F5F1; } .charities img { - -webkit-transition: 0.3s all ease; - transition: 0.3s all ease; + -webkit-filter: brightness(0.5) opacity(0.5) grayscale(1); + filter: brightness(0.5) opacity(0.5) grayscale(1); + -webkit-transition: .3s all ease; + -moz-transition: .3s all ease; + transition: .3s all ease; + + -moz-filter: brightness(0.5) opacity(0.5) grayscale(1); } .charities img:hover { + -webkit-filter: brightness(1) opacity(1) grayscale(0); + filter: brightness(1) opacity(1) grayscale(0); -webkit-transform: scale(1.1); + -moz-transform: scale(1.1); transform: scale(1.1); } - /*Licenses*/ - .licenses { - background-color: #fffae5; margin-bottom: 0; + background-color: #fffae5; } .licenses .panel-default .panel-heading { - background-color: #fffae5; border: 0; + background-color: #fffae5; box-shadow: 0 0 0 transparent; } .fix-margin { margin: 0; } - /*Footer*/ footer { padding-top: 30px; padding-bottom: 30px; - background-color: #4B423B; } @@ -548,40 +456,33 @@ footer a:hover { .footer-logo { margin-bottom: 15px; + max-height: 220px; } - /* Media Queries */ - /* Small devices (tablets, 768px and up) */ @media (min-width: 768px) { /*Navbar*/ .navbar-nav { float: right; - margin: 10px; /*margin-left: 100px;*/ } .navbar-default .navbar-nav > li > a { padding: 7px; - color: #2caf8f; } .navbar li { padding: 0 25px; - - list-style-type: none; - - -webkit-transition: 0.3s all ease; - transition: 0.3s all ease; - border-right: 1px #9BD2BF solid; background-color: white; - - font-family: "Signika Regular"; + list-style-type: none; font-size: 1.1em; - + font-family: "Signika Regular"; + -webkit-transition: .3s all ease; + -moz-transition: .3s all ease; + transition: .3s all ease; } .navbar li:first-child { @@ -599,11 +500,10 @@ footer a:hover { .navbar li a { display: block; - - -webkit-transition: 0.3s all ease; - transition: 0.3s all ease; text-decoration: none; - + -webkit-transition: .3s all ease; + -moz-transition: .3s all ease; + transition: .3s all ease; } .navbar li a:hover { @@ -623,31 +523,11 @@ footer a:hover { } .footer-logo img { - width: 80%; - } - - /*Fixes*/ - /*This sections fixes the inevitable difference in height of the comparison panes with margin-top where a simpler isn't possible*/ - /*.fix-iphone { - margin-top: 15px; - } - - .fix-macbook { - margin-top: 90px; + width: 85%; } - - .fix-amazon, - .fix-router { - margin-top: 100px; - } - - .fix-itunes { - margin-top: 50px; - }*/ } /* Medium devices (desktops, 992px and up) */ @media (min-width: 992px) { - /*Navbar*/ .navbar-nav { margin: 10px 10px 10px 100px; @@ -655,24 +535,19 @@ footer a:hover { .navbar-default .navbar-nav > li > a { padding: 7px; - color: #2caf8f; } .navbar li { padding: 0 30px; - - list-style-type: none; - - -webkit-transition: 0.3s all ease; - transition: 0.3s all ease; - border-right: 1px #9BD2BF solid; background-color: white; - - font-family: "Signika Regular"; + list-style-type: none; font-size: 1em; - + font-family: "Signika Regular"; + -webkit-transition: .3s all ease; + -moz-transition: .3s all ease; + transition: .3s all ease; } .navbar li:first-child { @@ -690,11 +565,10 @@ footer a:hover { .navbar li a { display: block; - - -webkit-transition: 0.3s all ease; - transition: 0.3s all ease; text-decoration: none; - + -webkit-transition: .3s all ease; + -moz-transition: .3s all ease; + transition: .3s all ease; } .navbar li:hover a { @@ -706,12 +580,10 @@ footer a:hover { } .join img { - width: 200px; margin: 10px; + width: 200px; } - /*Intro*/ - .intro { margin-bottom: 0; } @@ -722,9 +594,8 @@ footer a:hover { .intro-text h1 { margin-top: 0; - + color: white; color: rgba(255, 255, 255, 0.95); - } .intro-text p { @@ -733,45 +604,22 @@ footer a:hover { .intro-text h4 { color: #FFDD55; - font-family: "Signika Light"; } .illustration img { - width: 90%; margin-top: 30px; - + width: 90%; } /*Footer*/ .footer-logo img { width: 50%; } - - /*Fixes*/ - /*This sections fixes the inevitable difference in height of the comparison panes with margin-top where a simpler isn't possible*/ - /*.fix-iphone { - margin-top: 15px; - } - - .fix-macbook { - margin-top: 90px; - } - - .fix-amazon, - .fix-router { - margin-top: 100px; - } - - .fix-itunes { - margin-top: 50px; - } */ } - /* Large devices (large desktops, 1200px and up) */ @media (min-width: 1200px) { .illustration img { - width: 70%; margin-top: 10px; - + width: 70%; } } diff --git a/givingguide.html b/givingguide.html index 28a715e..fa7b7f4 100644 --- a/givingguide.html +++ b/givingguide.html @@ -143,7 +143,7 @@ RFY-Certified - replicant phone + replicant phone
Tehnoetic S2 with Replicant
@@ -159,7 +159,9 @@ - +