From 0aaa83a2f83c6a4a796280bfa967de64adc481db Mon Sep 17 00:00:00 2001 From: Leo Maroni Date: Tue, 8 May 2018 18:35:40 +0200 Subject: [PATCH] added communitypage; dockerfile; upgraded jekyll --- Dockerfile | 9 ++++ Gemfile | 2 +- Gemfile.lock | 6 +-- _scss/_main-section.scss | 27 ++++------- communities.html | 100 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 121 insertions(+), 23 deletions(-) create mode 100644 Dockerfile create mode 100644 communities.html diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..02dd35a --- /dev/null +++ b/Dockerfile @@ -0,0 +1,9 @@ +FROM nginx:1 +MAINTAINER Freifunk Rhein-Sieg e.V. +EXPOSE 80 + +RUN mkdir -p /project/ +WORKDIR /project +RUN apt-get update -y && apt-get install -y git ruby ruby-dev rubygems build-essential +RUN gem install bundle +CMD git init && git remote add origin https://labcode-de@bitbucket.org/labcode-de/ffrsk.git && git fetch && git pull origin v2 && bundle install && bundle exec jekyll build && rm -rf /usr/share/nginx/html/* && cp -r _site/* /usr/share/nginx/html && echo "ready" && nginx -g "daemon off;" \ No newline at end of file diff --git a/Gemfile b/Gemfile index d1fed41..9553537 100644 --- a/Gemfile +++ b/Gemfile @@ -8,7 +8,7 @@ source "https://rubygems.org" # # This will help ensure the proper Jekyll version is running. # Happy Jekylling! -gem "jekyll", "~> 3.8.0" +gem "jekyll", "~> 3.8.1" # If you want to use GitHub Pages, remove the "gem "jekyll"" above and diff --git a/Gemfile.lock b/Gemfile.lock index f4bb369..866c19e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,13 +8,13 @@ GEM em-websocket (0.5.1) eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) - eventmachine (1.2.5) + eventmachine (1.2.6) ffi (1.9.23) forwardable-extended (2.6.0) http_parser.rb (0.6.0) i18n (0.9.5) concurrent-ruby (~> 1.0) - jekyll (3.8.0) + jekyll (3.8.1) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) @@ -59,7 +59,7 @@ PLATFORMS ruby DEPENDENCIES - jekyll (~> 3.8.0) + jekyll (~> 3.8.1) jekyll-feed (~> 0.6) tzinfo-data diff --git a/_scss/_main-section.scss b/_scss/_main-section.scss index 0343989..7d18ca5 100644 --- a/_scss/_main-section.scss +++ b/_scss/_main-section.scss @@ -7,14 +7,14 @@ main { h3 { @extend .light-text } - .linear-gradient-card-wrapper > .col { + .communitycard-wrapper > .col { @media only screen and (max-width: 991px) { float: none; margin: 0 auto; } - .linear-gradient-card { - background-color: $black; - color: $white; + .communitycard { + background-color: $ff_yellow; + color: $black; width: 100%; border-radius: 10px; padding: 25px; @@ -22,21 +22,6 @@ main { margin-bottom: 15px; -webkit-box-shadow: 0 4px 5px 0 rgba(0,0,0,0.14), 0 1px 10px 0 rgba(0,0,0,0.12), 0 2px 4px -1px rgba(0,0,0,0.3); box-shadow: 0 4px 5px 0 rgba(0,0,0,0.14), 0 1px 10px 0 rgba(0,0,0,0.12), 0 2px 4px -1px rgba(0,0,0,0.3); - &.blue-gradient { - @include background-linear-gradient(40deg, #2196f3, #01579b) - } - &.pink-gradient { - @include background-linear-gradient(40deg, #ec407a, #880e4f) - } - &.orange-gradient { - @include background-linear-gradient(40deg, #ff9800, #bf360c) - } - &.green-gradient { - @include background-linear-gradient(40deg, #7cb342, #1b5e20) - } - &.purple-gradient { - @include background-linear-gradient(40deg, #311b92, #673ab7) - } .title { font-size: 1.75rem; display: block; @@ -52,10 +37,14 @@ main { margin: 5px; -webkit-box-shadow: 0 6px 10px 0 rgba(0,0,0,0.14), 0 1px 18px 0 rgba(0,0,0,0.12), 0 3px 5px -1px rgba(0,0,0,0.3); box-shadow: 0 6px 10px 0 rgba(0,0,0,0.14), 0 1px 18px 0 rgba(0,0,0,0.12), 0 3px 5px -1px rgba(0,0,0,0.3); + &:hover { -webkit-box-shadow: 0 6px 10px 0 rgba(0,0,0,0.14), 0 1px 18px 0 rgba(0,0,0,0.12), 0 3px 5px -1px rgba(0,0,0,0.3); box-shadow: 0 6px 10px 0 rgba(0,0,0,0.14), 0 1px 18px 0 rgba(0,0,0,0.12), 0 3px 5px -1px rgba(0,0,0,0.3); } + i { + color: $black; + } } } } diff --git a/communities.html b/communities.html new file mode 100644 index 0000000..e51defe --- /dev/null +++ b/communities.html @@ -0,0 +1,100 @@ +--- +layout: page +--- + + + +
+
+
+

Unterstützte Communities oder Communities unserer Mitglieder

+
+
+
+
+ + Freifunk Siegburg + + + Die nichtkommerzielle Initiative für den Aufbau freier WLAN-Netzwerke in Siegburg + +
+ + + + +
+
+
+
+
+ + Freifunk Troisdorf + + + Die nichtkommerzielle Initiative für den Aufbau freier WLAN-Netzwerke in Troisdorf + +
+ + + +
+
+
+
+
+ + Freifunk Rheinbach + + + Die nichtkommerzielle Initiative für den Aufbau freier WLAN-Netzwerke in Rheinbach + +
+ + + +
+
+
+
+
+ + Freifunk Lohmar + + + Die nichtkommerzielle Initiative für den Aufbau freier WLAN-Netzwerke in Lohmar + +
+ +
+
+
+
+
+ + Freifunk Sankt Augustin + + + Die nichtkommerzielle Initiative für den Aufbau freier WLAN-Netzwerke in St. Augustin + +
+ +
+
+
+
+
+ + Freifunk Altenkirchen + + + Die nichtkommerzielle Initiative für den Aufbau freier WLAN-Netzwerke in Altenkirchen + +
+ +
+
+
+
+
+
\ No newline at end of file