betterplace-content 0.7.86 → 0.7.91

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c8bfeec1049cb6bf10a3bae797946ae96af2b7c1f1a848082a305b0fd260a77
-  data.tar.gz: b8b552234251ecaab8e7292c7d4434ded87382bf777e7ace05b4e286e044b9d3
+  metadata.gz: 0360f05b1fbfaca2f1bc916c88810622730c778fb79efb33b5bf0707d7c1eae6
+  data.tar.gz: 9d5f87aa764a80820d8e2332cddc3779029c8e32c825dc372064f73b24831e33
 SHA512:
-  metadata.gz: 2c610ed2f8b86fb050658e7135e44aff32c01db9bf7fa12d38bd9690ff749222eaf530b3c92cd94e87b8361b934a13c85e55b388b8ac606e548fd9e9c35152c1
-  data.tar.gz: f6b0bd8ba3c90965ba2f5fc8ef244a771bbae42947c80aaec96720f4e4ccd47f1dcae5773d201d25bea8cb1b1a7f5a5ac695eb9f0f6b6b081975a1ab82e28a69
+  metadata.gz: 3f24b187b1f6e24833fdcd13d2460ee561ccfd56f14c06d4d4a1cc6f96529de551b1bd95bd1c1ac9753c446eb2888751895487c70e4c7ce527f0b7df9d33d11f
+  data.tar.gz: 8766f2f9fbc392962dcf79f7f99d25a1145bd292c3f10a6182d4381f045501d877a1f19959706cbad35591934e1db77ee607f197be3db456bd511c174a19c88a

data/_includes/header-de.html

@@ -1 +1 @@
-<header><div class="header-logo"><a onclick="gaEvent(&#39;navigation header&#39;, &#39;click /de&#39;)" class="logo" href="https://www.betterplace.org/de"><img class="logo-full" alt="betterplace.org (Logo)" src="https://betterplace-assets.betterplace.org/assets/logos/layout-logo-d467733fb66cce20fecaf168956b759058116995fd5cc76f82e679acc0a0d54c.svg" /><img class="logo-compact" alt="betterplace.org (Logo)" src="https://betterplace-assets.betterplace.org/assets/logos/layout-logo-compact-c31a5daedfb45394a9fe63e271dc27ef75248a67aae3dece9eca21afc4082a22.svg" /></a></div><div class="header-claim">Deutschlands größte Spendenplattform</div><div class="header-search"><div data-search-url="https://www.betterplace.org/de/homepage/search" id="header-search-mountpoint"><i class="fa fa-search header-search-icon"></i></div></div><div class="header-login generic-header-login"><div data-login-check-url="https://www.betterplace.org/de/layouts/login_check" data-login-url="https://www.betterplace.org/de/users/sign_in?return_to={{site.baseurl}}" id="header-login-mountpoint"><span class="header-login-icon"><i class="fas fa-user fa-fw"></i></span><span class="header-login-label"><a href="https://www.betterplace.org/de/users/sign_in?return_to={{site.baseurl}}">Anmelden</a></span></div></div><div class="header-links"><ul class="header-list list-unstyled"><li class="header-item"><a onclick="gaEvent(&#39;navigation header&#39;, &#39;click /de/discover&#39;)" class="header-link" href="https://www.betterplace.org/de/discover">Entdecken</a></li><li class="header-item"><a onclick="gaEvent(&#39;navigation header&#39;, &#39;click /c/spenden-sammeln&#39;)" class="header-link" href="https://www.betterplace.org/c/spenden-sammeln">Spenden sammeln</a></li><li class="header-item"><a onclick="gaEvent(&#39;navigation header&#39;, &#39;click /c/ueber-uns&#39;)" class="header-link" href="/c/ueber-uns">Über uns</a></li></ul></div></header>
+<header><div class="header-logo"><a onclick="gaEvent(&#39;navigation header&#39;, &#39;click /de&#39;)" class="logo" href="https://www.betterplace.org/de"><img class="logo-full" alt="betterplace.org (Logo)" height="30" src="https://betterplace-assets.betterplace.org/assets/logos/layout-logo-d467733fb66cce20fecaf168956b759058116995fd5cc76f82e679acc0a0d54c.svg" /><img class="logo-compact" alt="betterplace.org (Logo)" height="30" src="https://betterplace-assets.betterplace.org/assets/logos/layout-logo-compact-c31a5daedfb45394a9fe63e271dc27ef75248a67aae3dece9eca21afc4082a22.svg" /></a></div><div class="header-claim">Deutschlands größte Spendenplattform</div><div class="header-search"><div data-search-url="https://www.betterplace.org/de/homepage/search" id="header-search-mountpoint"><i class="fa fa-search header-search-icon"></i></div></div><div class="header-login generic-header-login"><div data-login-check-url="https://www.betterplace.org/de/layouts/login_check" data-login-url="https://www.betterplace.org/de/users/sign_in?return_to={{site.baseurl}}" id="header-login-mountpoint"><span class="header-login-icon"><i class="fas fa-user fa-fw"></i></span><span class="header-login-label"><a href="https://www.betterplace.org/de/users/sign_in?return_to={{site.baseurl}}">Anmelden</a></span></div></div><div class="header-links"><ul class="header-list list-unstyled"><li class="header-item"><a onclick="gaEvent(&#39;navigation header&#39;, &#39;click /de/discover&#39;)" class="header-link" href="https://www.betterplace.org/de/discover">Entdecken</a></li><li class="header-item"><a onclick="gaEvent(&#39;navigation header&#39;, &#39;click /c/spenden-sammeln&#39;)" class="header-link" href="https://www.betterplace.org/c/spenden-sammeln">Spenden sammeln</a></li><li class="header-item"><a onclick="gaEvent(&#39;navigation header&#39;, &#39;click /c/ueber-uns&#39;)" class="header-link" href="/c/ueber-uns">Über uns</a></li></ul></div></header>

data/_includes/header-en.html

@@ -1 +1 @@
-<header><div class="header-logo"><a onclick="gaEvent(&#39;navigation header&#39;, &#39;click /en&#39;)" class="logo" href="https://www.betterplace.org/en"><img class="logo-full" alt="betterplace.org (Logo)" src="https://betterplace-assets.betterplace.org/assets/logos/layout-logo-d467733fb66cce20fecaf168956b759058116995fd5cc76f82e679acc0a0d54c.svg" /><img class="logo-compact" alt="betterplace.org (Logo)" src="https://betterplace-assets.betterplace.org/assets/logos/layout-logo-compact-c31a5daedfb45394a9fe63e271dc27ef75248a67aae3dece9eca21afc4082a22.svg" /></a></div><div class="header-claim">Change the world with your donation</div><div class="header-search"><div data-search-url="https://www.betterplace.org/en/homepage/search" id="header-search-mountpoint"><i class="fa fa-search header-search-icon"></i></div></div><div class="header-login generic-header-login"><div data-login-check-url="https://www.betterplace.org/en/layouts/login_check" data-login-url="https://www.betterplace.org/en/users/sign_in?return_to={{site.baseurl}}" id="header-login-mountpoint"><span class="header-login-icon"><i class="fas fa-user fa-fw"></i></span><span class="header-login-label"><a href="https://www.betterplace.org/en/users/sign_in?return_to={{site.baseurl}}">Login</a></span></div></div><div class="header-links"><ul class="header-list list-unstyled"><li class="header-item"><a onclick="gaEvent(&#39;navigation header&#39;, &#39;click /en/discover&#39;)" class="header-link" href="https://www.betterplace.org/en/discover">Discover</a></li><li class="header-item"><a onclick="gaEvent(&#39;navigation header&#39;, &#39;click /c/collect-donations&#39;)" class="header-link" href="https://www.betterplace.org/c/collect-donations">Collect donations</a></li><li class="header-item"><a onclick="gaEvent(&#39;navigation header&#39;, &#39;click /c/about-us&#39;)" class="header-link" href="/c/about-us">About Us</a></li></ul></div></header>
+<header><div class="header-logo"><a onclick="gaEvent(&#39;navigation header&#39;, &#39;click /en&#39;)" class="logo" href="https://www.betterplace.org/en"><img class="logo-full" alt="betterplace.org (Logo)" height="30" src="https://betterplace-assets.betterplace.org/assets/logos/layout-logo-d467733fb66cce20fecaf168956b759058116995fd5cc76f82e679acc0a0d54c.svg" /><img class="logo-compact" alt="betterplace.org (Logo)" height="30" src="https://betterplace-assets.betterplace.org/assets/logos/layout-logo-compact-c31a5daedfb45394a9fe63e271dc27ef75248a67aae3dece9eca21afc4082a22.svg" /></a></div><div class="header-claim">Change the world with your donation</div><div class="header-search"><div data-search-url="https://www.betterplace.org/en/homepage/search" id="header-search-mountpoint"><i class="fa fa-search header-search-icon"></i></div></div><div class="header-login generic-header-login"><div data-login-check-url="https://www.betterplace.org/en/layouts/login_check" data-login-url="https://www.betterplace.org/en/users/sign_in?return_to={{site.baseurl}}" id="header-login-mountpoint"><span class="header-login-icon"><i class="fas fa-user fa-fw"></i></span><span class="header-login-label"><a href="https://www.betterplace.org/en/users/sign_in?return_to={{site.baseurl}}">Login</a></span></div></div><div class="header-links"><ul class="header-list list-unstyled"><li class="header-item"><a onclick="gaEvent(&#39;navigation header&#39;, &#39;click /en/discover&#39;)" class="header-link" href="https://www.betterplace.org/en/discover">Discover</a></li><li class="header-item"><a onclick="gaEvent(&#39;navigation header&#39;, &#39;click /c/collect-donations&#39;)" class="header-link" href="https://www.betterplace.org/c/collect-donations">Collect donations</a></li><li class="header-item"><a onclick="gaEvent(&#39;navigation header&#39;, &#39;click /c/about-us&#39;)" class="header-link" href="/c/about-us">About Us</a></li></ul></div></header>

data/_layouts/default.html

@@ -114,18 +114,20 @@ Update 2019-07-19: Another problem that came us is, that URLs endet in .html whi
 <script src="{{ style_host }}/de/layouts/current_pack/locale_{{ site.lang }}"></script>
 <script src="{{ style_host }}/de/layouts/current_pack/homepage"></script>
 <script>
-  {%- comment -%}
-    // Make sure we can test the Rails-staging CSS on jekyll-staging.
+  // Make sure we can test the Rails-staging CSS on jekyll-staging.
+  {% comment -%}
     //  For Staging: Simulate the environment by replacing the URLs.
     //  For Development: This does nothing, unless you force `JEKYLL_ENV=production`.
     // This will also replace URLs like the navbar logo URL which is a nice extra.
     // The attribute data-host-replaced=true is meant as a heads up when using the inspector that something was change here.
     // We cannot use the same logic for JS – more at https://github.com/betterplace/content--theme/commit/cff6293.
-  {%- endcomment -%}
+  {% endcomment -%}
   if (window.location.hostname !== 'www.betterplace.org') {
     document.querySelectorAll("[href]").forEach(element => {
-      element.href = element.href.replace('www.betterplace.org', window.location.hostname)
-      element.setAttribute('data-host-replaced', 'true')
+      if (element.href.includes('www.betterplace.org')) {
+        element.href = element.href.replace('www.betterplace.org', window.location.hostname)
+        element.setAttribute('data-host-replaced', 'true')
+      }
     })
   }
 </script>

data/_layouts/error404.html

@@ -3,7 +3,7 @@ layout: default
 head_include: <meta content="noindex" name="robots" />
 ---
 
-<div class="content-wrapper generic-background-color background-color-blue-medium preserves-space-for-transparent-header-with-subnavi">
+<div class="content-wrapper bg-teal-500 preserves-space-for-transparent-header-with-subnavi">
   <div class="container">
     <div class="row">
       <div class="col-md-24 text-center">

data/_sass/about-us/feature.sass

@@ -20,12 +20,12 @@
       display: block
       font-weight: 400
       color: black
-      background: $very-light-grey
+      background: $gray-200
 
       +desktop
         font-size: 20px
         line-height: 66px
-        border-left: 66px solid $medium-green
+        border-left: 66px solid $green-500
         box-shadow: inset 1px 0 0px 0px #FFF
         -webkit-box-shadow: inset 1px 0 0px 0px #FFF
         height: 66px
@@ -42,8 +42,8 @@
       &:hover,
       &:focus
         text-decoration: none
-        background: darken($very-light-grey, 2%)
-        border-left-color: darken($medium-green, 2%)
+        background: darken($gray-200, 2%)
+        border-left-color: darken($green-500, 2%)
 
       i
         position: absolute
@@ -57,7 +57,7 @@
 
         +phone
           left: 20px
-          color: $medium-green !important
+          color: $green-500 !important
 
   .btn + br
     +desktop
@@ -110,7 +110,7 @@
     &:before
       content: ''
       position: absolute
-      border-bottom: 1px solid $very-light-grey
+      border-bottom: 1px solid $gray-200
       height: 1px
 
       +desktop

data/_sass/about-us/generic_content_header.sass

@@ -5,7 +5,7 @@
   +desktop
     padding-top: 41px
     height: 560px
-    background: url('#{$site_baseurl}/assets/theme_images/about-us/generic-content-header_desktop.jpg') no-repeat 50% 0 $very-light-grey
+    background: url('#{$site_baseurl}/assets/theme_images/about-us/generic-content-header_desktop.jpg') no-repeat 50% 0 $gray-200
     background-size: cover
 
   +phone

data/_sass/about-us/history.sass

@@ -3,7 +3,7 @@
   color: #ffffff
 
   +desktop
-    background: url('#{$site_baseurl}/assets/theme_images/about-us/history-banner-desktop.jpg') no-repeat 50% 0 $very-light-grey
+    background: url('#{$site_baseurl}/assets/theme_images/about-us/history-banner-desktop.jpg') no-repeat 50% 0 $gray-200
     height: 560px
 
   +phone

data/_sass/about-us/scroll-down.sass

@@ -31,17 +31,17 @@
       background: rgba(255, 255, 255, 0.1)
 
     &.dark-style
-      border-color: $light-grey
+      border-color: $gray-300
 
       &:before
-        border-top-color: $light-grey
+        border-top-color: $gray-300
 
       &:hover
         background: inherit
-        border-color: darken($light-grey, 5%)
+        border-color: darken($gray-300, 5%)
 
         &:before
-          border-top-color: darken($light-grey, 5%)
+          border-top-color: darken($gray-300, 5%)
 
   +phone
     display: none

data/_sass/about-us/team.sass

@@ -3,11 +3,11 @@
   color: white
 
   +desktop
-    background: url('#{$site_baseurl}/assets/theme_images/about-us/team-teaser-desktop.jpg') no-repeat 50% 0 $very-light-grey
+    background: url('#{$site_baseurl}/assets/theme_images/about-us/team-teaser-desktop.jpg') no-repeat 50% 0 $gray-200
     height: 560px
 
   +phone
-    background: url('#{$site_baseurl}/assets/theme_images/about-us/team-teaser-phone.jpg') no-repeat 40% center $very-light-grey
+    background: url('#{$site_baseurl}/assets/theme_images/about-us/team-teaser-phone.jpg') no-repeat 40% center $gray-200
     height: 380px
     background-size: cover
 

data/_sass/about-us/why.sass

@@ -1,4 +1,5 @@
 .why
+  background: $gray-200
   text-align: center
   position: relative
 

data/_sass/generics/desktop-navigation.scss

@@ -35,7 +35,7 @@
         height: 0;
         border-style: solid;
         border-width: 5px 5px 0 5px;
-        border-color: $very-light_grey transparent transparent transparent;
+        border-color: $gray-200 transparent transparent transparent;
       }
     }
 

data/_sass/generics/hero_search.sass

@@ -1,6 +1,6 @@
 .hero-search
 
-  background: $light-green
+  background: $green-300
   display: flex
   justify-content: center
   align-items: center

data/_sass/generics/team_list.scss

@@ -52,7 +52,7 @@
       }
 
       p {
-        color: $dark-grey;
+        color: $gray-700;
         font-weight: 300;
         font-size: 14px;
         line-height: 18px;
@@ -136,7 +136,7 @@
         height: 0;
         border-style: solid;
         border-width: 20px 20px 20px 0;
-        border-color: transparent $very-light_grey transparent transparent;
+        border-color: transparent $gray-200 transparent transparent;
         @include desktop {
           top: 50%;
           margin-top: -15px;

data/_sass/generics/team_list_interlaced.scss

@@ -207,7 +207,7 @@
       }
 
       .description, .info {
-        color: $dark-grey;
+        color: $gray-700;
         font-weight: 300;
         font-size: 0.875em;
         line-height: 1.25;

data/_sass/initialize/colors.sass

@@ -1,26 +1,23 @@
-// Farben aus ORG app/assets/stylesheets/initialize/_colors.sass
+// Farben aus ORG tailwind.config.js
 
-$light-green:     #CEE57D
-$medium-green:    #9ECB0A
-$dark-green:      #357C00
+$gray-200:             #eeeeee
+$gray-300:             #cccccc
+$gray-500:             #919191
+$gray-700:             #636363
+$gray-800:             #3f3f3f
 
-$very-light-grey: #eeeeee
-$light-grey:      #cccccc
-$medium-grey:     #919191
-$dark-grey:       #636b70
+$green-100:            #f5fccc
+$green-300:            #d6ef66
+$green-500:            #9ecb09
+$green-500:            #9ecb0a
 
-$error-red:       #ad3922
-$dangerous-red:   #cd0920
+$purple-600:           #6d2c64
 
-$very-light-blue: #AECFD1
-$medium-blue:     #4597A2
-$dark-blue:       #28638c
+$red-500:              #ff6f6c
 
-$pink:            #ff00ff
+$teal-500:             #4597a2
+$teal-500:             #4597a2
 
-$brand-color-facebook: #4e69a2
-$brand-color-twitter:  #1da1f2
+$yellow-400:           #f6ce46
 
-$footer-color-1: #7b8628
-$footer-color-2: #2d7d4f
-$footer-color-3: #34675a
+$legacy-gray-blue-200: #aecfd1

data/_sass/lpm/_background_colors.sass

@@ -1,31 +1,22 @@
 @mixin generate-backgrounds($color, $selector)
 
-  .bg-color-#{$selector}
+  .bg-#{$selector}
     background-color: $color
 
   .lpm-#{$selector}-stripe
     background-image: linear-gradient(white 0%, white 120px, $color 120px, $color 100%)
 
-  // .text-color-#{$selector}
-  //   color: $color
++generate-backgrounds($red-500, red-500)
++generate-backgrounds($green-500, green-500)
++generate-backgrounds($red-500, red-500)
++generate-backgrounds($legacy-gray-blue-200, legacy-gray-blue-200)
++generate-backgrounds($teal-500, teal-500)
++generate-backgrounds($green-100, green-100)
++generate-backgrounds($purple-600, purple-600)
++generate-backgrounds($yellow-400, yellow-400)
++generate-backgrounds($gray-800, gray-800)
++generate-backgrounds($gray-200, gray-200)
 
-+generate-backgrounds($happy-give, happy-give)
-+generate-backgrounds($green-spirit, green-spirit)
-+generate-backgrounds($smart-brain, smart-brain)
-+generate-backgrounds($happy-give, happy-give)
-+generate-backgrounds($good-choice, good-choice)
-+generate-backgrounds($light-sky, light-sky)
-+generate-backgrounds($mindful-way, mindful-way)
-+generate-backgrounds($peaceful-step, peaceful-step)
-+generate-backgrounds($tolerant-turn, tolerant-turn)
-+generate-backgrounds($open-mind, open-mind)
-+generate-backgrounds($sunny-day, sunny-day)
-+generate-backgrounds($strong-grey, strong-grey)
-+generate-backgrounds($very-light-grey, silver-delight)
-
-.text-color-white
-  color: white
-
-.bg-color-green-spirit
+.bg-green-500
   .generic-teaser-swiper .swiper-container-horizontal > .swiper-pagination-bullets .swiper-pagination-bullet-active
     background-color: white

data/_sass/lpm/_hero_element.sass

@@ -2,7 +2,7 @@
   display: flex
 
   @media (min-width: $breakpoint-sm)
-    background-color: $sunny-day
+    background-color: $yellow-400
     align-items: center
     height: 486px
 

data/_sass/lpm/_list.sass

@@ -23,7 +23,7 @@
       content: "."counter(li)
       font-weight: bold
       direction: rtl
-      color: $medium-green
+      color: $green-500
       display: inline-block
       position: absolute
       top: 0

data/_sass/lpm/_seperator.sass

@@ -1,6 +1,6 @@
 hr.lpm-separator
   height: 0
-  border-top: 1px solid $medium-green
+  border-top: 1px solid $green-500
   margin: 30px auto
   width: 5rem
   &.lpm-separator-long

data/_sass/lpm/_variables.sass

@@ -6,18 +6,3 @@ $gutter-width: 20px
 $breakpoint-xs: 600px
 $breakpoint-sm: 769px
 $breakpoint-md: 1024px
-
-// TODO: Diese Datei sollten wir später loswerden, damit alles über theme/colors.sass läuft.
-
-$happy-give: #FF6F6C
-$green-spirit: #9ecb09
-$smart-brain: #309B89
-$happy-give: #ff6f6c
-$good-choice: #AECFD1
-$light-sky: #4597A2
-$mindful-way: #4E414B
-$peaceful-step: #EDEED0
-$tolerant-turn: #6D2C64
-$open-mind: #FFB38C
-$sunny-day: #F6CE46
-$strong-grey: #3f3f3f

data/_sass/pages/freundeskreis.sass

@@ -18,7 +18,7 @@
   .supporter-tiles
 
     .tile
-      background: $very-light-grey
+      background: $gray-200
       margin-bottom: 20px
       margin-top: 50px
       padding: 30px
@@ -32,7 +32,7 @@
         margin-left: (115px / -2)
         width: 115px
         height: 115px
-        background: $very-light-grey
+        background: $gray-200
         border-radius: 100%
 
       img
@@ -68,7 +68,7 @@
       margin-bottom: 5px
 
   .grey-background
-    background: $very-light-grey
+    background: $gray-200
     padding: 30px 0
     margin: 50px 0 0 0
 
@@ -92,7 +92,7 @@
     margin-top: 50px
 
   .header-illustration
-    background: $very-light-grey
+    background: $gray-200
     border-radius: 100%
     width: 90px
     height: 90px

data/_sass/pages/help.sass

@@ -12,7 +12,7 @@
 .help-author,
 .help-date
   padding: 10px
-  color: $medium-grey
+  color: $gray-500
   font-size: 16px
 
 .help-categories
@@ -24,7 +24,7 @@
     li > a
       padding-right: 10px
       padding-left: 10px
-      border-right: 1px solid $light-grey
+      border-right: 1px solid $gray-300
 
     li:last-child a
       border-right: 0

data/_sass/pages/news.sass

@@ -10,5 +10,5 @@
   .news-author,
   .news-date
     padding: 10px
-    color: $medium-grey
+    color: $gray-500
     font-size: 16px

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: betterplace-content
 version: !ruby/object:Gem::Version
-  version: 0.7.86
+  version: 0.7.91
 platform: ruby
 authors:
 - betterplace.org Developers
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-19 00:00:00.000000000 Z
+date: 2021-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -218,7 +218,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.4
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: betterplace.org's Jekyll Content Theme