Compare commits

..

1 Commits

Author SHA1 Message Date
Tobias 710255e614
Make the donation info boxes have the same size when displayed next to each other
Build and publish Docker image / build (push) Successful in 24s Details
Build and publish Docker image / build (pull_request) Successful in 22s Details
2024-08-25 19:49:12 +02:00
15 changed files with 61 additions and 173 deletions

View File

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

View File

@ -1,4 +1,4 @@
FROM nginx:1.27.1-alpine FROM nginx:1.27.0-alpine
COPY . /usr/share/nginx/html 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/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-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-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/

View File

@ -82,6 +82,23 @@ pre {
font-family: monospace; font-family: monospace;
display: inline; 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 */ /* Basic */
html { html {
@ -1652,6 +1669,10 @@ pre {
margin: 0 0 25px 0; margin: 0 0 25px 0;
} }
#content .row-equal-column section {
height: 100%;
}
#content h2 { #content h2 {
font-size: 1.8em; font-size: 1.8em;
color: #acb4b7; color: #acb4b7;

View File

@ -52,16 +52,6 @@
</header> </header>
</section> </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> <section>
<a href="./posts/2024-06-23_3rd_board_meeting.html" class="hidden-blog"> <a href="./posts/2024-06-23_3rd_board_meeting.html" class="hidden-blog">
<h2>3rd board meeting</h2> <h2>3rd board meeting</h2>

View File

@ -56,32 +56,40 @@
</p> </p>
</section> </section>
</div> </div>
</div>
<div class="row row-equal-column my-0">
<div class="col-6 col-12-medium"> <div class="col-6 col-12-medium">
<section> <section>
<h3>Wire transfer</h3> <h3>Wire transfer</h3>
<p> <div>
Transferring money to our bank account directly has the fewest additional charges, so we get the most from your donation! <p>Transferring money to our bank account directly has the fewest additional charges, so we get the most from your donation!</p>
<center><table> <table>
<tr><td> <tbody>
Account holder: <td> NewPipe e.V. <tr><td>Account holder: </td><td>NewPipe e.V.</td></tr>
<tr><td> <tr><td>IBAN: </td><td><pre>DE94 4306 0967 1308 7563 00</pre></td></tr>
IBAN: <td><pre>DE94 4306 0967 1308 7563 00</pre> <tr><td>BIC: </td><td><pre>GENODEM1GLS</pre></td></tr>
<tr><td> </tbody>
BIC: <td><pre>GENODEM1GLS</pre> </table>
</table></center> </div>
</section> </section>
</div> </div>
<div class="col-6 col-12-medium"> <div class="col-6 col-12-medium">
<section> <section>
<h3>Liberapay</h3> <h3>Liberapay</h3>
<p> <div>
We also accept recurring donations through PayPal, credit card and direct debit through Liberapay. <p>We also accept recurring donations through PayPal, credit card and direct debit through Liberapay.</p>
<center><a class="button-large" href="https://liberapay.com/NewPipe_e.V./">Liberapay</a></center> <div class="text-center">
<a class="button-large my-1" href="https://liberapay.com/NewPipe_e.V./">Liberapay</a>
</div>
</div>
</section> </section>
</div> </div>
</div>
<div class="row my-0">
<div class="col-12"> <div class="col-12">
<section> <section>
<h3>Since you're a non-profit, can I get a donation receipt?</h3> <h3>Since you're a non-profit, can I get a donation receipt?</h3>

View File

@ -104,21 +104,6 @@
<section id="content"> <section id="content">
<div class="container"> <div class="container">
<div class="row aln-center"> <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"> <div class="col-3 col-6-medium col-12-small">
<a href="./posts/2024-06-23_3rd_board_meeting.html" class="hidden"> <a href="./posts/2024-06-23_3rd_board_meeting.html" class="hidden">
<!-- Feature #1 --> <!-- Feature #1 -->
@ -163,6 +148,22 @@
</section> </section>
</a> </a>
</div> </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>
</div> </div>
</section> </section>

View File

@ -49,7 +49,6 @@
<h2>Blog posts</h2> <h2>Blog posts</h2>
</header> </header>
<ul class="link-list"> <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-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-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="./2024-02-10_2nd_plenum.html">2nd plenum</a></li>

View File

@ -49,7 +49,6 @@
<h2>Blog posts</h2> <h2>Blog posts</h2>
</header> </header>
<ul class="link-list"> <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-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-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="./2024-02-10_2nd_plenum.html">2nd plenum</a></li>

View File

@ -49,7 +49,6 @@
<h2>Blog posts</h2> <h2>Blog posts</h2>
</header> </header>
<ul class="link-list"> <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-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-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="./2024-02-10_2nd_plenum.html">2nd plenum</a></li>

View File

@ -49,7 +49,6 @@
<h2>Blog posts</h2> <h2>Blog posts</h2>
</header> </header>
<ul class="link-list"> <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-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-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="./2024-02-10_2nd_plenum.html">2nd plenum</a></li>

View File

@ -49,7 +49,6 @@
<h2>Blog posts</h2> <h2>Blog posts</h2>
</header> </header>
<ul class="link-list"> <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-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-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> <li><strong><a href="./2024-02-10_2nd_plenum.html">2nd plenum</a></strong></li>

View File

@ -49,7 +49,6 @@
<h2>Blog posts</h2> <h2>Blog posts</h2>
</header> </header>
<ul class="link-list"> <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-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><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> <li><a href="./2024-02-10_2nd_plenum.html">2nd plenum</a></li>

View File

@ -49,7 +49,6 @@
<h2>Blog posts</h2> <h2>Blog posts</h2>
</header> </header>
<ul class="link-list"> <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><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-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="./2024-02-10_2nd_plenum.html">2nd plenum</a></li>

View File

@ -1,125 +0,0 @@
<!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>