Make the donation info boxes have the same size when displayed next to each other

Reviewed-on: NewPipe-eV/website#20
Reviewed-by: Tobias <tobigr@noreply.git.newpipe-ev.de>

.gitea/workflows/docker.yml

@@ -18,7 +18,7 @@ jobs:
       contents: read
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Generate suitable tag for kaniko
         id: meta

Dockerfile

@@ -1,4 +1,4 @@
-FROM nginx:1.27.0-alpine
+FROM nginx:1.27.2-alpine
 
 COPY . /usr/share/nginx/html
 
@@ -13,4 +13,4 @@ ADD --chmod=0755 'https://cloud.newpipe-ev.de/remote.php/dav/public-files/TSIDIm
 ADD --chmod=0755 'https://cloud.newpipe-ev.de/remote.php/dav/public-files/TSIDImDtSsyqjOD/2023-12-16_board_protocol.pdf' /usr/share/nginx/html/assets/documents/
 ADD --chmod=0755 'https://cloud.newpipe-ev.de/remote.php/dav/public-files/TSIDImDtSsyqjOD/2024-02-10_plenum_protocol.pdf' /usr/share/nginx/html/assets/documents/
 ADD --chmod=0755 'https://cloud.newpipe-ev.de/remote.php/dav/public-files/TSIDImDtSsyqjOD/2024-06-23_board_protocol.pdf' /usr/share/nginx/html/assets/documents/
-
+ADD --chmod=0755 'https://cloud.newpipe-ev.de/remote.php/dav/public-files/TSIDImDtSsyqjOD/2024-08-20_plenum_protocol.pdf' /usr/share/nginx/html/assets/documents/

assets/css/main.css

@@ -48,6 +48,11 @@ table {
 	border-spacing: 0;
 }
 
+table tr td {
+	padding-left: 0.25cm;
+	padding-right: 0.25cm;
+}
+
 body {
 	-webkit-text-size-adjust: none;
 }
@@ -77,6 +82,23 @@ pre {
   font-family: monospace;
   display: inline;
 }
+
+.my-0 {
+	margin-top: 0 !important;
+	margin-bottom: 0 !important;
+}
+.my-1 {
+	margin-top: 1em;
+	margin-bottom: 1em;
+}
+
+.row-equal-column {
+	display: flex;
+}
+
+.text-center {
+	text-align: center;
+}
 /* Basic */
 
 	html {
@@ -1647,6 +1669,10 @@ pre {
 			margin: 0 0 25px 0;
 		}
 
+		#content .row-equal-column section {
+			height: 100%;
+		}
+
 		#content h2 {
 			font-size: 1.8em;
 			color: #acb4b7;
@@ -1663,7 +1689,11 @@ pre {
 		}
 
 		#content a {
-			color: #A22F1D;
+			color: #f9715c;
+		}
+
+		#content .button-large {
+			color: #fff;
 		}
 
 		#content header {
@@ -1686,7 +1716,7 @@ pre {
 
 	#footer {
 		padding: 45px 0 45px 0;
-		color: #822121;
+		color: #ad0a0a;
 		text-align: center;
 		background: #929ba1;
 	}
@@ -1698,7 +1728,7 @@ pre {
 		}
 
 		#footer a {
-			color: #822121;
+			color: #ad0a0a;
 		}
 
 		#footer .quote-list li {
@@ -1722,13 +1752,13 @@ pre {
 		border-top: solid 1px #616771;
 		text-align: center;
 		padding: 45px 0 80px 0;
-		color: #822121;
+		color: #ad0a0a;
 		font-size: smaller;
 		background: #929ba1;
 	}
 
 		#copyright a {
-			color: #822121;
+			color: #ad0a0a;
 		}
 
 /* Large */

blog.html

@@ -52,6 +52,16 @@
 							</header>
 						</section>
 
+						<section>
+							<a href="./posts/2024-08-20_3rd_plenum.html" class="hidden-blog">
+								<h2>3rd plenum</h2>
+								<h3>20.08.2024</h3>
+								<p class="last-child">
+									On the 20th we had a plenum. Read this post to find the main points and the
+									protocol.
+								</p>
+							</a>
+						</section>
 						<section>
 							<a href="./posts/2024-06-23_3rd_board_meeting.html" class="hidden-blog">
 								<h2>3rd board meeting</h2>

donate.html

@@ -51,35 +51,54 @@
 									<p>
 									You want to donate to our association in order to help further its goals? Thank you!
 									</p>
-										<h3>Current goal</h3>
+									<h3>Current goal</h3>										<p>
-										<p>
+									For the period of July through September 2024, your donations enabled us to <a href="https://newpipe.net/blog/pinned/announcement/schabi-contract/">hire a developer to work on NewPipe</a>. Through increased funding, we hope to provide more long-term and even better support for the NewPipe app in the future.
-										We wish to offer to pay for a developer of TeamNewPipe to start rewriting bigger parts of the app. We are currently investigating how much we need to achieve this goal.
 									</p>
-										<h3>Donate</h3>
+								</section>
-										<div>
-										We use the following means to receive donations:
-										<ul class="standard-list">
-											<li>
-												Via direct debit towards our bank account. This way has the fewest additional charges, so we get the most from your donation!
-												<br />
-												Account holder: NewPipe e.V.
-												<br />
-												IBAN: <pre>DE94 4306 0967 1308 7563 00</pre>
-											</li>
-											<li>Via Liberapay, <a href="https://liberapay.com/NewPipe_e.V./">https://liberapay.com/NewPipe_e.V./</a>.</li>
-											<!-- <li>Via OpenCollective, <a href="https://opencollective.com/lemmy">https://opencollective.com/lemmy</a>. (Potentially tax deductable here?)</li>-->
-										</ul>
 							</div>
-										<h3>
+						</div>
-										Since you're a non-profit, can I get a donation receipt?
+
-										</h3>
+						<div class="row row-equal-column my-0">
+							<div class="col-6 col-12-medium">
+								<section>
+									<h3>Wire transfer</h3>
+									<div>
+										<p>Transferring money to our bank account directly has the fewest additional charges, so we get the most from your donation!</p>
+										<table>
+											<tbody>
+												<tr><td>Account holder: </td><td>NewPipe e.V.</td></tr>
+												<tr><td>IBAN: </td><td><pre>DE94 4306 0967 1308 7563 00</pre></td></tr>
+												<tr><td>BIC: </td><td><pre>GENODEM1GLS</pre></td></tr>
+											</tbody>
+										</table>
+									</div>
+								</section>
+							</div>
+
+							<div class="col-6 col-12-medium">
+								<section>
+									<h3>Liberapay</h3>
+									<div>
+										<p>We also accept recurring donations through PayPal, credit card and direct debit through Liberapay.</p>
+										<div class="text-center">
+											<a class="button-large my-1" href="https://liberapay.com/NewPipe_e.V./">Liberapay</a>
+										</div>
+									</div>
+
+								</section>
+							</div>
+						</div>
+
+						<div class="row my-0">
+							<div class="col-12">
+								<section>
+									<h3>Since you're a non-profit, can I get a donation receipt?</h3>
 									<p>
 											Due to our unique focus, we were not able to register the association as "beneficial to the public", which is a different concept from "non-profit" in Germany. Sadly, we do not get the same tax benefits as an association that "benefits the public" would.<br />
 											Our legal status still prevents profits from being made through this association, though. We have to spend all the money we get towards its goals (and cannot, for example, pay ourselves a salary, sneakily buy stocks to make more money, or, heaven forbid, invest in cryptocurrencies).
 									</p>
 										
 								</section>
-
 							</div>
 						</div>
 					</div>

index.html

@@ -104,6 +104,21 @@
 		<section id="content">
 			<div class="container">
 				<div class="row aln-center">
+					<div class="col-3 col-6-medium col-12-small">
+						<a href="./posts/2024-08-20_3rd_plenum.html" class="hidden">
+							<!-- Feature #2 -->
+							<section>
+								<div href="#" class="bordered-feature-image"><img src="images/meeting.jpg" alt="" />
+								</div>
+								<h2>3rd plenum</h2>
+								<h4>20.08.2024</h4>
+								<p class="hide-a">
+									On the 20th of August 2024 we had a plenum. Read this post to find the main points
+									and the meeting protocol.
+								</p>
+							</section>
+						</a>
+					</div>
 					<div class="col-3 col-6-medium col-12-small">
 						<a href="./posts/2024-06-23_3rd_board_meeting.html" class="hidden">
 							<!-- Feature #1 -->
@@ -148,22 +163,6 @@
 							</section>
 						</a>
 					</div>
-					<div class="col-3 col-6-medium col-12-small">
-						<a href="./posts/2023-12-19_1st_plenum_2nd_board_meeting.html" class="hidden">
-							<!-- Feature #3 -->
-							<section>
-								<div href="#" class="bordered-feature-image"><img src="images/meeting.jpg" alt="" />
-								</div>
-								<h2>1st plenum, 2nd board meeting</h2>
-								<h4>19.12.2023</h4>
-								<p class="hide-a">
-									On the 16th of December 2023, we had two association-wide meetings. Read this post
-									to find the minutes and the meeting protocols.
-								</p>
-							</section>
-
-						</a>
-					</div>
 				</div>
 			</div>
 		</section>

posts/2022-11-05_founded.html

@@ -49,6 +49,7 @@
 											<h2>Blog posts</h2>
 										</header>
 										<ul class="link-list">
+											<li><a href="./2024-08-20_3rd_plenum.html">3rd plenum</a></li>
 											<li><a href="./2024-06-23_3rd_board_meeting.html">3rd board meeting</a></li>
 											<li><a href="./2024-04-22_weblate_donation.html">Donation to Weblate</a></li>
 											<li><a href="./2024-02-10_2nd_plenum.html">2nd plenum</a></li>

posts/2023-07-13_1st_board_meeting.html

@@ -49,6 +49,7 @@
 											<h2>Blog posts</h2>
 										</header>
 										<ul class="link-list">
+											<li><a href="./2024-08-20_3rd_plenum.html">3rd plenum</a></li>
 											<li><a href="./2024-06-23_3rd_board_meeting.html">3rd board meeting</a></li>
 											<li><a href="./2024-04-22_weblate_donation.html">Donation to Weblate</a></li>
 											<li><a href="./2024-02-10_2nd_plenum.html">2nd plenum</a></li>

posts/2023-12-18_pseudonyms.html

@@ -49,6 +49,7 @@
 											<h2>Blog posts</h2>
 										</header>
 										<ul class="link-list">
+											<li><a href="./2024-08-20_3rd_plenum.html">3rd plenum</a></li>
 											<li><a href="./2024-06-23_3rd_board_meeting.html">3rd board meeting</a></li>
 											<li><a href="./2024-04-22_weblate_donation.html">Donation to Weblate</a></li>
 											<li><a href="./2024-02-10_2nd_plenum.html">2nd plenum</a></li>

posts/2023-12-19_1st_plenum_2nd_board_meeting.html

@@ -49,6 +49,7 @@
 											<h2>Blog posts</h2>
 										</header>
 										<ul class="link-list">
+											<li><a href="./2024-08-20_3rd_plenum.html">3rd plenum</a></li>
 											<li><a href="./2024-06-23_3rd_board_meeting.html">3rd board meeting</a></li>
 											<li><a href="./2024-04-22_weblate_donation.html">Donation to Weblate</a></li>
 											<li><a href="./2024-02-10_2nd_plenum.html">2nd plenum</a></li>

posts/2024-02-10_2nd_plenum.html

@@ -49,6 +49,7 @@
 											<h2>Blog posts</h2>
 										</header>
 										<ul class="link-list">
+											<li><a href="./2024-08-20_3rd_plenum.html">3rd plenum</a></li>
 											<li><a href="./2024-06-23_3rd_board_meeting.html">3rd board meeting</a></li>
 											<li><a href="./2024-04-22_weblate_donation.html">Donation to Weblate</a></li>
 											<li><strong><a href="./2024-02-10_2nd_plenum.html">2nd plenum</a></strong></li>

posts/2024-04-22_weblate_donation.html

@@ -49,6 +49,7 @@
 											<h2>Blog posts</h2>
 										</header>
 										<ul class="link-list">
+											<li><a href="./2024-08-20_3rd_plenum.html">3rd plenum</a></li>
 											<li><a href="./2024-06-23_3rd_board_meeting.html">3rd board meeting</a></li>
 											<li><strong><a href="./2024-04-22_weblate_donation.html">Donation to Weblate</a></strong></li>
 											<li><a href="./2024-02-10_2nd_plenum.html">2nd plenum</a></li>

posts/2024-06-23_3rd_board_meeting.html

@@ -49,6 +49,7 @@
 											<h2>Blog posts</h2>
 										</header>
 										<ul class="link-list">
+											<li><a href="./2024-08-20_3rd_plenum.html">3rd plenum</a></li>
 											<li><strong><a href="./2024-06-23_3rd_board_meeting.html">3rd board meeting</a></strong></li>
 											<li><a href="./2024-04-22_weblate_donation.html">Donation to Weblate</a></li>
 											<li><a href="./2024-02-10_2nd_plenum.html">2nd plenum</a></li>

posts/2024-08-20_3rd_plenum.html

@@ -0,0 +1,125 @@
+<!DOCTYPE HTML>
+<!--
+	Halcyonic by HTML5 UP
+	html5up.net | @ajlkn
+	Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
+-->
+<html lang="en">
+	<head>
+		<title>NewPipe&nbsp;e.V.</title>
+		<meta charset="utf-8" />
+		<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no" />
+		<link rel="stylesheet" href="../assets/css/main.css" />
+	</head>
+	<body class="subpage">
+		<div id="page-wrapper">
+
+			<!-- Header -->
+				<section id="header">
+				  <div class="container">
+            <div class="row">
+	            <div class="col-12">
+
+		            <!-- Logo -->
+			            <h1><a href="../index.html" id="logo">NewPipe&nbsp;e.V.</a></h1>
+
+		            <!-- Nav -->
+			            <nav id="nav">
+				            <a href="../about.html">About</a>
+				            <a href="../join.html">Join us</a>
+				            <a href="../blog.html">Blog</a>
+				            <a href="../donate.html" class="button-large">Donate</a>
+			            </nav>
+
+
+	            </div>
+            </div>
+          </div>
+				</section>
+
+			<!-- Content -->
+				<section id="content">
+					<div class="container">
+						<div class="row">
+							<div class="col-3 col-12-medium">
+
+								<!-- Sidebar -->
+									<section>
+										<header>
+											<h2>Blog posts</h2>
+										</header>
+										<ul class="link-list">
+											<li><strong><a href="./2024-08-20_3rd_plenum.html">3rd plenum</a></strong></li>
+											<li><a href="./2024-06-23_3rd_board_meeting.html">3rd board meeting</a></li>
+											<li><a href="./2024-04-22_weblate_donation.html">Donation to Weblate</a></li>
+											<li><a href="./2024-02-10_2nd_plenum.html">2nd plenum</a></li>
+											<li><a href="./2023-12-19_1st_plenum_2nd_board_meeting.html">1st plenum, 2nd board meeting</a></li>
+											<li><a href="./2023-12-18_pseudonyms.html">Pseudonyms</a></li>
+											<li><a href="./2023-07-13_1st_board_meeting.html">1st board meeting</a></li>
+											<li><a href="./2022-11-05_founded.html">We are founded!</a></li>
+										</ul>
+									</section>
+
+							</div>
+							<div class="col-9 col-12-medium imp-medium">
+
+								<!-- Main Content -->
+									<section>
+										<header>
+											<h2>3rd plenum</h2>
+											<h3>20.08.2024</h3>
+										</header>
+										<p>
+										Today we had our third plenum meeting. The full protocol can be found <a href="../assets/documents/2024-08-20_plenum_protocol.pdf">here</a>.
+										</p>
+
+										<p>
+										This meeting was held primarily to devise a budget plan for the last four months of 2024, and to
+										discuss whether to register a trademark for NewPipe.
+										</p>
+
+										<p>
+										The agreed-upon budget plan includes paying someone to work on NewPipe (possibly extending Schabi's contract),
+										improving the IT infrastructure with better hardware and possibly by hiring someone, allowing e.V. members to
+										participate to conferences (e.g. FOSDEM), buying some merch (stickers and T-Shirts) for e.V. members and
+										NewPipe contributors, lending hardware to NewPipe contributors, and donating 300€/year to LiberaPay.
+										</p>
+
+										<p>
+										The assembly also agreed to register a trademark for the "NewPipe" name.
+										</p>
+									</section>
+
+							</div>
+						</div>
+					</div>
+				</section>
+
+			<!-- Footer -->
+				<section id="footer">
+	        <div class="container">
+		        <div class="row aln-center">
+		          <div class="col-12">
+			          <a href="https://git.newpipe-ev.de/NewPipe-eV/website">Website repository</a> |
+			          <a href="../contact.html">Contact</a> | <a href="../license.html">Licensing</a> | <a href="../privacy.html">Privacy Policy</a> | <a href="../credits.html">Credits</a> | <a href="../imprint.html">Imprint</a> 
+		          </div>
+		        </div>
+	        </div>
+        </section>
+
+        <!-- Copyright -->
+        <div id="copyright">
+	        Copyright &copy; NewPipe&nbsp;e.V., all rights reserved. | Design: <a href="https://html5up.net">HTML5 UP</a>
+        </div>
+
+		</div>
+
+		<!-- Scripts -->
+			<script src="../assets/js/jquery.min.js"></script>
+			<script src="../assets/js/browser.min.js"></script>
+			<script src="../assets/js/breakpoints.min.js"></script>
+			<script src="../assets/js/util.js"></script>
+			<script src="../assets/js/main.js"></script>
+
+	</body>
+</html>