From: Reda Lazri Date: Fri, 26 Aug 2016 10:17:53 +0000 (+0100) Subject: More fixes and improvements X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=d62dee6fffb358924acc41d9855c2188f076edb5;p=fsf-giving-guide.git More fixes and improvements --- diff --git a/css/master.css b/css/master.css index fb47bf4..ca937ec 100644 --- a/css/master.css +++ b/css/master.css @@ -139,7 +139,6 @@ h5 { font-family: "Signika Regular"; font-size: 20px; - line-height: 20px; } li, @@ -162,6 +161,7 @@ li { } a { + -webkit-transition: 0.3s all ease; transition: 0.3s all ease; text-decoration: none; @@ -179,6 +179,28 @@ a:hover { /*Header*/ /*Navbar*/ +.icon-bar{ + -webkit-transition: 0.3s all ease; + transition: 0.3s all ease; +} +.bar2 { + width: 30px !important; +} + +.bar3 { + width: 25px !important; +} + +.navbar-toggle:hover .bar1 { + width: 42px !important; +} + +.navbar-toggle:hover .bar2 { + width: 25px !important; +} +.navbar-toggle:hover .bar3 { + width: 15px !important; +} .navbar li { padding-top: 20px; @@ -198,9 +220,8 @@ a:hover { .navbar-nav li a { border-bottom: 0; } -/*.intro { - min-height: 100%; -}*/ + +/*Intro*/ .intro, .intro-text { @@ -223,18 +244,23 @@ a:hover { /*Actions*/ .actions { padding-top: 30px; - padding-bottom: 30px; + /*padding-bottom: 30px;*/ background: #fffae5; } .action { + position: relative; + margin-bottom: 50px; } .action-button { + position: relative; + bottom: 10px; + margin-bottom: 30px; - padding: 6px 45px; + padding: 6px 35px; color: #4B423B; border: 0; @@ -261,6 +287,40 @@ a:hover { background-position: center bottom; } +.sale { + position: absolute; + z-index: -999; + top: 0; + + width: 0; + height: 0; + + text-overflow: clip; + + border-width: 100px 100px 0 0; + border-style: solid; + border-color: #2caf8f transparent transparent transparent; + + line-height: 0px; + +} + +.sale-text P { + position: absolute; + top: 18px; + left: 23px; + + -webkit-transform: rotate(-45deg); + transform: rotate(-45deg); + text-transform: uppercase; + + color: white; + + font-size: 20px; + font-weight: bold; + +} + .bad, .good { margin-top: 30px; @@ -307,8 +367,8 @@ a:hover { } .get-item { - border-bottom: 0; color: white; + border-bottom: 0; } /*Charities*/ @@ -318,11 +378,13 @@ a:hover { } .charities img { + -webkit-transition: 0.3s all ease; transition: 0.3s all ease; } .charities img:hover { - transform: scale(1.2); + -webkit-transform: scale(1.2); + transform: scale(1.2); } /*Licenses*/ @@ -369,6 +431,7 @@ footer p { list-style-type: none; + -webkit-transition: 0.3s all ease; transition: 0.3s all ease; border-right: 1px #9BD2BF solid; @@ -395,6 +458,7 @@ footer p { .navbar li a { display: block; + -webkit-transition: 0.3s all ease; transition: 0.3s all ease; text-decoration: none; @@ -435,6 +499,7 @@ footer p { list-style-type: none; + -webkit-transition: 0.3s all ease; transition: 0.3s all ease; border-right: 1px #9BD2BF solid; @@ -461,6 +526,7 @@ footer p { .navbar li a { display: block; + -webkit-transition: 0.3s all ease; transition: 0.3s all ease; text-decoration: none; diff --git a/givingguide.html b/givingguide.html index 82b4ee9..46eb9bd 100644 --- a/givingguide.html +++ b/givingguide.html @@ -34,11 +34,11 @@
- FSF + FSF
@@ -100,7 +100,7 @@

Organize

- Like this guide? Download the printable version and organize a Giving Guide Giveaway to share it with your community. + Download the printable version and organize a Giving Guide Giveaway to share it with your community.

Print the guide
@@ -130,9 +130,20 @@

Smartphones

- replicant phone - Sale + + +
+

+ Sale! +

+
+
+
+ + + replicant phone
Tehnoetic S2 with Replicant
+ BUY
  • Fully free software, based on Android.
    • @@ -144,7 +155,7 @@
    - iphone + iphone
    iPhone
    • Comes with no shortage of spyware.
      • @@ -167,7 +178,7 @@

      Full-sized Laptops

      - t400 + t400
      Minifree T400 with GNU/Linux
      • As free as can be: runs the FSF-endorsed Trisquel operating system and libreboot firmware on hardware that is certified to Respect Your Freedom.
        • @@ -179,7 +190,7 @@
        - macbook + macbook
        Apple Macbook Pro with macOS
        • Runs on proprietary software that restricts the user's freedoms.
          • @@ -200,7 +211,7 @@

          Compact Laptops

          - replicant phone + replicant phone
          Libiquity Taurinus X200 with GNU/Linux
          • As free as can be: runs the FSF-endorsed Trisquel operating system and libreboot firmware on hardware that is certified to Respect Your Freedom.
            • @@ -212,7 +223,7 @@
            - lenovo + lenovo
            Lenovo U31 with Windows
            • Runs on proprietary software that profits from treating the user as a product -- each account is assigned an advertising ID to help Microsoft sell user @@ -233,7 +244,7 @@

              3D Printers

              - replicant phone + replicant phone
              Lulzbot Mini
              • Respects Your Freedom-certified by the FSF to run with all free software, making 3D printing more accessible and encouraging innovation.
                • @@ -245,7 +256,7 @@
                - printer + printer
                Makerbot Replicator Mini
                • @@ -268,7 +279,7 @@

                  Wi-Fi Routers

                  - replicant phone + replicant phone
                  ThinkPenguin Router
                  • @@ -281,7 +292,7 @@
                    - printer + printer
                    ISP-provided Routers
                    • @@ -303,7 +314,7 @@

                      eBooks

                      - replicant phone + replicant phone
                      Project Gutenberg
                      • All of the ebooks are gratis, including classics like Peter Pan and Huck Finn.
                        • @@ -314,7 +325,7 @@
                        - printer + printer
                        Amazon.com
                        • @@ -341,7 +352,7 @@

                          Graphic Design

                          - GIMP and Inskacape + GIMP and Inskacape
                          GIMP and Inkscape
                          • Free software, with thriving developer communities.
                            • @@ -354,7 +365,7 @@
                            - printer + printer
                            Photoshop and Illustrator
                            • Proprietary software controlled by Adobe.
                              • @@ -373,7 +384,7 @@

                              Gift Cards

                              - replicant phone + replicant phone
                              FSF Membership Card
                              • Join over 3,500 active members working to make a better world built on free software.
                                • @@ -385,8 +396,8 @@
                                - printer -
                                iTunes Cards
                                + printer +
                                iTunes Cards
                                • DRM on everything (except music) controls what you can do with your purchases.
                                  • @@ -489,7 +500,7 @@
                                  -
                                  +

                                  Licenses

                                  @@ -528,7 +539,7 @@

                                  The FSF is a nonprofit with a worldwide mission to advance software freedom — diff --git a/img/charities/sflc.jpg b/img/charities/sflc.jpg index fba5b12..b4bb68a 100644 Binary files a/img/charities/sflc.jpg and b/img/charities/sflc.jpg differ