new donate page and edit to about texts (#521)

Reviewed-on: #521
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Co-authored-by: antilopa <antilopa@disroot.org>
Co-committed-by: antilopa <antilopa@disroot.org>

pages/02.about/_about-who-and-why/2col.en.md

@@ -1,9 +1,10 @@
 ---
 title: Email
-bgcolor: '#1F5C60'
-fontcolor: '#FFFFFF'
+bgcolor: 'var(--secondary)'
+fontcolor: 'var(--white)'
 body_classes: modular
 wider_column: none
+top: '-30px'
 ---
 
 **Disroot** is a project that was born from the personal need to communicate, share and organize ourselves within our circles through tools that met a series of fundamental criteria for us: they had to be **open**, **decentralized**, **federated** and above all **respectful** towards **freedom** and **privacy**. None of the most popular solutions complied with them, but in our search we found some very interesting projects that did. And since we thought that they should be available to all those with similar ethical principles, we decided not only to group these applications and share them with others, but also to manage them according to those values. That's how **Disroot** started.
@@ -14,7 +15,7 @@ The project is based in Amsterdam, was founded by **Muppeth** and **Antilopa** i
 
 ---
 
-**Disroot** aims to change the way people are used to interact on the web. We want to encourage and show them not only that there are open and ethical alternatives but also that it is the only possible way to break free from the *walled gardens* proposed and promoted by proprietary software and corporations, either through our platform, others that have similar values and goals or even their own projects.
+**Disroot** aims to change the way people are used to interact on the web. We want to encourage and show them not only that there are open and ethical alternatives but also that it is the only possible way to break free from the *walled gardens* proposed and promoted by proprietary software and corporations, either by using our platform, other ethical providers sharing similar values and goals or even starting your own.
 
 
 We are convinced that we can build together a truly independent network, focused on the benefit of the people and not on their exploitation.

pages/02.about/_core-team/fullbar.en.md

@@ -1,7 +1,7 @@
 ---
 title: 'Green bar'
-bgcolor: '#c2cfb7'
-fontcolor: '#1F5C60'
+bgcolor: 'var(--highlight)'
+fontcolor: 'var(--secondary)'
 text_align: center
 padding: 10px 0px 20px
 ---

pages/02.about/_privacy/2col.en.md

@@ -1,8 +1,9 @@
 ---
 title: privacy
-fontcolor: '#555'
+fontcolor: 'var(--text)'
 wider_column: none
-bgcolor: '#fff'
+bgcolor: 'var(--white)'
+top: '-50px'
 
 ---
 
@@ -31,7 +32,6 @@ In the last few decades information has become very valuable and more and more e
 
 **Own your own data:**
 Many networks use your data to make money by analyzing your interactions and using this information to advertise things to you. **Disroot** doesn't use your data for any purpose other than allowing you to connect and use the service.
-Your files on the cloud are encrypted with your user password, every bin-paste and file uploaded on **Lufi** service is client side encrypted too, meaning that even server administrators have no access to your data. Whenever there is a possibility for encryption, we enable it and if it's not possible, we advice to use external encryption software. The less we, as admins, know about your data, the better :D.(_**Tip of the day**: Since your files on **Nextcloud** are encrypted with your user's password, if you forget it you will not be able to access your files again, so **make sure to NEVER lose your password!** (We suggest using a password manager)_) [Read this tutorial](https://howto.disroot.org/en/tutorials/user/account/administration/ussc)
 
 ---
 
@@ -39,4 +39,7 @@ Your files on the cloud are encrypted with your user password, every bin-paste a
 
 At **Disroot** we use 100% free and open source software. This means that the source code (the way the software operates) is publicly accessible. Anyone is able to contribute improvements or adjustments to the software and it can be audited and controlled at any moment - no hidden back-doors or other malicious malware.
 
-We want to be fully transparent and open towards people using our services and therefore we publish information about the current state of the project, the financial status, our plans and ideas. We would also like to hear your suggestions and feedback so we can deliver the best experience possible to all **Disrooters**.
+We want to be fully transparent and open towards people using our services and therefore we publish information about the current state of the project, the financial status, our plans and ideas. We would also like to hear your suggestions and feedback so we can deliver the best experience possible to all **Disrooters**. Find how to reach out to us on our **[contact page](../../contact)**.
+
+<a class="button button1" href="/annual-reports">Read our annual reports</a>
+

pages/02.about/modular.en.md

@@ -1,6 +1,6 @@
 ---
 title: 'About'
-bgcolor: '#FFF'
+bgcolor: 'var(--white)'
 content:
     items: '@self.modular'
     order:
@@ -10,7 +10,6 @@ content:
             - _about-who-and-why
             - _core-team
             - _privacy
-            - _greenenergy
 body_classes: modular
 header_image: about-banner.jpeg
 ---

pages/06.donate/_blue-bar/2col.en.md

@@ -1,14 +1,18 @@
 ---
-title: 'Blue bar'
-bgcolor: '#1F5C60'
-fontcolor: '#FFF'
-text_align: center
+title: 'Stickers'
+bgcolor: 'var(--highlight)'
+fontcolor: 'var(--secondary)'
+text_align: left
+wider_column: none
+top: '-20px'
+margin: '-50px'
+padding: '-50px'
 ---
 
-## We are grateful for your donations and support!
+## We are grateful for your <br>donations and support!
+
+---
 
 With your help, we are getting closer to reaching our goal for financial sustainability, and we prove that a social model of economy is possible.
 
 To thanks those of you that donate at least 10€, we will send a **Disroot stickers pack**. Don't forget to leave, in the reference of your donation, the postal address we should send this to.
-
-![](stickers.png?resize=100%)

pages/06.donate/_donate/2col.en.md

@@ -1,7 +1,7 @@
 ---
 title: Online-donation
-bgcolor: '#1F5C60'
-fontcolor: '#FFF'
+bgcolor: 'var(--secondary)'
+fontcolor: 'var(--white)'
 wider_column: right
 ---
 
@@ -13,24 +13,19 @@ wider_column: right
 #### Online donation:
 
 <div class="donate">
-
 <a href="https://liberapay.com/Disroot/donate" target=_blank><img alt="Donate using Liberapay" src="donate/_donate/lp_button.png" /></a>
-
 <a href="https://www.patreon.com/bePatron?u=8269813" target=_blank><img alt="Become a Patron" src="donate/_donate/p_button.png" /></a>
-
 <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&lc=en&hosted_button_id=AW6EU7E9NN3VQ" target=_blank><img alt="PayPal"  src="donate/_donate/pp_button.png" /></a>
-
 <a href="https://donate.stripe.com/4gweYZfyR6FS3w49AD" target=_blank><img alt="stripe" src="donate/_donate/s_button.png" /></a>
-
 <a href="/cryptocurrency"><img alt="Cryptocurrency" src="donate/_donate/c_button.png" /></a>
-
 </div>
 
 #### Bank transfer:
-<span style="color:#8EB726; font-size:1.8em;"> Stichting Disroot.org <br>
-IBAN: NL19 TRIO 0338 7622 05<br>
+<span style="color:var(--highlight); font-size:1em;"> Stichting Disroot.org
+IBAN: NL19 TRIO 0338 7622 05
 BIC: TRIONL2U
 </span>
 
 
-#### Hardware donation: <span style="color:#8EB726;"> See below </span>
+#### Hardware donation: 
+<span style="color:var(--highlight);"> If you have hardware you think might be useful for Disroot, <br>please contact us at <a href=mailto://support@disroot.org style="color:var(--highlight);"> support@disroot.org </a></span>

pages/06.donate/_goals/fullbar.en.md

@@ -1,8 +1,8 @@
 ---
 title: 'Goals'
-bgcolor: '#FFF'
-fontcolor: '#327E82'
-text_align: left
+bgcolor: 'var(--highlight)'
+fontcolor: 'var(--white)'
+text_align: center
 hide-goals:
     -
         title: 'Share our Good fortune'
@@ -22,4 +22,6 @@ hide-goals:
 
 </div>
 
+<br>
+
 ![](goals.png)

pages/06.donate/_text/2col.en.md

@@ -1,16 +1,19 @@
 ---
 title: Goals
-bgcolor: '#FFF'
-fontcolor: '#1F5C60'
-wider_column: right
+bgcolor: 'var(--white)'
+fontcolor: 'var(--secondary)'
+wider_column: none
+top: '-50px'
 ---
 
-##  <span style="color:#8EB726;"> There's no such thing as a free service on the Internet! </span>
-
----
+##  <span style="color:var(--secondary);"> There's no such thing as <br>a free service on the Internet! </span>
 
 Whether it's the people giving their time to maintain the software or paying for hardware running it, the electricity used to power the machines or the hosting space in the data-center. With the big popular companies that give "free" service, it is most likely your personal user data that is paying the price. Imagine a scope of their operation, the amount of staff, and hardware needed to serve billions of users world-wide. They aren't charity, and yet provide "free" service...
 
+---
+
+##  ##
+
 Disroot.org is run by volunteers and offers all the services free of charge. We do not collect information to sell to advertising companies or government agencies. Thus we must rely on donations and support from users of the services and the community. If you would like to keep the project going and create space for potential new users, you can use any of the methods below to make a financial contribution.
 
 **Remember, any amount of money counts! If all Disrooters would buy us a cup of coffee each month, we could run this service without any financial struggles.**

pages/06.donate/modular.en.md

@@ -1,6 +1,6 @@
 ---
 title: Donate
-bgcolor: '#fff'
+bgcolor: 'var(--white)'
 content:
     items: '@self.modular'
     order:
@@ -8,11 +8,10 @@ content:
         dir: asc
         custom:
             - _donate
+            - _blue-bar
             - _goals
             - _text
-            - _blue-bar
             - _overview
-            - _reports
 body_classes: modular
 header_image: donate-banner.png
 ---

pages/06.donate/reports/3col.en.md

@@ -1,7 +1,7 @@
 ---
 title: 'Annual reports'
-bgcolor: '#FFF'
-fontcolor: '#555'
+bgcolor: 'var(--white)'
+fontcolor: 'var(--text)'
 text_align: center
 ---
 <br>