adjustment for winter challenge page and other fixes

pages/02.about/_empty-bar/fullbar.md

@@ -1,6 +0,0 @@
----
-title: 'Empty Bar'
-bgcolor: '#8EB726'
-fontcolor: '#FFF'
-text_align: center
----

pages/03.services/03.nextcloud/_nextcloud-cals/2col-right.en.md

@@ -0,0 +1,19 @@
+---
+title: 'Calenders and Contacts'
+bgcolor: '#FFF'
+fontcolor: '#555'
+---
+
+![](en/nextcloud-cal.png?lightbox=1024)
+
+---
+
+## Calendars and Contacts
+
+Share your calendar's with other **Nextcloud** users or groups on your **Nextcloud** server, easily and quickly. Store your contacts in **Nextcloud** and share them among your devices so you always have access to it no matter which device you are currently on.
+
+### Use your favorite client
+
+- **Gnome online accounts** on **Gnome**
+- **Kaddressbook** on **KDE**
+- [**DAVx⁵** on **Android**](https://f-droid.org/en/packages/at.bitfire.davdroid/)

pages/03.services/03.nextcloud/_nextcloud-cals/cloudclient-right.en.md

@@ -1,47 +0,0 @@
----
-title: 'Calendars and Contacts Clients'
-bgcolor: '#FFF'
-fontcolor: '#327E82'
-text_align: left
-text: 'Share your calendars with other Nextcloud users or groups on your Nextcloud server, easily and quickly. Store your contacts in Nextcloud and share them among your devices so you always have access to it no matter which device you are currently on.'
-text2: 'Choose your favorite client'
-image: /en/nextcloud-cal.png
-clients:
-    -
-        title: GOA
-        logo: en/goa.png
-        link: https://wiki.gnome.org/Projects/GnomeOnlineAccounts
-        text: 'Gnome online accounts'
-        platforms: [fa-linux]
-    -
-        title: Kaddressbook
-        logo: en/KDE.png
-        link: https://kde.org/applications/office/org.kde.kaddressbook
-        text:
-        platforms: [fa-linux]
-    -
-        title: Thunderbird
-        logo: en/thunderbird.png
-        link: https://www.thunderbird.net/
-        text:
-        platforms: [fa-linux, fa-windows]
-    -
-        title: DAVx⁵
-        logo: en/davx5.png
-        link: https://f-droid.org/en/packages/at.bitfire.davdroid/
-        text:
-        platforms: [fa-android]
-
-    -
-        title: Webbrowser
-        logo: en/webbrowser.png
-        link: https://cloud.disroot.org
-        text: 'Access directly from your browser'
-        platforms: [fa-linux, fa-windows, fa-apple]
-
-
----
-
-<div class=clients markdown=1>
-
-</div>

pages/03.services/04.diaspora/_empty-bar/fullbar.md

@@ -1,7 +0,0 @@
----
-title: 'Empty Bar'
-bgcolor: '#8EB726'
-fontcolor: '#FFF'
-text_align: center
----
-

pages/03.services/04.diaspora/modular.en.md

@@ -14,7 +14,6 @@ content:
             - _diaspora-reshare
             - _diaspora-mentions
             - _diaspora-love
-            - _empty-bar
 body_classes: modular
 header_image: diaspora.jpg
 ---

pages/03.services/05.forum/_empty-bar/fullbar.md

@@ -1,7 +0,0 @@
----
-title: 'Empty Bar'
-bgcolor: '#8EB726'
-fontcolor: '#FFF'
-text_align: center
----
-

pages/03.services/09.privatebin/_empty-bar/fullbar.md

@@ -1,7 +0,0 @@
----
-title: 'Empty Bar'
-bgcolor: '#8EB726'
-fontcolor: '#FFF'
-text_align: center
----
-

pages/03.services/09.privatebin/modular.en.md

@@ -10,8 +10,6 @@ content:
             - _bin-highlights
             - _bin-easy
             - _bin-safe
-            - _empty-bar
 body_classes: modular
 header_image: bin_banner.jpg
 ---
-

pages/03.services/12.polls/_empty-bar/fullbar.md

@@ -1,6 +0,0 @@
----
-title: 'Empty Bar'
-bgcolor: '#8EB726'
-fontcolor: '#FFF'
-text_align: center
----

pages/06.donate/_overview/fullbar.de.md

@@ -10,7 +10,7 @@ text_align: center
 ![](graph.png?lightbox=1024)
 
 
-Unterstützt von <button class="button button4">179</button> 
+Unterstützt von <button class="button button4">179</button>
 _(Click the number for an overview)_
 
 

pages/11.Challenges/_goal/2col-right.en.md

@@ -1,21 +0,0 @@
----
-title: 'Goal'
-bgcolor: '#09846aff'
-fontcolor: '#1F5C60'
-text_align: left
----
-
-<p style="color: #ffffff; font-size: 38px;">
-Help us reach 1500€
-</p>
-<br>
-<div>
-<img src="http://disroot.lan/user/pages/11.Challenges/_goal/trophy.png" alt="Trophy" width="80" />
-<p style="color: #ffffff; font-size: 56px; font-family: 'Kingthings Christmas'; display:inline; margin-left: 50px;">
-7 days left
-<p>
-</div>
-
----
-
-<img src="http://disroot.lan/user/pages/11.Challenges/_goal/tree.png" alt="Tree of cats" height="100"/>

pages/11.Challenges/_ranking/fullbar.en.md

@@ -1,34 +0,0 @@
----
-title: 'Ranking'
-bgcolor: '#7b384fff'
-fontcolor: '#FFF'
-text_align: center
----
-
-<h1 style="color: #ffffff; font-size: 56px; font-family: 'Kingthings Christmas'; line-height: 1.2;">Ranking</h1>
-
-
-<div class="dots">
-    <hr class="left"  style="width: 10vw;" />
-    <figure>
-    <img src="http://disroot.lan/user/pages/11.Challenges/_ranking/hacker.png" width="80">
-    <figcaption>glorifiedhacker.net</figcaption>
-    </figure>
-</div>
-
-<div class="dots" >
-    <hr class="left" style="width: 5vw;" />
-    <figure>
-    <img src="http://disroot.lan/user/pages/11.Challenges/_ranking/google.png" width="80">
-    <figcaption>getgoogleoff.me</figcaption>
-    </figure>
-
-</div>
-
-<div class="dots" >
-    <hr class="left" style="width:1vw;" />
-    <figure>
-    <img src="http://disroot.lan/user/pages/11.Challenges/_ranking/cat.png" width="80">
-    <figcaption>morecats.net</figcaption>
-    </figure>
-</div>

pages/11.Challenges/_title/fullbar.en.md

@@ -1,12 +0,0 @@
----
-title: 'Green bar'
-bgcolor: '#f2f2f2ff'
-fontcolor: '#FFF'
-text_align: center
----
-
-<br>
-<p style="color: #ff547fff; font-size: 56px; font-family: 'Kingthings Christmas'; line-height: 1.2;">
-The Phenomenal End-of-the-Year <br>
-Bonus Alias Challenge
-</p>

pages/aliaschallenge/_domains/domains.en.md

@@ -7,24 +7,25 @@ text_align: left
 services:
     -
         title: "#glorifiedhacker"
-        text: "Donate for glorifiedhacker.net"
+        text: "glorifiedhacker.net"
         button: 'https://mail.disroot.org'
     -
         title: "#GetGoogleOffMe"
-        text: "Donate for getgoogleoff.me"
+        text: "getgoogleoff.me"
         button: 'https://cloud.disroot.org'
     -
         title: "#Morecats"
-        text: "Donate for morecats.net"
+        text: "morecats.net"
         button: 'https://forum.disroot.org'
 
 ---
 
 <div style="width: 50%; margin-left: auto; margin-right: auto;">
-<h2 style="color:#327E82;">Bank transfer:</h2>
+<h4 style="color:#327E82;">Bank transfer:</h4>
 <p style="color:#327E82; font-size:1.8em; line-height:1.4"> Stichting Disroot.org <br>
-IBAN NL19 TRIO 0338 7622 05
+IBAN NL19 TRIO 0338 7622 05 <br>
 BIC TRIONL2U
 </p>
+<h4 style="color:#327E82;">Don't forget to mention your choice in the reference!"</h4>
 </div>
 <br>

pages/aliaschallenge/_goal/fullbar.en.md

@@ -0,0 +1,24 @@
+---
+title: 'Goal'
+bgcolor: '#09846aff'
+fontcolor: '#FFFFFF'
+text_align: left
+---
+
+<br>
+
+
+<h3 style="padding-left:130px;"> Help us reach 1500€ </h3>
+
+<div>
+<img src="/user/pages/aliaschallenge/_goal/trophy.png" alt="Trophy" width="80" />
+
+<span class=text-center style="color: #ffffff; font-size: 56px; font-family: 'kingthings_christmas'; display:inline; margin-left: 50px;">
+7 days left
+</span>
+
+</div>
+
+<div class="tree">
+<img src="/user/pages/aliaschallenge/_goal/tree.png" alt="Tree of cats" />
+</div>

pages/aliaschallenge/_intro/fullbar.en.md

@@ -2,12 +2,17 @@
 title: 'Introduction'
 bgcolor: '#7b384fff'
 fontcolor: '#FFF'
-text_align: center
+text_align: left
 ---
 
 <br>
-In the last days of this year, when the entire world prepares to greet the light of the new decade, three domains are fighting for the dominance of the beetroot market. **Join the battle and choose your Overlord**.
 
+<span style="padding-right:10%;">
+In the last days of this year, when the entire world prepares to greet the light of the new decade, three domains are fighting for the dominance of the beetroot market. **Join the battle and choose your Overlord**.
+</span>
+
+<span style="padding-right:30%;">
 From 23rd of December until 1st of January, take part in our end of the year fundraising event. **Donate to Disroot** using one of the below domain hashtags as your donation reference. Victorious domain name will be given as an **extra alias for all Disrooters now and in the future**.
+</span>
 
 ## Let the coolest domain win!

pages/aliaschallenge/_pagebottom/3col.md

@@ -0,0 +1,14 @@
+---
+title: 'Ranking'
+bgcolor: '#7b384fff'
+fontcolor: '#FFF'
+text_align: center
+---
+
+---
+
+---
+
+<div style="float:right; font-size: 11px; width: 600px;">
+- Icons on this page were created by Smashicons, Freepik and Monkik from flaticon.com -
+</div>

pages/aliaschallenge/_ranking/fullbar.en.md

@@ -0,0 +1,35 @@
+---
+title: 'Ranking'
+bgcolor: '#7b384fff'
+fontcolor: '#FFF'
+text_align: center
+---
+
+<h1 style="color: #ffffff; font-size: 56px; font-family: 'kingthings_christmas'; line-height: 1.2;">Ranking</h1>
+
+
+<div class="dots">
+    <hr class="left"  style="width: 1vw;" /><h2 class="right"> 0€ </h2>
+    <figure>
+    <img src="/user/pages/aliaschallenge/_ranking/hacker.png" width="60">
+    <figcaption>glorifiedhacker.net</figcaption>
+    </figure>
+</div>
+
+<div class="dots" >
+    <hr class="left" style="width: 1vw;" /><h2 class="right"> 0€ </h2>
+    <figure>
+    <img src="/user/pages/aliaschallenge/_ranking/google.png" width="60">
+    <figcaption>getgoogleoff.me</figcaption>
+    </figure>
+
+
+</div>
+
+<div class="dots" >
+    <hr class="left" style="width:1vw;" /><h2 class="right"> 0€ </h2>
+    <figure>
+    <img src="/user/pages/aliaschallenge/_ranking/cat.png" width="60">
+    <figcaption>morecats.net</figcaption>
+    </figure>
+</div>

pages/aliaschallenge/_rewards/challenges.en.md

@@ -10,15 +10,15 @@ clients:
 
     -
         title: "Donate 100€"
-        text: "Choose a new Image for the Disroot.org front page"
+        text: "Choose a new Image for the Disroot.org front page*"
 
     -
         title: "Donate 500€"
-        text: "Select a new domain name for a custom Disroot alias."
+        text: "Select a new domain name for a custom Disroot alias.*"
 
 
 ---
 
 <div class=clients markdown=1>
-* Disroot.org reserve the right to deny the reward if image or name are in violation of our TOS
+`*` Disroot.org reserve the right to deny the reward if image or name are in violation of our <a href="/tos"> TOS</a>
 </div>

pages/aliaschallenge/_rewardstitle/fullbar.en.md

@@ -6,6 +6,6 @@ text_align: center
 ---
 
 <br>
-<p style="color: #ffffff; font-size: 56px; font-family: 'Kingthings Christmas'; line-height: 1.2;">
+<p style="color: #ffffff; font-size: 56px; font-family: 'kingthings_christmas'; line-height: 1.2;">
 Special rewards extravganza:
 </p>

pages/aliaschallenge/_title/fullbar.en.md

@@ -0,0 +1,12 @@
+---
+title: 'Green bar'
+bgcolor: '#f2f2f2ff'
+fontcolor: '#FFF'
+text_align: center
+---
+
+<br>
+<p style="color: #ff547fff; font-size: 56px; font-family: 'kingthings_christmas'; line-height: 1.2;">
+The Phenomenal End-of-the-Year<br>
+<span style="font-size:85px";> Bonus Alias Challenge </span>
+</p>

pages/aliaschallenge/modular.en.md

@@ -1,5 +1,5 @@
 ---
-title: Challenges
+title: Alias-challenge
 content:
     items: '@self.modular'
     order:
@@ -13,6 +13,7 @@ content:
             - _rewardstitle
             - _rewards
             - _ranking
+            - _pagebottom
 body_classes: modular
-header_image: 'pinguin.jpg'
+header_image: 'header2.jpg'
 ---