Dark-Night-Base · Sciroccogti · Jan 26, 2020 · Jan 26, 2020 · Jan 26, 2020 · Jan 26, 2020
diff --git a/layouts/index.html b/layouts/index.html
@@ -1,5 +1,9 @@
 <!DOCTYPE html>
+
 <html lang="{{ with .Site.LanguageCode }}{{ . }}{{ else }}en-US{{ end }}">
+    <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">
+    <!-- to use locally, instead use this line: -->
+    <!-- <link href={{ "font-awesome/css/font-awesome.min.css" | absURL }} rel="stylesheet"> -->
     <head>
         {{ partial "head.html" . }}
     </head>
@@ -12,10 +16,15 @@
             {{ partial "hero.html" . }}
         {{ end }}
 
+        {{ if .Site.Params.events }}
+            {{ partial "events.html" . }}
+        {{ end }}
+
         {{ if .Site.Params.about }}
             {{ partial "about.html" . }}
         {{ end }}
 
+
         {{ if .Site.Params.services.list }}
             {{ partial "services.html" . }}
         {{ end }}

diff --git a/layouts/partials/about.html b/layouts/partials/about.html
@@ -13,7 +13,7 @@ <h2 class="section-heading">{{ . }}</h2>
                     <p class="text-faded">{{ . | markdownify }}</p>
                 {{ end }}
                 {{ with .Site.Params.about.buttonText }}
-                    <a href="#" class="btn btn-default btn-xl">{{ . }}</a>
+                    <a href="#services" class="btn btn-default btn-xl">{{ . }}</a>
                 {{ end }}
             </div>
         </div>

diff --git a/layouts/partials/aside.html b/layouts/partials/aside.html
@@ -1,11 +0,0 @@
-{{ "<!-- ASIDE -->" | safeHTML }}
-<aside class="bg-dark">
-    <div class="container text-center">
-        <div class="call-to-action">
-            {{ with .Site.Params.aside.headline }}<h2>{{ . }}</h2>{{ end }}
-            {{ if and .Site.Params.aside.button.link .Site.Params.aside.button.text }}
-                <a href="{{ .Site.Params.aside.button.link }}" class="btn btn-default btn-xl wow tada">{{ .Site.Params.aside.button.text }}</a>
-            {{ end }}
-        </div>
-    </div>
-</aside>

diff --git a/layouts/partials/contact.html b/layouts/partials/contact.html
@@ -2,7 +2,7 @@
 <section id="contact">
     <div class="container">
         <div class="row">
-            <div class="col-lg-8 col-lg-offset-2 text-center">
+            <div class="text-center">
                 {{ with .Site.Params.contact.headline }}
                     <h2 class="section-heading">{{ . }}</h2>
                 {{ end }}
@@ -13,30 +13,57 @@ <h2 class="section-heading">{{ . }}</h2>
                     <p>{{ . | markdownify }}</p>
                 {{ end }}
             </div>
-            {{ if .Site.Params.contact.phone }}
-                <div class="
-                {{ if .Site.Params.contact.email }}
-                    col-lg-4
-                {{ else }}
-                    col-lg-8
-                {{ end }}
-                col-lg-offset-2 text-center">
-                    <i class="fa fa-phone fa-3x wow bounceIn"></i>
-                    <p>{{ .Site.Params.contact.phone }}</p>
-                </div>
-            {{ end }}
-            {{ if .Site.Params.contact.email }}
-                <div class="
-                {{ if .Site.Params.contact.phone }}
-                    col-lg-4
-                {{ else }}
-                    col-lg-8 col-lg-offset-2
-                {{ end }}
-                 text-center">
+        </div>
+        <!-- TODO switch to bootstrap 4 (supports flexbox, makes our life with centering easier -->
+        <!-- using empty cols to center. This is not ideal, but seems like the best solution in BS3 -->
+        <div class="row">
+            <div class="col-md-12"></div>
+            {{ if .Site.Params.contact.newsletterSignup }}
+                <div class="col-md-4 text-center">
                     <i class="fa fa-envelope-o fa-3x wow bounceIn" data-wow-delay=".1s"></i>
-                    <p><a href="mailto:{{ .Site.Params.contact.email }}">{{ .Site.Params.contact.email }}</a></p>
+                    <p><a href="{{ .Site.Params.contact.newsletterSignup }}">{{ .Site.Params.contact.newsletterText }}</a></p>
                 </div>
             {{ end }}
+
+            {{ if .Site.Params.contact.telegramChannel }}
+            <div class="col-md-4 text-center">
+                <!-- TODO upgrade fontawesome, use fab-telegram-plane (looks much nicer) -->
+                <i class="fa fa-telegram fa-3x wow bounceIn" data-wow-delay=".1s"></i>
+                <p><a href="{{ .Site.Params.contact.telegramChannel }}">{{ .Site.Params.contact.telegramChannelText }}</a></p>
+            </div>
+            {{ end }}
+            {{ if .Site.Params.contact.facebookLocal }}
+            <div class="col-md-4 text-center">
+                <i class="fa fa-facebook fa-3x wow bounceIn"></i>
+                <p><a href={{ .Site.Params.contact.facebookLocal }}>{{ .Site.Params.contact.facebookLocalText }}</a></p>
+            </div>
+            {{ end }}
+    </div>
+    <div class="row">
+        <div class="col-md-12"></div>
+
+        {{ if .Site.Params.contact.email }}
+            <div class="col-md-4 text-center">
+                <i class="fa fa-envelope-o fa-3x wow bounceIn" data-wow-delay=".1s"></i>
+                <p><a href="mailto:{{ .Site.Params.contact.email }}">{{ .Site.Params.contact.emailText}}</a></p>
+            </div>
+        {{ end }}
+
+        {{ if .Site.Params.contact.Instagram }}
+            <div class="col-md-4 text-center">
+                <i class="fa fa-instagram fa-3x wow bounceIn" data-wow-delay=".1s"></i>
+                <p><a href={{ .Site.Params.contact.Instagram }}>{{ .Site.Params.contact.InstagramText}}</a></p>
+            </div>
+        {{ end }}
+
+        {{ if .Site.Params.contact.facebookGlobal }}
+        <div class="col-md-4 text-center">
+            <i class="fa fa-facebook fa-3x wow bounceIn"></i>
+            <p><a href={{ .Site.Params.contact.facebookGlobal }}>{{ .Site.Params.contact.facebookGlobalText }}</a></p>
         </div>
+        {{ end }}
+
     </div>
 </section>
+<!-- needed to display fa icons correctly in some browsers:https://stackoverflow.com/questions/57430455/font-awesome-unicode-icon-is-not-working-in-firefox  -->
+<i class="fa fa-check"></i>
diff --git a/layouts/partials/events.html b/layouts/partials/events.html
@@ -0,0 +1,22 @@
+{{ "<!-- events -->" | safeHTML }}
+<section id="events">
+    <div class="container">
+        <div class="row">
+            <div class="col-lg-10 text-center">
+                {{ with .Site.Params.events.headline }}
+                    <h2 class="section-heading">{{ . }}</h2>
+                {{ end }}
+                {{ if and .Site.Params.events.headline .Site.Params.events.description }}
+                    <hr class="primary">
+                {{ end }}
+                {{ if .Site.Params.events.imageLink }}
+                <p style="float: left; margin-right: 50px"><img src= {{ .Site.Params.events.imageLink }} height="200px" width="200px"></p>
+                {{ end }}
+                <p style="text-align: left">{{ .Site.Params.events.description | markdownify }}</p>
+
+                    <a href= {{ .Site.Params.events.buttonLink }} class="btn btn-default btn-xl">{{ .Site.Params.events.buttonText }}</a>
+            </div>
+        </div>
+    </div>
+</section>
+
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
@@ -3,7 +3,7 @@
 <meta name="viewport" content="width=device-width, initial-scale=1">
 {{ with .Site.Params.name }}<meta name="author" content="{{ . }}">{{ end }}
 {{ with .Site.Params.description }}<meta name="description" content="{{ . }}">{{ end }}
-{{ .Hugo.Generator }}
+{{ hugo.Generator }}
 <title>{{ .Site.Title }}</title>
 
 {{ "<!-- Favicon -->" | safeHTML }}

diff --git a/layouts/partials/hero.html b/layouts/partials/hero.html
@@ -3,6 +3,7 @@
     <div class="header-content">
         <div class="header-content-inner">
             {{ with .Site.Params.hero.slogan }}
+
                 <h1>{{ . | markdownify  }}</h1>
             {{ end }}
             {{ if and .Site.Params.hero.slogan .Site.Params.hero.subtitle }}
@@ -17,3 +18,5 @@ <h1>{{ . | markdownify  }}</h1>
         </div>
     </div>
 </header>
+
+
diff --git a/layouts/partials/nav.html b/layouts/partials/nav.html
@@ -2,16 +2,14 @@
 <nav id="mainNav" class="navbar navbar-default navbar-fixed-top">
     <div class="container-fluid">
         {{ "<!-- Brand and toggle get grouped for better mobile display -->" | safeHTML }}
-        <div class="navbar-header">
+        <div class="navbar-nav">
             <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
                 <span class="sr-only">Toggle navigation</span>
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
             </button>
-            {{ with .Site.Params.navigation.brand }}
-                <a class="navbar-brand page-scroll" href="#page-top">{{ . | markdownify }}</a>
-            {{ end }}
+            <a href="#page-top"><img src="/img/logo.png" alt="image" width="48" height="48"/></a>
         </div>
         {{ "<!-- Collect the nav links, forms, and other content for toggling -->" | safeHTML }}
         <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
@@ -41,6 +39,9 @@
                         <a class="page-scroll" href="#contact">{{ .Site.Params.navigation.links.contact }}</a>
                     </li>
                 {{ end }}
+                    <li>
+                        <a class="page-scroll" href= {{ cond (eq (.Site.LanguagePrefix) "/fr") "/de" "fr" }} >{{ cond (eq (.Site.LanguagePrefix) "/fr") "Deutsch" "Français" }}</a>
+                    </li>
             </ul>
         </div>
         {{ "<!-- /.navbar-collapse -->" | safeHTML }}

diff --git a/layouts/partials/services.html b/layouts/partials/services.html
@@ -13,7 +13,7 @@ <h2 class="section-heading">{{ . }}</h2>
     <div class="container">
         <div class="row">
             {{ range .Site.Params.services.list }}
-            <div class="col-lg-3 col-md-6 text-center">
+            <div class="col-lg-3 col-md-6 text-left">
                 <div class="service-box">
                     <i class="fa fa-4x {{ .icon }} wow bounceIn text-primary"></i>
                     <h3>{{ .title }}</h3>

diff --git a/static/css/bootstrap.css b/static/css/bootstrap.css
diff --git a/static/css/creative.css b/static/css/creative.css
@@ -16,7 +16,7 @@ body {
 
 hr {
     max-width: 50px;
-    border-color: #f05f40;
+    border-color: #22b538;
     border-width: 3px;
 }
 
@@ -25,7 +25,7 @@ hr.light {
 }
 
 a {
-    color: #f05f40;
+    color: #22b538;
     -webkit-transition: all .35s;
     -moz-transition: all .35s;
     transition: all .35s;
@@ -45,7 +45,12 @@ a:focus {
     color: rgb(52, 52, 52);
 }
 
-h1,
+h1 {
+    padding-top: 240px;
+    font-family: 'Open Sans','Helvetica Neue',Arial,sans-serif;
+}
+
+
 h2,
 h3,
 h4,
@@ -54,14 +59,15 @@ h6 {
     font-family: 'Open Sans','Helvetica Neue',Arial,sans-serif;
 }
 
+
 p {
     margin-bottom: 20px;
     font-size: 16px;
     line-height: 1.5;
 }
 
 .bg-primary {
-    background-color: #f05f40;
+    background-color: #22b538;
 }
 
 .bg-dark {
@@ -98,7 +104,7 @@ aside {
     text-transform: uppercase;
     font-family: 'Open Sans','Helvetica Neue',Arial,sans-serif;
     font-weight: 700;
-    color: #f05f40;
+    color: #22b538;
 }
 
 .navbar-default .navbar-header .navbar-brand:hover,
@@ -116,12 +122,12 @@ aside {
 
 .navbar-default .nav > li>a:hover,
 .navbar-default .nav>li>a:focus:hover {
-    color: #f05f40;
+    color: #22b538;
 }
 
 .navbar-default .nav > li.active>a,
 .navbar-default .nav>li.active>a:focus {
-    color: #f05f40!important;
+    color: #22b538!important;
     background-color: transparent;
 }
 
@@ -162,7 +168,7 @@ aside {
 
     .navbar-default.affix .navbar-header .navbar-brand {
         font-size: 14px;
-        color: #f05f40;
+        color: #22b538;
     }
 
     .navbar-default.affix .navbar-header .navbar-brand:hover,
@@ -177,7 +183,7 @@ aside {
 
     .navbar-default.affix .nav > li>a:hover,
     .navbar-default.affix .nav>li>a:focus:hover {
-        color: #f05f40;
+        color: #22b538;
     }
 }
 
@@ -332,7 +338,7 @@ header .header-content .header-content-inner p {
 }
 
 .text-primary {
-    color: #f05f40;
+    color: #22b538;
 }
 
 .no-gutter > [class*=col-] {
@@ -394,9 +400,9 @@ fieldset[disabled] .btn-default.active {
 }
 
 .btn-primary {
-    border-color: #f05f40;
+    border-color: #22b538;
     color: #fff;
-    background-color: #f05f40;
+    background-color: #22b538;
     -webkit-transition: all .35s;
     -moz-transition: all .35s;
     transition: all .35s;
@@ -437,12 +443,12 @@ fieldset[disabled] .btn-primary:active,
 .btn-primary.disabled.active,
 .btn-primary[disabled].active,
 fieldset[disabled] .btn-primary.active {
-    border-color: #f05f40;
-    background-color: #f05f40;
+    border-color: #22b538;
+    background-color: #22b538;
 }
 
 .btn-primary .badge {
-    color: #f05f40;
+    color: #22b538;
     background-color: #fff;
 }
 

diff --git a/static/img/header-old.jpg b/static/img/header-old.jpg
diff --git a/static/img/header.jpg b/static/img/header.jpg
diff --git a/static/img/logo.png b/static/img/logo.png