From c41765a2d162587014c6bb30ca96bc55cd9a0cb5 Mon Sep 17 00:00:00 2001 From: Midgard Date: Sat, 29 Aug 2020 15:48:36 +0200 Subject: [PATCH] Fix nav and improve styling on non-homepage pages --- Rules | 9 ++++++++- content/evenementen.erb | 2 +- content/faq.erb | 4 ++-- content/stuver.html.erb | 2 +- content/stylesheets/main.css | 38 ++++++++++++++++++++++++------------ layouts/base.erb | 2 +- layouts/default.erb | 6 ++++-- layouts/evenement.erb | 2 -- layouts/homepage.erb | 2 +- layouts/konvent.erb | 2 -- layouts/partials/navbar.erb | 2 +- layouts/thema.erb | 12 +++++------- layouts/vereniging.erb | 12 +++++------- 13 files changed, 55 insertions(+), 40 deletions(-) diff --git a/Rules b/Rules index 0749742..67dbca2 100644 --- a/Rules +++ b/Rules @@ -63,12 +63,19 @@ compile '/faq.erb' do write '/faq/index.html' end +compile '/evenementen.erb' do + filter :erb + layout '/default.*' + layout '/base.*' + write '/evenementen/index.html' +end + compile '/verenigingen.md' do filter :kramdown layout '/verenigingen.*' layout '/default.*' layout '/base.*' - write ext: 'html' + write '/verenigingen/index.html' end compile '/*.md' do diff --git a/content/evenementen.erb b/content/evenementen.erb index 09a68dd..59592ee 100644 --- a/content/evenementen.erb +++ b/content/evenementen.erb @@ -1,5 +1,5 @@ --- -titel: Evenementen +naam: Evenementen navigable: true order: 2 --- diff --git a/content/faq.erb b/content/faq.erb index 84bd401..eef8109 100644 --- a/content/faq.erb +++ b/content/faq.erb @@ -1,9 +1,9 @@ --- -titel: FAQ +naam: FAQ navigable: true order: 3 --- -

FAQ — Vaakgevraagdevragen

+

FAQ — Vaakgestelde vragen

<% @items.find_all('/faq/*').each do |question| %>
diff --git a/content/stuver.html.erb b/content/stuver.html.erb index 057d695..6fd272e 100644 --- a/content/stuver.html.erb +++ b/content/stuver.html.erb @@ -1,5 +1,5 @@ --- -title: Stuver +naam: Stuver head: "" --- Ga naar de website van de Gentse Studentenraad. diff --git a/content/stylesheets/main.css b/content/stylesheets/main.css index 4bff58e..0fb0246 100644 --- a/content/stylesheets/main.css +++ b/content/stylesheets/main.css @@ -2,7 +2,8 @@ --white: hsl(0, 0%, 98%); --darkblue: #013e7a; --lightblue: #1a77d3; - --cyan: #aaeeff; + --cyan: hsl(192, 100%, 83%); + --lightCyan: hsl(192, 100%, 94%); --yellow: #fed318; } @@ -47,18 +48,29 @@ input { padding: 0.1em 0.3em; } +header { + position: relative; + background-color: var(--lightCyan); +} +header.homepage { + background-color: transparent; +} + nav a { text-decoration: none; font-family: futura, Avenir Next, Verdana, Geneva, Tahoma, sans-serif; color: var(--darkblue); - padding: 0 2rem; + padding: 1rem 2rem; + margin: 0 1rem; } nav ul { list-style: none; - display: flex; justify-content: space-between; } +nav li { + display: inline-block; +} nav { display: flex; @@ -67,6 +79,11 @@ nav { padding: 1rem 0; } +header .logo { + width: 79px; + height: 83px; +} + h2 { font-family: futura, Avenir Next, Verdana, Geneva, Tahoma, sans-serif; font-size: 3.4rem; @@ -76,6 +93,10 @@ h2 { max-width: 30rem; } +.intro { + position: relative; +} + .studentZijn { margin: 4rem 0 2rem 3rem; margin: 11vh 0 2rem 3rem; @@ -166,11 +187,7 @@ h2 { .backgroundSquare { z-index: -2; position: absolute; - background-color: var(--cyan); -} - -.intro { - position: relative; + background-color: var(--lightCyan); } .header_blueSquare { @@ -181,7 +198,6 @@ h2 { top: -100vw; bottom: -1rem; - opacity: 0.3; z-index: -3; } @@ -207,7 +223,5 @@ h2 { } .underline, .active_link { - padding-bottom: -2rem; - margin-bottom: -2rem; - box-shadow: inset 0 -8px 0 var(--yellow); + box-shadow: inset 0 -0.15em 0 var(--yellow); } diff --git a/layouts/base.erb b/layouts/base.erb index 6c4de86..4278879 100644 --- a/layouts/base.erb +++ b/layouts/base.erb @@ -15,7 +15,7 @@ <%= yield %> -