diff --git a/sass/_content.scss b/sass/_content.scss new file mode 100644 index 0000000000000000000000000000000000000000..fe64671cac6a34d8ca7f8ede95d59a4ba1efad35 --- /dev/null +++ b/sass/_content.scss @@ -0,0 +1,7 @@ +.columns.is-same-height { + align-items: stretch; + + .column > * { + height: 100%; + } +} diff --git a/sass/_menu.scss b/sass/_menu.scss index 17b9c12dfdb25b4de1b4d5c745cd4a86b4c24587..27671cdb71af6cd254a682931b9a5910b8c9639a 100644 --- a/sass/_menu.scss +++ b/sass/_menu.scss @@ -31,12 +31,17 @@ .navbar-item.is-mega { position: static; - + .is-mega-menu-title { - margin-bottom: 0; - padding: .375rem 1rem; + margin-bottom: 0; + padding: .375rem 1rem; } + .is-mega-menu-subtitle { padding: .375rem 1rem; - } + } +} + +.navbar-dropdown { + overflow: hidden; } diff --git a/sass/_teckids.scss b/sass/_teckids.scss index ffad834bf2d001b798b77ef3d98fbeaa97e2eca6..dd5d8908be6c6e17d136bc526e09af43ec74a900 100644 --- a/sass/_teckids.scss +++ b/sass/_teckids.scss @@ -10,11 +10,14 @@ $project-colors: ( .menu-project-section { border-left: 0.5em solid; - margin-left: 1em; } @each $project in $projects { #menu-project-section-#{$project} { border-color: map-get($project-colors, $project); + + .is-mega-menu-title .is-mega-menu-subtitle { + color: map-get($project-colors, $project); + } } } diff --git a/sass/style.scss b/sass/style.scss index 16508b12b72a1140f7cf3450dba9132aba882b39..7dee0d1df888042e0af5eeee9be54043694c8847 100644 --- a/sass/style.scss +++ b/sass/style.scss @@ -7,3 +7,4 @@ $family-sans-serif: "Roboto", sans-serif; @import "../node_modules/bulma/bulma.sass"; @import "./_menu.scss"; +@import "./_content.scss"; diff --git a/templates/base.html b/templates/base.html index e1383f8f7b240acf99a7f920f2d822cef178fbd4..61d4e546db7de0a8670f62b4b9d1863ab7430d6b 100644 --- a/templates/base.html +++ b/templates/base.html @@ -21,7 +21,7 @@ {% include "menu.html" %} </header> - <main> + <main class="section"> {% block main %}{% endblock %} </main> </body> diff --git a/templates/frontpage/blocks/claim.html b/templates/frontpage/blocks/claim.html index a5662f811d1a88bfd7a0774eabf2e95938c27268..749a8572e43ee14b278729d4115cb5a4430f2482 100644 --- a/templates/frontpage/blocks/claim.html +++ b/templates/frontpage/blocks/claim.html @@ -9,4 +9,3 @@ </section> </div> -<hr /> \ No newline at end of file diff --git a/templates/frontpage/blocks/news.html b/templates/frontpage/blocks/news.html deleted file mode 100644 index c191c7d5971efd3ef2df19e08d04b3c6e8d7b535..0000000000000000000000000000000000000000 --- a/templates/frontpage/blocks/news.html +++ /dev/null @@ -1,23 +0,0 @@ -<div class="container"> - <section class="columns is-centered is-half"> - <h1 class="title is-1">Neuigkeiten</h1> - </section> - <section class="columns"> - <div class="column"> - <div class="card is-shadowless"> - {% include "frontpage/blocks/embed_article.html" %} - </div> - </div> - <div class="column"> - <div class="card is-shadowless"> - {% include "frontpage/blocks/embed_article.html" %} - </div> - </div> - <div class="column"> - <div class="card is-shadowless"> - {% include "frontpage/blocks/embed_article.html" %} - </div> - </div> - </section> -</div> -<hr /> diff --git a/templates/frontpage/blocks/projects.html b/templates/frontpage/blocks/projects.html index e55f9d94de424843c9ae075456cdd1d8cd8b5db3..505ea21c0d0bca83f590b974a418efd2600cba4b 100644 --- a/templates/frontpage/blocks/projects.html +++ b/templates/frontpage/blocks/projects.html @@ -76,4 +76,3 @@ </div> </section> </div> -<hr /> diff --git a/templates/menu.html b/templates/menu.html index 9e5d752560f1b77ec8cf376858b3451ad059bf48..0712da969a976301d8dac9b25cb7f14686a7633c 100644 --- a/templates/menu.html +++ b/templates/menu.html @@ -1,4 +1,4 @@ -<nav class="navbar is-fixed-top is-transparent" role="navigation" aria-label="main navigation"> +<nav class="navbar is-fixed-top" role="navigation" aria-label="main navigation"> <input type="checkbox" id="burger-toggle" role="button" class="navbar-toggle" aria-label="menu" aria-expanded="false" data-target="main-menu" /> <div class="navbar-brand"> <a href="{{ get_url(path="@/_index.md") }}" class="navbar-item"> diff --git a/templates/menu/projects.html b/templates/menu/projects.html index b4b7f28009f05b3eb7ecd19aa9f99f66c9a8c3cc..fba1b3f30e8344a791798fbb6d830a76d4880784 100644 --- a/templates/menu/projects.html +++ b/templates/menu/projects.html @@ -1,19 +1,21 @@ {% set projects = get_taxonomy(kind = "projekt") %} -<div class="columns"> - {% for project in projects.items %} - <section class="column menu-project-section" id="menu-project-section-{{ project.slug }}"> - {% set section = get_section(path = "projekte/" ~ project.slug ~ "/_index.md") %} - <h1 class="title is-6 is-mega-menu-title">{{ section.title }}</h1> - <p class="is-mega-menu-subtitle">{{ section.description }}</p> +<div class="container is-fluid"> + <div class="columns"> + {% for project in projects.items %} + <section class="column menu-project-section" id="menu-project-section-{{ project.slug }}"> + {% set section = get_section(path = "projekte/" ~ project.slug ~ "/_index.md") %} + <h1 class="title is-6 is-mega-menu-title">{{ section.title }}</h1> + <p class="is-mega-menu-subtitle">{{ section.description }}</p> - {% for page in project.pages %} - <a class="navbar-item" href="{{ page.permalink }}"> - <div class="navbar-content"> - {{ page.title }} - </div> - </a> + {% for page in project.pages %} + <a class="navbar-item" href="{{ page.permalink }}"> + <div class="navbar-content"> + {{ page.title }} + </div> + </a> + {% endfor %} + </section> {% endfor %} - </section> - {% endfor %} + </div> </div> \ No newline at end of file