Merge branch 'test' into 'master'

Test

See merge request j.vondoemming/fg-website!1

style.css

+* {
+	margin: 0em;
+	padding: 0em;
+}
+
+body {
+	/*font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;*/
+	/*color: #000000;*/
+	color: #333333;
+	background-color: #FFFFFF;
+	font-size: 100%;
+	font-family: sans-serif;
+
+
+	letter-spacing: 0.025em;
+	text-shadow: 0 0 1em transparent, 1px 1px 1.2px rgba(0, 0, 0, 0.004);
+
+	overflow: visible;
+	display: grid;
+	grid-template-columns: 1fr 3fr 1fr;
+	grid-template-rows: 6em 1fr 5em;
+	/*gap: 0px 0px;*/
+	grid-template-areas:
+	"aside header ."
+	"main main main"
+	"footer footer footer";
+	justify-items: center;
+	align-content: space-evenly;
+}
+
+a {
+	color: #337ab7;
+	text-decoration: none;
+}
+
+
+p, blockquote, ul, ol, dl, table, pre {
+	margin: 0 0 1em 0;
+}
+
+
+ul, ol {
+	padding-left: 2em;
+}
+
+li + li {
+	margin-top: 0.25em;
+}
+
+h1 {
+	padding-bottom: 0.3em;
+	font-size: 2em;
+	border-bottom: 0.1em solid #eee;
+}
+
+h2 {
+	padding-bottom: 0.3em;
+	font-size: 1.5em;
+	border-bottom: 0.1em solid #eee;
+}
+
+h1,h2,h3,h4,h5,h6 {
+	margin-top: 1.5em;
+	margin-bottom: 1em;
+	font-weight: 600;
+	line-height: 1.25;
+}
+
+
+body > header {
+	grid-area: header;
+	margin-bottom:1em;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+}
+
+body > aside {
+	grid-area: aside;
+}
+body > aside img {
+	height: 6em;
+}
+
+body > header nav {
+	margin: 1em;
+}
+body > header a {
+	padding: 1em;
+	margin: 1em;
+	color: #333;
+	background-color: #ffffff;
+	border-bottom: 0.1em solid #336;
+	transition: background-color 0.1s, border 0.1s;
+}
+body > header a:hover {
+	background-color: #e6e6e6;
+	border-bottom: 0.2em solid #536;
+}
+
+body > footer {
+	grid-area: footer;
+}
+
+
+
+@media only screen and (max-width: 118em) {
+	body {
+	
+		grid-template-rows: 6em 1fr 6em 5em;
+		grid-template-columns: 1fr;
+		grid-template-areas:
+		"header" 
+		"main"
+		"aside"
+		"footer";
+	}	
+
+}
+
+@media only screen and (max-width: 75em) {
+	body > header {
+		margin-bottom: 0.2em;
+	}
+	body > header nav {
+		margin: 0.2em;
+
+	}
+	body > header a {
+		margin: 0.2em;
+		padding: 0.2em;
+	}
+	body {
+		grid-template-rows: 2em 1fr 6em 5em;
+		grid-template-columns: 1fr;
+		grid-template-areas:
+		"header" 
+		"main"
+		"aside"
+		"footer";
+	}
+}
+
+
+
+main {
+	grid-area: main;
+	font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
+	line-height: 1.5;
+	word-wrap: break-word;
+	/*padding-top: 2.5em;*/
+	padding-bottom: 2.5em;
+	padding-right: 1em;
+	padding-left: 1em;
+	margin-right: auto;
+	margin-left: auto;
+
+	max-width: 48em;
+}
+
+main > footer {
+
+}
+
+main img {
+	width: 46em;
+	padding: 1em;
+
+}
+
+
+
+.alert {
+	padding:1em;
+	margin-bottom:1.2em;
+	border:0.1em solid transparent;
+	border-radius:0.25em;
+	/*padding:15px;
+	margin-bottom:20px;
+	border:1px solid transparent;
+	border-radius:4px;*/
+}
+
+.alert h4 {
+	margin-top:0;
+	color:inherit;
+}
+
+.alert .alert-link {
+	font-weight:700;
+}
+
+.alert > p, .alert > ul {
+	margin-bottom:0;
+}
+
+.alert > p+p {
+	margin-top:0.33em;
+}
+
+.alert-dismissable, .alert-dismissible {
+	padding-right:2em;
+}
+
+.alert-dismissable .close,.alert-dismissible .close{
+	position:relative;
+	top:-0.1em;
+	right:-1.4em;
+	color:inherit;
+}
+
+.alert-success {
+	color:#3c763d;
+	background-color:#dff0d8;
+	border-color:#d6e9c6;
+}
+
+.alert-success hr {
+	border-top-color:#c9e2b3;
+}
+
+.alert-success .alert-link {
+	color:#2b542c;
+}
+
+.alert-info {
+	color:#31708f;
+	background-color:#d9edf7;
+	border-color:#bce8f1;
+}
+
+.alert-info hr {
+	border-top-color:#a6e1ec;
+}
+
+.alert-info .alert-link {
+	color:#245269;
+}
+
+.alert-warning {
+	color:#8a6d3b;
+	background-color:#fcf8e3;
+	border-color:#faebcc;
+
+}
+
+.alert-warning hr {
+	border-top-color:#f7e1b5;
+}
+
+.alert-warning .alert-link {
+	color:#66512c;
+}
+
+.alert-danger {
+	color:#a94442;
+	background-color:#f2dede;
+	border-color:#ebccd1;
+}
+
+.alert-danger hr {
+	border-top-color:#e4b9c0;
+}
+
+.alert-danger .alert-link {
+	color:#843534;
+}
+
+

template.html

+<!DOCTYPE html>
+<html lang="de">
+	<head>
+		<title>
+{{title}}
+		</title>
+		<meta charset="utf-8" /> 
+		<meta name="viewport" content="width=device-width, initial-scale=1.0">
+		<meta HTTP-EQUIV="REFRESH" content="50; url=#">
+		<!-- <link rel="stylesheet" type="text/css" href="/css/style.css"> -->
+		<link rel="stylesheet" type="text/css" href="/fg-website/style.css">
+	</head>
+
+	<body>
+		<aside><a href="/fg-website.wiki/"><img src="/fg-website/resources/assets/banner-logo.png" alt="Logo der Fachgruppe" /></a></aside>
+		<header>
+			<nav>
+				<a href="#">Über uns</a>
+				<a href="#">Fachgruppentreffen</a>
+				<a href="#">Cookie Talks</a>
+				<a href="#">studentische Informatiktage (sIT)</a>
+			</nav>
+		</header>
+		<!--<nav id="toc">
+{{toc}}
+		</nav>-->
+		<main>
+			<header>
+				<h1>
+{{title}}
+				</h1>
+			</header>
+{{content}}
+			<footer>
+				<span>Last edited by <strong>
+{{lasteditedauthorname}}
+					</strong>,
+{{lastediteddate}}
+				</span>
+			</footer>
+		</main>
+		<!--<aside>
+			aside ist hier glaube ich nicht gut 
+			Last edited by j.vondoemming on ...
+		</aside>-->
+		<footer>
+			blablabla datenschutz,impressum etc...
+		</footer>
+	</body>
+</html>