Merge branch 'add-useless-navbar' into 'master' (51bb2d31) · Commits · Fachschaft / Portal

css/main.css

+77 −23

Changes for css/main.css: 77 added lines, 23 removed lines.
Original line number	Diff line number	Diff line
		@import url("/lib/fontawesome-free-6.5.2-web/css/all.min.css");

		:root {
		--shadow-width: 2px;
		.blue {
		--primary: #144a8b;
		--primary-light: #387bd0;
		}

		.blue ::selection {
		background-color: #387bd0;
		color: white;
		.green {
		--primary: #135a3a;
		--primary-light: #2aac6d;
		}

		:root {
		--shadow-width: 2px;
		}

		.green ::selection {
		background-color: #2aac6d;
		::selection {
		background-color: var(--primary-light);
		color: white;
		}

		@@ -20,31 +25,84 @@ body {

		display: grid;

		align-content: center;
		grid-template-rows: max-content 1fr 4em;
		align-items: center;
		justify-content: center;

		font-family: "Roboto", sans-serif;

		background-color: var(--primary-light);
		background-size: cover;
		}

		code {
		font-family: "Inconsolata", monospace;
		}

		body.blue {
		background-color: #387bd0;
		background-color: var(--primary-light);
		background-image: url("/lib/nautilus/nautilus_blue.svg");
		}

		body.green {
		background-color: #2aac6d;
		background-image: url("/lib/nautilus/nautilus_green.svg");
		}

		header {
		min-width: 60vw;
		justify-self: center;
		}

		header,
		main {
		margin-top: 4em;
		}

		code {
		font-family: "Inconsolata", monospace;
		}

		nav {
		display: grid;
		grid-template-columns: 1fr max-content;
		}

		nav section.left {
		padding-left: 1em;
		justify-self: start;
		}

		nav section.right {
		padding-right: 1em;
		justify-self: end;
		}

		nav ul {
		padding: 0;
		margin: 0;
		}

		nav ul li {
		display: inline-block;
		}

		nav ul li a {
		--border-strength: 0.3em;

		display: block;
		padding: 1em 1.5em;
		padding-bottom: calc(1em - var(--border-strength));
		border-bottom: var(--border-strength) solid #00000000;
		text-decoration: none;
		}

		nav ul li a.current {
		border-color: var(--primary);
		font-weight: bold;
		}

		nav ul li:hover a {
		border-color: var(--primary-light);
		}

		.tools {
		display: grid;
		margin: 4em 0;

		grid-template-columns: repeat(6, min-content);
		column-gap: 4em;
		@@ -82,6 +140,10 @@ article h1 {
		font-size: 200%;
		}

		a {
		color: var(--primary);
		}

		a.btn {
		height: 10em;
		width: 10em;
		@@ -99,14 +161,6 @@ a.btn {
		text-decoration: none;
		}

		.blue a {
		color: #144a8b;
		}

		.green a {
		color: #135a3a;
		}

		a.btn > i {
		font-size: 200%;
		}

index.html

+1 −1

Changes for index.html: 1 added line, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -3,7 +3,7 @@
		<head>
		<meta charset="utf-8" />
		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
		<title>Portal · Fachschaft Computerlinguistik</title>
		<title>Start · FS Coli Portal</title>
		<link rel="stylesheet" href="/css/main.css" />
		<link rel="icon" href="/img/portal.svg" />
		</head>

js/components/pages/Base.mjs

+3 −1

Changes for js/components/pages/Base.mjs: 3 added lines, 1 removed line.
Original line number	Diff line number	Diff line
		import { Nav } from "../pieces/Nav.mjs"

		export const Base = {
		view(vnode) {
		return [m("main", vnode.children)]
		return [m("header", m(Nav)), m("main", vnode.children)]
		},
		}

js/components/pages/Portal.mjs→js/components/pages/Start.mjs

+2 −2

Changes for js/components/pages/Start.mjs: 2 added lines, 2 removed lines.
Original line number	Diff line number	Diff line
		import { Service } from "../pieces/Service.mjs"
		import { Base } from "./Base.mjs"

		export const Portal = {
		export const Start = {
		oncreate() {
		document.title = "Portal · Fachschaft Computerlinguistik"
		document.title = "Start · FS Coli Portal"
		},
		view() {
		return m(

js/components/pages/Unlock.mjs

+1 −2

Changes for js/components/pages/Unlock.mjs: 1 added line, 2 removed lines.
Original line number	Diff line number	Diff line
		@@ -2,8 +2,7 @@ import { Base } from "./Base.mjs"

		export const Unlock = {
		oncreate() {
		document.title =
		"Freischaltung · Portal · Fachschaft Computerlinguistik"
		document.title = "Freischaltung · FS Coli Portal"
		},
		view() {
		return m(