Merge branch 'master' into green_badge

move from home to about page + change background color
2020-08-09 09:01:08 +00:00 · 2020-08-09 10:58:53 +02:00 · 2020-08-07 06:25:34 +00:00 · 2020-08-06 14:20:32 +02:00 · 2020-08-06 12:16:43 +00:00 · 2020-07-17 06:34:55 +00:00
3 changed files with 14 additions and 1 deletions
--- a/pages/01.home/modular.en.md
+++ b/pages/01.home/modular.en.md
@ -1,6 +1,6 @@
 ---
 title: Disroot
-bgcolor: '#1F5C60'
+bgcolor: '#fff'
 content:
    items: '@self.modular'
    order:
--- a/pages/02.about/_greenenergy/2col.en.md
+++ b/pages/02.about/_greenenergy/2col.en.md
@ -0,0 +1,12 @@
+---
+title: Online-donation
+bgcolor: '#1F5C60'
+wider_column: left
+fontcolor: '#ffffff'
+---
+
+Disroot servers are hosted in a data-center using renewable energy.
+
+---
+
+<a href="https://api.thegreenwebfoundation.org/greencheckimage/DISROOT.ORG" target=_blank><img src="https://api.thegreenwebfoundation.org/greencheckimage/DISROOT.ORG" alt="This website is hosted Green - checked by thegreenwebfoundation.org" style="height:100px"></a>
--- a/pages/02.about/modular.en.md
+++ b/pages/02.about/modular.en.md
@ -12,6 +12,7 @@ content:
            - _federation
            - _privacy
            - _transparency
+            - _greenenergy
 body_classes: modular
 header_image: about-banner.jpeg
 ---
Author	SHA1	Message	Date
meaz	78de38128c	Merge branch 'master' into green_badge	2020-08-09 09:01:08 +00:00
meaz	d512097002	move from home to about page + change background color	2020-08-09 10:58:53 +02:00
meaz	664c5028c2	Merge branch 'master' into green_badge	2020-08-07 06:25:34 +00:00
antil0pa	8d6ac56ddf	fixed a typo, added a hyperlink.	2020-08-06 14:20:32 +02:00
antilopa	90288ab4f6	Merge branch 'master' into green_badge	2020-08-06 12:16:43 +00:00
meaz	052494f227	Merge branch 'master' into green_badge	2020-07-17 06:34:55 +00:00
meaz	8018111118	change location of badge + fix error with bkground	2020-04-22 11:47:00 +02:00
meaz	acf0a1b654	add green badge	2020-04-22 11:34:12 +02:00