Compare commits

...

7 commits

Author SHA1 Message Date
b0a19cd9a0 Update nginx Docker tag to v1.26.0
All checks were successful
Build and publish Docker image / build (push) Successful in 15s
2024-05-19 22:25:43 +00:00
7ab2beab3c
Link to HTML5 UP using https and not insecure http
All checks were successful
Build and publish Docker image / build (push) Successful in 17s
sed -i 's/http:\/\//https:\/\//' *.html
2024-05-19 21:51:48 +02:00
1e27af7702
Delete unused template file onecolumn.html 2024-05-19 21:51:48 +02:00
f3a80c95b9
Add lang attribute to html tag
All checks were successful
Build and publish Docker image / build (push) Successful in 17s
Remove empty h3 tag
Use valid HTML
2024-05-19 21:21:37 +02:00
2830300fc4
Add .idea dir to .gitignore
All checks were successful
Build and publish Docker image / build (push) Successful in 17s
2024-05-19 21:09:45 +02:00
e2e05f24bf Automatically redeploy website upon pushes to main
All checks were successful
Build and publish Docker image / build (push) Successful in 17s
2024-05-19 20:42:27 +02:00
b05d1729bc
Remove unused template files
All checks were successful
Build and publish Docker image / build (push) Successful in 15s
2024-05-19 19:14:13 +02:00
22 changed files with 43 additions and 893 deletions

View file

@ -38,3 +38,11 @@ jobs:
labels: ${{ steps.meta.outputs.labels }}
platforms: |
linux/amd64
- name: Trigger redeployment
if: gitea.ref == 'refs/heads/main'
env:
UPDATE_URL: ${{ secrets.UPDATE_URL }}
UPDATE_TOKEN: ${{ secrets.UPDATE_TOKEN }}
run: |
curl "$UPDATE_URL" -H "Authorization: Bearer ${UPDATE_TOKEN}"

2
.gitignore vendored
View file

@ -1,2 +1,4 @@
docker-compose.yml*
!docker-compose.yml.example
.idea/

View file

@ -1,4 +1,4 @@
FROM nginx:1.25.5-alpine
FROM nginx:1.26.0-alpine
COPY . /usr/share/nginx/html

View file

@ -4,7 +4,7 @@
html5up.net | @ajlkn
Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
-->
<html>
<html lang="en">
<head>
<title>NewPipe e.&nbsp;V.</title>
<meta charset="utf-8" />
@ -153,7 +153,7 @@
<!-- Copyright -->
<div id="copyright">
Copyright &copy; NewPipe e.&nbsp;V., all rights reserved. | Design: <a href="http://html5up.net">HTML5 UP</a>
Copyright &copy; NewPipe e.&nbsp;V., all rights reserved. | Design: <a href="https://html5up.net">HTML5 UP</a>
</div>
</div>

View file

@ -4,7 +4,7 @@
html5up.net | @ajlkn
Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
-->
<html>
<html lang="en">
<head>
<title>NewPipe e.V.</title>
<meta charset="utf-8" />
@ -114,7 +114,7 @@
<!-- Copyright -->
<div id="copyright">
Copyright &copy; NewPipe e.&nbsp;V., all rights reserved. | Design: <a href="http://html5up.net">HTML5 UP</a>
Copyright &copy; NewPipe e.&nbsp;V., all rights reserved. | Design: <a href="https://html5up.net">HTML5 UP</a>
</div>
</div>

View file

@ -4,7 +4,7 @@
html5up.net | @ajlkn
Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
-->
<html>
<html lang="en">
<head>
<title>NewPipe e.V.</title>
<meta charset="utf-8" />
@ -47,7 +47,6 @@
<section>
<header>
<h2>Contact</h2>
<h3></h3>
</header>
<p>
For press inquiries please contact the board via email: <a href="mailto:newpipe-ev@mailbox.org?subject=Press inquiry">board@newpipe-ev.de</a>.
@ -76,7 +75,7 @@
<!-- Copyright -->
<div id="copyright">
Copyright &copy; NewPipe e.&nbsp;V., all rights reserved. | Design: <a href="http://html5up.net">HTML5 UP</a>
Copyright &copy; NewPipe e.&nbsp;V., all rights reserved. | Design: <a href="https://html5up.net">HTML5 UP</a>
</div>
</div>

View file

@ -4,7 +4,7 @@
html5up.net | @ajlkn
Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
-->
<html>
<html lang="en">
<head>
<title>NewPipe e.V.</title>
<meta charset="utf-8" />
@ -84,7 +84,7 @@
<!-- Copyright -->
<div id="copyright">
Copyright &copy; NewPipe e.&nbsp;V., all rights reserved. | Design: <a href="http://html5up.net">HTML5 UP</a>
Copyright &copy; NewPipe e.&nbsp;V., all rights reserved. | Design: <a href="https://html5up.net">HTML5 UP</a>
</div>
</div>

View file

@ -4,7 +4,7 @@
html5up.net | @ajlkn
Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
-->
<html>
<html lang="en">
<head>
<title>NewPipe e.V.</title>
<meta charset="utf-8" />
@ -95,7 +95,7 @@
<!-- Copyright -->
<div id="copyright">
Copyright &copy; NewPipe e.&nbsp;V., all rights reserved. | Design: <a href="http://html5up.net">HTML5 UP</a>
Copyright &copy; NewPipe e.&nbsp;V., all rights reserved. | Design: <a href="https://html5up.net">HTML5 UP</a>
</div>
</div>

View file

@ -4,7 +4,7 @@
html5up.net | @ajlkn
Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
-->
<html>
<html lang="en">
<head>
<title>NewPipe e.V.</title>
<meta charset="utf-8" />
@ -150,7 +150,7 @@
<!-- Copyright -->
<div id="copyright">
Copyright &copy; NewPipe e.&nbsp;V., all rights reserved. | Design: <a href="http://html5up.net">HTML5 UP</a>
Copyright &copy; NewPipe e.&nbsp;V., all rights reserved. | Design: <a href="https://html5up.net">HTML5 UP</a>
</div>
</div>

View file

@ -4,7 +4,7 @@
html5up.net | @ajlkn
Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
-->
<html>
<html lang="en">
<head>
<title>NewPipe e.&nbsp;V.</title>
<meta charset="utf-8" />
@ -171,7 +171,7 @@
<!-- Copyright -->
<div id="copyright">
Copyright &copy; NewPipe e.&nbsp;V., all rights reserved. | Design: <a href="http://html5up.net">HTML5 UP</a>
Copyright &copy; NewPipe e.&nbsp;V., all rights reserved. | Design: <a href="https://html5up.net">HTML5 UP</a>
</div>
</div>

View file

@ -4,7 +4,7 @@
html5up.net | @ajlkn
Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
-->
<html>
<html lang="en">
<head>
<title>NewPipe e.V.</title>
<meta charset="utf-8" />
@ -84,7 +84,7 @@
<!-- Copyright -->
<div id="copyright">
Copyright &copy; NewPipe e.&nbsp;V., all rights reserved. | Design: <a href="http://html5up.net">HTML5 UP</a>
Copyright &copy; NewPipe e.&nbsp;V., all rights reserved. | Design: <a href="https://html5up.net">HTML5 UP</a>
</div>
</div>

View file

@ -4,7 +4,7 @@
html5up.net | @ajlkn
Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
-->
<html>
<html lang="en">
<head>
<title>NewPipe e.V.</title>
<meta charset="utf-8" />
@ -68,8 +68,6 @@ Authors who contribute media to this repository declare their agreement that the
You can fetch a copy from the "licenses" directory inside this repository as well as from the <a href="https://opensource.org/license/mit/">Open Source Initiative's homepage</a>.<br />
Authors who contribute source code to this repository declare their agreement that their contribution will be licensed under the terms of the MIT license. They further declare that they own the intellectual property, or have been authorized by the respective owner.
</p>
<h3>
<h3>
</section>
</div>
@ -91,7 +89,7 @@ Authors who contribute source code to this repository declare their agreement th
<!-- Copyright -->
<div id="copyright">
Copyright &copy; NewPipe e.&nbsp;V., all rights reserved. | Design: <a href="http://html5up.net">HTML5 UP</a>
Copyright &copy; NewPipe e.&nbsp;V., all rights reserved. | Design: <a href="https://html5up.net">HTML5 UP</a>
</div>
</div>

View file

@ -1,187 +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>
<head>
<title>One Column - Halcyonic by HTML5 UP</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">Halcyonic</a></h1>
<!-- Nav -->
<nav id="nav">
<a href="index.html">Homepage</a>
<a href="threecolumn.html">Three Column</a>
<a href="twocolumn1.html">Two Column #1</a>
<a href="twocolumn2.html">Two Column #2</a>
<a href="onecolumn.html">One Column</a>
</nav>
</div>
</div>
</div>
</section>
<!-- Content -->
<section id="content">
<div class="container">
<div class="row">
<div class="col-12">
<!-- Main Content -->
<section>
<header>
<h2>One Column</h2>
<h3>A generic one column layout</h3>
</header>
<p>
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc quam metus, congue
vel suscipit ut, dignissim non risus. Vestibulum ante est, fringilla nec placerat
eu, vestibulum vitae diam. Integer eget egestas eros. Duis enim erat, mollis quis
lacinia eget, blandit nec ipsum. Donec vitae turpis ipsum. Aliquam mauris libero,
sagittis in eleifend at, mattis imperdiet velit. Donec urna risus, rutrum molestie
varius ac, lacinia sit amet augue. Nam ultrices elementum eros.
</p>
<p>
Sed faucibus viverra ligula, non varius magna semper vitae. Donec eu justo ut ipsum
hendrerit congue nec eu risus. Cum sociis natoque penatibus et magnis dis parturient
montes, nascetur ridiculus mus. Lorem ipsum dolor sit amet, consectetur adipiscing
egestas tempus. Cras convallis odio sit amet risus convallis porttitor. Integer
vehicula fermentum ligula at pretium. Suspendisse semper iaculis eros, eu aliquam
justo imperdiet vel. Proin nec dictum mi. Duis commodo enim non tellus interdum
elit. Suspendisse fermentum adipiscing nisi, a tempor libero malesuada at. Morbi
lacinia dui adipiscing risus eleifend tincidunt. Proin eu mauris eu tellus eleifend
hendrerit.
</p>
<p>
Mauris sit amet tellus urna. In facilisis, tortor vitae ultricies egestas, odio
mi rhoncus arcu, quis euismod felis felis et velit. Mauris varius consectetur erat
egestas tempus. Cras convallis odio sit amet risus convallis porttitor. Integer
vehicula fermentum ligula at pretium. Suspendisse semper iaculis eros, eu aliquam
justo imperdiet vel. Proin nec dictum mi. Duis commodo enim non tellus interdum
iaculis. Phasellus ultrices diam sit amet orci lacinia sed consequat dui auctor.
</p>
<p>
Sed faucibus viverra ligula, non varius magna semper vitae. Donec eu justo ut ipsum
hendrerit congue nec eu risus. Cum sociis natoque penatibus et magnis dis parturient
montes, nascetur ridiculus mus. Lorem ipsum dolor sit amet, consectetur adipiscing
egestas tempus. Cras convallis odio sit amet risus convallis porttitor. Integer
vehicula fermentum ligula at pretium. Suspendisse semper iaculis eros, eu aliquam
justo imperdiet vel. Proin nec dictum mi. Duis commodo enim non tellus interdum
elit. Suspendisse fermentum adipiscing nisi, a tempor libero malesuada at. Morbi
lacinia dui adipiscing risus eleifend tincidunt. Proin eu mauris eu tellus eleifend
hendrerit.
</p>
<p>
Mauris sit amet tellus urna. In facilisis, tortor vitae ultricies egestas, odio
mi rhoncus arcu, quis euismod felis felis et velit. Mauris varius consectetur erat
egestas tempus. Cras convallis odio sit amet risus convallis porttitor. Integer
vehicula fermentum ligula at pretium. Suspendisse semper iaculis eros, eu aliquam
justo imperdiet vel. Proin nec dictum mi. Duis commodo enim non tellus interdum
iaculis. Phasellus ultrices diam sit amet orci lacinia sed consequat dui auctor.
</p>
</section>
<section><h1>test2</section>
</div>
</div>
</div>
</section>
<!-- Footer -->
<section id="footer">
<div class="container">
<div class="row">
<div class="col-8 col-12-medium">
<!-- Links -->
<section>
<h2>Links to Important Stuff</h2>
<div>
<div class="row">
<div class="col-3 col-12-small">
<ul class="link-list last-child">
<li><a href="#">Neque amet dapibus</a></li>
<li><a href="#">Sed mattis quis rutrum</a></li>
<li><a href="#">Accumsan suspendisse</a></li>
<li><a href="#">Eu varius vitae magna</a></li>
</ul>
</div>
<div class="col-3 col-12-small">
<ul class="link-list last-child">
<li><a href="#">Neque amet dapibus</a></li>
<li><a href="#">Sed mattis quis rutrum</a></li>
<li><a href="#">Accumsan suspendisse</a></li>
<li><a href="#">Eu varius vitae magna</a></li>
</ul>
</div>
<div class="col-3 col-12-small">
<ul class="link-list last-child">
<li><a href="#">Neque amet dapibus</a></li>
<li><a href="#">Sed mattis quis rutrum</a></li>
<li><a href="#">Accumsan suspendisse</a></li>
<li><a href="#">Eu varius vitae magna</a></li>
</ul>
</div>
<div class="col-3 col-12-small">
<ul class="link-list last-child">
<li><a href="#">Neque amet dapibus</a></li>
<li><a href="#">Sed mattis quis rutrum</a></li>
<li><a href="#">Accumsan suspendisse</a></li>
<li><a href="#">Eu varius vitae magna</a></li>
</ul>
</div>
</div>
</div>
</section>
</div>
<div class="col-4 col-12-medium imp-medium">
<!-- Blurb -->
<section>
<h2>An Informative Text Blurb</h2>
<p>
Duis neque nisi, dapibus sed mattis quis, rutrum accumsan sed. Suspendisse eu
varius nibh. Suspendisse vitae magna eget odio amet mollis. Duis neque nisi,
dapibus sed mattis quis, sed rutrum accumsan sed. Suspendisse eu varius nibh
lorem ipsum amet dolor sit amet lorem ipsum consequat gravida justo mollis.
</p>
</section>
</div>
</div>
</div>
</section>
<!-- Copyright -->
<div id="copyright">
&copy; Untitled. All rights reserved. | Design: <a href="http://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>

View file

@ -4,7 +4,7 @@
html5up.net | @ajlkn
Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
-->
<html>
<html lang="en">
<head>
<title>NewPipe e.V.</title>
<meta charset="utf-8" />
@ -90,7 +90,7 @@
<!-- Copyright -->
<div id="copyright">
Copyright &copy; NewPipe e.&nbsp;V., all rights reserved. | Design: <a href="http://html5up.net">HTML5 UP</a>
Copyright &copy; NewPipe e.&nbsp;V., all rights reserved. | Design: <a href="https://html5up.net">HTML5 UP</a>
</div>
</div>

View file

@ -4,7 +4,7 @@
html5up.net | @ajlkn
Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
-->
<html>
<html lang="en">
<head>
<title>NewPipe e.V.</title>
<meta charset="utf-8" />
@ -96,7 +96,7 @@
<!-- Copyright -->
<div id="copyright">
Copyright &copy; NewPipe e.&nbsp;V., all rights reserved. | Design: <a href="http://html5up.net">HTML5 UP</a>
Copyright &copy; NewPipe e.&nbsp;V., all rights reserved. | Design: <a href="https://html5up.net">HTML5 UP</a>
</div>
</div>

View file

@ -4,7 +4,7 @@
html5up.net | @ajlkn
Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
-->
<html>
<html lang="en">
<head>
<title>NewPipe e.V.</title>
<meta charset="utf-8" />
@ -93,7 +93,7 @@
<!-- Copyright -->
<div id="copyright">
Copyright &copy; NewPipe e.&nbsp;V., all rights reserved. | Design: <a href="http://html5up.net">HTML5 UP</a>
Copyright &copy; NewPipe e.&nbsp;V., all rights reserved. | Design: <a href="https://html5up.net">HTML5 UP</a>
</div>
</div>

View file

@ -4,7 +4,7 @@
html5up.net | @ajlkn
Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
-->
<html>
<html lang="en">
<head>
<title>NewPipe e.V.</title>
<meta charset="utf-8" />
@ -96,7 +96,7 @@
<!-- Copyright -->
<div id="copyright">
Copyright &copy; NewPipe e.&nbsp;V., all rights reserved. | Design: <a href="http://html5up.net">HTML5 UP</a>
Copyright &copy; NewPipe e.&nbsp;V., all rights reserved. | Design: <a href="https://html5up.net">HTML5 UP</a>
</div>
</div>

View file

@ -4,7 +4,7 @@
html5up.net | @ajlkn
Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
-->
<html>
<html lang="en">
<head>
<title>NewPipe e.V.</title>
<meta charset="utf-8" />
@ -93,7 +93,7 @@
<!-- Copyright -->
<div id="copyright">
Copyright &copy; NewPipe e.&nbsp;V., all rights reserved. | Design: <a href="http://html5up.net">HTML5 UP</a>
Copyright &copy; NewPipe e.&nbsp;V., all rights reserved. | Design: <a href="https://html5up.net">HTML5 UP</a>
</div>
</div>

View file

@ -4,7 +4,7 @@
html5up.net | @ajlkn
Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
-->
<html>
<html lang="en">
<head>
<title>NewPipe e.V.</title>
<meta charset="utf-8" />
@ -56,6 +56,7 @@
<p>
To have a minimum of control in scenarios where our website is abused, for example denial-of-service attacks, we configured our webserver to create a so-called acces log. This log file contains a list of all requests made to this server, each request in a separate line.<br />
The logged lines contain the following information:
</p>
<ul class="standard-list">
<li>the IP address that was used to make the request</li>
<li>a timestamp</li>
@ -67,10 +68,9 @@ We need to keep logs of the IP addresses sending requests to our server. As IP a
We calculate prefixes of the IP addresses to anonymize them as follows:<br />
<ul class="standard-list">
<li>For IPv4 addresses, we remove the last two bytes to anonymize them. For example, an IP address such as <pre>12.34.56.78</pre> would be logged as <pre>12.34.0.0.</pre></li>
<li>For IPv6 addresses, we remove all bytes but the first two. For example, an IP address such as <pre>2001:db8:85a3:8d3:1319:8a2e:370:7344</pre> would be logged as <pre>2001:db8:0:0:0:0:0:0<pre> (short <pre>2001:0db8::</pre>).</li>
<li>For IPv6 addresses, we remove all bytes but the first two. For example, an IP address such as <pre>2001:db8:85a3:8d3:1319:8a2e:370:7344</pre> would be logged as <pre>2001:db8:0:0:0:0:0:0</pre> (short <pre>2001:0db8::</pre>).</li>
</ul>
We can not identify users from combinations of the other data. Therefore, we consider our log anonymized.
</p>
</section>
</div>
@ -92,7 +92,7 @@ We can not identify users from combinations of the other data. Therefore, we con
<!-- Copyright -->
<div id="copyright">
Copyright &copy; NewPipe e.&nbsp;V., all rights reserved. | Design: <a href="http://html5up.net">HTML5 UP</a>
Copyright &copy; NewPipe e.&nbsp;V., all rights reserved. | Design: <a href="https://html5up.net">HTML5 UP</a>
</div>
</div>

View file

@ -1,232 +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>
<head>
<title>Three Column - Halcyonic by HTML5 UP</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">Halcyonic</a></h1>
<!-- Nav -->
<nav id="nav">
<a href="index.html">Homepage</a>
<a href="threecolumn.html">Three Column</a>
<a href="twocolumn1.html">Two Column #1</a>
<a href="twocolumn2.html">Two Column #2</a>
<a href="onecolumn.html">One Column</a>
</nav>
</div>
</div>
</div>
</section>
<!-- Content -->
<section id="content">
<div class="container">
<div class="row">
<div class="col-3 col-12-medium">
<!-- Left Sidebar -->
<section>
<header>
<h2>Ipsum Dolor</h2>
</header>
<p>
Vehicula fermentum ligula at pretium. Suspendisse semper iaculis eros, eu aliquam
iaculis. Phasellus ultrices diam sit amet orci lacinia sed consequat.
</p>
<ul class="link-list">
<li><a href="#">Sed dolore viverra</a></li>
<li><a href="#">Ligula non varius</a></li>
<li><a href="#">Dis parturient montes</a></li>
<li><a href="#">Nascetur ridiculus</a></li>
</ul>
</section>
<section>
<header>
<h2>Magna Phasellus</h2>
</header>
<ul class="link-list">
<li><a href="#">Sed dolore viverra</a></li>
<li><a href="#">Ligula non varius</a></li>
<li><a href="#">Nec sociis natoque</a></li>
<li><a href="#">Penatibus et magnis</a></li>
<li><a href="#">Dis parturient montes</a></li>
<li><a href="#">Nascetur ridiculus</a></li>
</ul>
</section>
</div>
<div class="col-6 col-12-medium imp-medium">
<!-- Main Content -->
<section>
<header>
<h2>Three Column</h2>
<h3>A generic three column layout</h3>
</header>
<p>
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc quam metus, congue
vel suscipit ut, dignissim non risus. Vestibulum ante est, fringilla nec placerat
eu, vestibulum vitae diam. Integer eget egestas eros. Duis enim erat, mollis quis
lacinia eget, blandit nec ipsum. Donec vitae turpis ipsum. Aliquam mauris libero,
sagittis in eleifend at, mattis imperdiet velit. Donec urna risus, rutrum molestie
varius ac, lacinia sit amet augue. Nam ultrices elementum eros.
</p>
<p>
Sed faucibus viverra ligula, non varius magna semper vitae. Donec eu justo ut ipsum
hendrerit congue nec eu risus. Cum sociis natoque penatibus et magnis dis parturient
montes, nascetur ridiculus mus. Lorem ipsum dolor sit amet, consectetur adipiscing
egestas tempus. Cras convallis odio sit amet risus convallis porttitor. Integer
vehicula fermentum ligula at pretium. Suspendisse semper iaculis eros, eu aliquam
justo imperdiet vel. Proin nec dictum mi. Duis commodo enim non tellus interdum
elit. Suspendisse fermentum adipiscing nisi, a tempor libero malesuada at. Morbi
lacinia dui adipiscing risus eleifend tincidunt. Proin eu mauris eu tellus eleifend
hendrerit.
</p>
<p>
Mauris sit amet tellus urna. In facilisis, tortor vitae ultricies egestas, odio
mi rhoncus arcu, quis euismod felis felis et velit. Mauris varius consectetur erat
egestas tempus. Cras convallis odio sit amet risus convallis porttitor. Integer
vehicula fermentum ligula at pretium. Suspendisse semper iaculis eros, eu aliquam
justo imperdiet vel. Proin nec dictum mi. Duis commodo enim non tellus interdum
iaculis. Phasellus ultrices diam sit amet orci lacinia sed consequat dui auctor.
</p>
</section>
</div>
<div class="col-3 col-12-medium">
<!-- Right Sidebar -->
<section>
<header>
<h2>Magna Phasellus</h2>
</header>
<ul class="link-list">
<li><a href="#">Sed dolore viverra</a></li>
<li><a href="#">Ligula non varius</a></li>
<li><a href="#">Nec sociis natoque</a></li>
<li><a href="#">Penatibus et magnis</a></li>
<li><a href="#">Dis parturient montes</a></li>
<li><a href="#">Nascetur ridiculus</a></li>
</ul>
</section>
<section>
<header>
<h2>Ipsum Dolor</h2>
</header>
<p>
Vehicula fermentum ligula at pretium. Suspendisse semper iaculis eros, eu aliquam
iaculis. Phasellus ultrices diam sit amet orci lacinia sed consequat.
</p>
<ul class="link-list">
<li><a href="#">Sed dolore viverra</a></li>
<li><a href="#">Ligula non varius</a></li>
<li><a href="#">Dis parturient montes</a></li>
<li><a href="#">Nascetur ridiculus</a></li>
</ul>
</section>
</div>
</div>
</div>
</section>
<!-- Footer -->
<section id="footer">
<div class="container">
<div class="row">
<div class="col-8 col-12-medium">
<!-- Links -->
<section>
<h2>Links to Important Stuff</h2>
<div>
<div class="row">
<div class="col-3 col-12-small">
<ul class="link-list last-child">
<li><a href="#">Neque amet dapibus</a></li>
<li><a href="#">Sed mattis quis rutrum</a></li>
<li><a href="#">Accumsan suspendisse</a></li>
<li><a href="#">Eu varius vitae magna</a></li>
</ul>
</div>
<div class="col-3 col-12-small">
<ul class="link-list last-child">
<li><a href="#">Neque amet dapibus</a></li>
<li><a href="#">Sed mattis quis rutrum</a></li>
<li><a href="#">Accumsan suspendisse</a></li>
<li><a href="#">Eu varius vitae magna</a></li>
</ul>
</div>
<div class="col-3 col-12-small">
<ul class="link-list last-child">
<li><a href="#">Neque amet dapibus</a></li>
<li><a href="#">Sed mattis quis rutrum</a></li>
<li><a href="#">Accumsan suspendisse</a></li>
<li><a href="#">Eu varius vitae magna</a></li>
</ul>
</div>
<div class="col-3 col-12-small">
<ul class="link-list last-child">
<li><a href="#">Neque amet dapibus</a></li>
<li><a href="#">Sed mattis quis rutrum</a></li>
<li><a href="#">Accumsan suspendisse</a></li>
<li><a href="#">Eu varius vitae magna</a></li>
</ul>
</div>
</div>
</div>
</section>
</div>
<div class="col-4 col-12-medium imp-medium">
<!-- Blurb -->
<section>
<h2>An Informative Text Blurb</h2>
<p>
Duis neque nisi, dapibus sed mattis quis, rutrum accumsan sed. Suspendisse eu
varius nibh. Suspendisse vitae magna eget odio amet mollis. Duis neque nisi,
dapibus sed mattis quis, sed rutrum accumsan sed. Suspendisse eu varius nibh
lorem ipsum amet dolor sit amet lorem ipsum consequat gravida justo mollis.
</p>
</section>
</div>
</div>
</div>
</section>
<!-- Copyright -->
<div id="copyright">
&copy; Untitled. All rights reserved. | Design: <a href="http://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>

View file

@ -1,219 +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>
<head>
<title>Two Column 1 - Halcyonic by HTML5 UP</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">Halcyonic</a></h1>
<!-- Nav -->
<nav id="nav">
<a href="index.html">Homepage</a>
<a href="threecolumn.html">Three Column</a>
<a href="twocolumn1.html">Two Column #1</a>
<a href="twocolumn2.html">Two Column #2</a>
<a href="onecolumn.html">One Column</a>
</nav>
</div>
</div>
</div>
</section>
<!-- Content -->
<section id="content">
<div class="container">
<div class="row">
<div class="col-9 col-12-medium">
<!-- Main Content -->
<section>
<header>
<h2>Two Column #1</h2>
<h3>A generic two column layout</h3>
</header>
<p>
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc quam metus, congue
vel suscipit ut, dignissim non risus. Vestibulum ante est, fringilla nec placerat
eu, vestibulum vitae diam. Integer eget egestas eros. Duis enim erat, mollis quis
lacinia eget, blandit nec ipsum. Donec vitae turpis ipsum. Aliquam mauris libero,
sagittis in eleifend at, mattis imperdiet velit. Donec urna risus, rutrum molestie
varius ac, lacinia sit amet augue. Nam ultrices elementum eros.
</p>
<p>
Sed faucibus viverra ligula, non varius magna semper vitae. Donec eu justo ut ipsum
hendrerit congue nec eu risus. Cum sociis natoque penatibus et magnis dis parturient
montes, nascetur ridiculus mus. Lorem ipsum dolor sit amet, consectetur adipiscing
egestas tempus. Cras convallis odio sit amet risus convallis porttitor. Integer
vehicula fermentum ligula at pretium. Suspendisse semper iaculis eros, eu aliquam
justo imperdiet vel. Proin nec dictum mi. Duis commodo enim non tellus interdum
elit. Suspendisse fermentum adipiscing nisi, a tempor libero malesuada at. Morbi
lacinia dui adipiscing risus eleifend tincidunt. Proin eu mauris eu tellus eleifend
hendrerit.
</p>
<p>
Mauris sit amet tellus urna. In facilisis, tortor vitae ultricies egestas, odio
mi rhoncus arcu, quis euismod felis felis et velit. Mauris varius consectetur erat
egestas tempus. Cras convallis odio sit amet risus convallis porttitor. Integer
vehicula fermentum ligula at pretium. Suspendisse semper iaculis eros, eu aliquam
justo imperdiet vel. Proin nec dictum mi. Duis commodo enim non tellus interdum
iaculis. Phasellus ultrices diam sit amet orci lacinia sed consequat dui auctor.
</p>
<p>
Sed faucibus viverra ligula, non varius magna semper vitae. Donec eu justo ut ipsum
hendrerit congue nec eu risus. Cum sociis natoque penatibus et magnis dis parturient
montes, nascetur ridiculus mus. Lorem ipsum dolor sit amet, consectetur adipiscing
egestas tempus. Cras convallis odio sit amet risus convallis porttitor. Integer
vehicula fermentum ligula at pretium. Suspendisse semper iaculis eros, eu aliquam
justo imperdiet vel. Proin nec dictum mi. Duis commodo enim non tellus interdum
elit. Suspendisse fermentum adipiscing nisi, a tempor libero malesuada at. Morbi
lacinia dui adipiscing risus eleifend tincidunt. Proin eu mauris eu tellus eleifend
hendrerit.
</p>
<p>
Mauris sit amet tellus urna. In facilisis, tortor vitae ultricies egestas, odio
mi rhoncus arcu, quis euismod felis felis et velit. Mauris varius consectetur erat
egestas tempus. Cras convallis odio sit amet risus convallis porttitor. Integer
vehicula fermentum ligula at pretium. Suspendisse semper iaculis eros, eu aliquam
justo imperdiet vel. Proin nec dictum mi. Duis commodo enim non tellus interdum
iaculis. Phasellus ultrices diam sit amet orci lacinia sed consequat dui auctor.
</p>
</section>
</div>
<div class="col-3 col-12-medium">
<!-- Sidebar -->
<section>
<header>
<h2>Magna Phasellus</h2>
</header>
<ul class="link-list">
<li><a href="#">Sed dolore viverra</a></li>
<li><a href="#">Ligula non varius</a></li>
<li><a href="#">Nec sociis natoque</a></li>
<li><a href="#">Penatibus et magnis</a></li>
<li><a href="#">Dis parturient montes</a></li>
<li><a href="#">Nascetur ridiculus</a></li>
</ul>
</section>
<section>
<header>
<h2>Ipsum Dolor</h2>
</header>
<p>
Vehicula fermentum ligula at pretium. Suspendisse semper iaculis eros, eu aliquam
iaculis. Phasellus ultrices diam sit amet orci lacinia sed consequat.
</p>
<ul class="link-list">
<li><a href="#">Sed dolore viverra</a></li>
<li><a href="#">Ligula non varius</a></li>
<li><a href="#">Dis parturient montes</a></li>
<li><a href="#">Nascetur ridiculus</a></li>
</ul>
</section>
</div>
</div>
</div>
</section>
<!-- Footer -->
<section id="footer">
<div class="container">
<div class="row">
<div class="col-8 col-12-medium">
<!-- Links -->
<section>
<h2>Links to Important Stuff</h2>
<div>
<div class="row">
<div class="col-3 col-12-small">
<ul class="link-list last-child">
<li><a href="#">Neque amet dapibus</a></li>
<li><a href="#">Sed mattis quis rutrum</a></li>
<li><a href="#">Accumsan suspendisse</a></li>
<li><a href="#">Eu varius vitae magna</a></li>
</ul>
</div>
<div class="col-3 col-12-small">
<ul class="link-list last-child">
<li><a href="#">Neque amet dapibus</a></li>
<li><a href="#">Sed mattis quis rutrum</a></li>
<li><a href="#">Accumsan suspendisse</a></li>
<li><a href="#">Eu varius vitae magna</a></li>
</ul>
</div>
<div class="col-3 col-12-small">
<ul class="link-list last-child">
<li><a href="#">Neque amet dapibus</a></li>
<li><a href="#">Sed mattis quis rutrum</a></li>
<li><a href="#">Accumsan suspendisse</a></li>
<li><a href="#">Eu varius vitae magna</a></li>
</ul>
</div>
<div class="col-3 col-12-small">
<ul class="link-list last-child">
<li><a href="#">Neque amet dapibus</a></li>
<li><a href="#">Sed mattis quis rutrum</a></li>
<li><a href="#">Accumsan suspendisse</a></li>
<li><a href="#">Eu varius vitae magna</a></li>
</ul>
</div>
</div>
</div>
</section>
</div>
<div class="col-4 col-12-medium imp-medium">
<!-- Blurb -->
<section>
<h2>An Informative Text Blurb</h2>
<p>
Duis neque nisi, dapibus sed mattis quis, rutrum accumsan sed. Suspendisse eu
varius nibh. Suspendisse vitae magna eget odio amet mollis. Duis neque nisi,
dapibus sed mattis quis, sed rutrum accumsan sed. Suspendisse eu varius nibh
lorem ipsum amet dolor sit amet lorem ipsum consequat gravida justo mollis.
</p>
</section>
</div>
</div>
</div>
</section>
<!-- Copyright -->
<div id="copyright">
&copy; Untitled. All rights reserved. | Design: <a href="http://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>

View file

@ -1,219 +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>
<head>
<title>Two Column 2 - Halcyonic by HTML5 UP</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">Halcyonic</a></h1>
<!-- Nav -->
<nav id="nav">
<a href="index.html">Homepage</a>
<a href="threecolumn.html">Three Column</a>
<a href="twocolumn1.html">Two Column #1</a>
<a href="twocolumn2.html">Two Column #2</a>
<a href="onecolumn.html">One Column</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>Magna Phasellus</h2>
</header>
<ul class="link-list">
<li><a href="#">Sed dolore viverra</a></li>
<li><a href="#">Ligula non varius</a></li>
<li><a href="#">Nec sociis natoque</a></li>
<li><a href="#">Penatibus et magnis</a></li>
<li><a href="#">Dis parturient montes</a></li>
<li><a href="#">Nascetur ridiculus</a></li>
</ul>
</section>
<section>
<header>
<h2>Ipsum Dolor</h2>
</header>
<p>
Vehicula fermentum ligula at pretium. Suspendisse semper iaculis eros, eu aliquam
iaculis. Phasellus ultrices diam sit amet orci lacinia sed consequat.
</p>
<ul class="link-list">
<li><a href="#">Sed dolore viverra</a></li>
<li><a href="#">Ligula non varius</a></li>
<li><a href="#">Dis parturient montes</a></li>
<li><a href="#">Nascetur ridiculus</a></li>
</ul>
</section>
</div>
<div class="col-9 col-12-medium imp-medium">
<!-- Main Content -->
<section>
<header>
<h2>Two Column #2</h2>
<h3>Another generic two column layout</h3>
</header>
<p>
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc quam metus, congue
vel suscipit ut, dignissim non risus. Vestibulum ante est, fringilla nec placerat
eu, vestibulum vitae diam. Integer eget egestas eros. Duis enim erat, mollis quis
lacinia eget, blandit nec ipsum. Donec vitae turpis ipsum. Aliquam mauris libero,
sagittis in eleifend at, mattis imperdiet velit. Donec urna risus, rutrum molestie
varius ac, lacinia sit amet augue. Nam ultrices elementum eros.
</p>
<p>
Sed faucibus viverra ligula, non varius magna semper vitae. Donec eu justo ut ipsum
hendrerit congue nec eu risus. Cum sociis natoque penatibus et magnis dis parturient
montes, nascetur ridiculus mus. Lorem ipsum dolor sit amet, consectetur adipiscing
egestas tempus. Cras convallis odio sit amet risus convallis porttitor. Integer
vehicula fermentum ligula at pretium. Suspendisse semper iaculis eros, eu aliquam
justo imperdiet vel. Proin nec dictum mi. Duis commodo enim non tellus interdum
elit. Suspendisse fermentum adipiscing nisi, a tempor libero malesuada at. Morbi
lacinia dui adipiscing risus eleifend tincidunt. Proin eu mauris eu tellus eleifend
hendrerit.
</p>
<p>
Mauris sit amet tellus urna. In facilisis, tortor vitae ultricies egestas, odio
mi rhoncus arcu, quis euismod felis felis et velit. Mauris varius consectetur erat
egestas tempus. Cras convallis odio sit amet risus convallis porttitor. Integer
vehicula fermentum ligula at pretium. Suspendisse semper iaculis eros, eu aliquam
justo imperdiet vel. Proin nec dictum mi. Duis commodo enim non tellus interdum
iaculis. Phasellus ultrices diam sit amet orci lacinia sed consequat dui auctor.
</p>
<p>
Sed faucibus viverra ligula, non varius magna semper vitae. Donec eu justo ut ipsum
hendrerit congue nec eu risus. Cum sociis natoque penatibus et magnis dis parturient
montes, nascetur ridiculus mus. Lorem ipsum dolor sit amet, consectetur adipiscing
egestas tempus. Cras convallis odio sit amet risus convallis porttitor. Integer
vehicula fermentum ligula at pretium. Suspendisse semper iaculis eros, eu aliquam
justo imperdiet vel. Proin nec dictum mi. Duis commodo enim non tellus interdum
elit. Suspendisse fermentum adipiscing nisi, a tempor libero malesuada at. Morbi
lacinia dui adipiscing risus eleifend tincidunt. Proin eu mauris eu tellus eleifend
hendrerit.
</p>
<p>
Mauris sit amet tellus urna. In facilisis, tortor vitae ultricies egestas, odio
mi rhoncus arcu, quis euismod felis felis et velit. Mauris varius consectetur erat
egestas tempus. Cras convallis odio sit amet risus convallis porttitor. Integer
vehicula fermentum ligula at pretium. Suspendisse semper iaculis eros, eu aliquam
justo imperdiet vel. Proin nec dictum mi. Duis commodo enim non tellus interdum
iaculis. Phasellus ultrices diam sit amet orci lacinia sed consequat dui auctor.
</p>
</section>
</div>
</div>
</div>
</section>
<!-- Footer -->
<section id="footer">
<div class="container">
<div class="row">
<div class="col-8 col-12-medium">
<!-- Links -->
<section>
<h2>Links to Important Stuff</h2>
<div>
<div class="row">
<div class="col-3 col-12-small">
<ul class="link-list last-child">
<li><a href="#">Neque amet dapibus</a></li>
<li><a href="#">Sed mattis quis rutrum</a></li>
<li><a href="#">Accumsan suspendisse</a></li>
<li><a href="#">Eu varius vitae magna</a></li>
</ul>
</div>
<div class="col-3 col-12-small">
<ul class="link-list last-child">
<li><a href="#">Neque amet dapibus</a></li>
<li><a href="#">Sed mattis quis rutrum</a></li>
<li><a href="#">Accumsan suspendisse</a></li>
<li><a href="#">Eu varius vitae magna</a></li>
</ul>
</div>
<div class="col-3 col-12-small">
<ul class="link-list last-child">
<li><a href="#">Neque amet dapibus</a></li>
<li><a href="#">Sed mattis quis rutrum</a></li>
<li><a href="#">Accumsan suspendisse</a></li>
<li><a href="#">Eu varius vitae magna</a></li>
</ul>
</div>
<div class="col-3 col-12-small">
<ul class="link-list last-child">
<li><a href="#">Neque amet dapibus</a></li>
<li><a href="#">Sed mattis quis rutrum</a></li>
<li><a href="#">Accumsan suspendisse</a></li>
<li><a href="#">Eu varius vitae magna</a></li>
</ul>
</div>
</div>
</div>
</section>
</div>
<div class="col-4 col-12-medium imp-medium">
<!-- Blurb -->
<section>
<h2>An Informative Text Blurb</h2>
<p>
Duis neque nisi, dapibus sed mattis quis, rutrum accumsan sed. Suspendisse eu
varius nibh. Suspendisse vitae magna eget odio amet mollis. Duis neque nisi,
dapibus sed mattis quis, sed rutrum accumsan sed. Suspendisse eu varius nibh
lorem ipsum amet dolor sit amet lorem ipsum consequat gravida justo mollis.
</p>
</section>
</div>
</div>
</div>
</section>
<!-- Copyright -->
<div id="copyright">
&copy; Untitled. All rights reserved. | Design: <a href="http://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>