From f27d945147fccc0a5461cf4816e95c8bcf4dfe28 Mon Sep 17 00:00:00 2001 From: Kai Moritz <kai@juplo.de> Date: Fri, 26 Feb 2021 23:42:01 +0100 Subject: [PATCH] WIP:bulma:neu --- dist/templates/layout.html | 19 +++++++++--------- sass/juplo.scss | 40 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 47 insertions(+), 12 deletions(-) diff --git a/dist/templates/layout.html b/dist/templates/layout.html index cb21b4f9..16da131a 100644 --- a/dist/templates/layout.html +++ b/dist/templates/layout.html @@ -73,8 +73,8 @@ submenu=${_childs.get(parent)}, pos=1" id="navigation" - class="s mr-4" - th:class="'mr-4 s' + (${len == 1 or (len == 2 and _childs.get(uri) == null)} ? ' selected' : '')"> + class="s mr-4 mt-4" + th:class="'mr-4 mt-4 s' + (${len == 1 or (len == 2 and _childs.get(uri) == null)} ? ' selected' : '')"> <!--/*--> <li class="s sub off"><a href="../blog/" class="s">Blog</a></li> <!--*/--> @@ -123,14 +123,13 @@ </nav> </div> <footer> - <div class="level"> - <div class="level-left"> - <span class="level-item">© <strong>mo</strong> 2021</span> - </div> - <div class="level-right" id="footerlinks" th:include="~{::#links}?:_"> - <a class="level-item" href="../impressum.html" th:href="@{/impressum.html}">Impressum</a> - <a class="level-item" href="../datenschutz.html" th:href="@{/datenschutz.html}">Datenschutz</a> - </div> + <div id="copyright" class="section"> + <span>© <strong>mo</strong> 2021</span> + </div> + <div id="footerlinks" class="section has-text-right" th:include="~{::#links}?:_"> + <a href="../impressum.html" th:href="@{/impressum.html}">Impressum</a> + <span class="spacer">|</span> + <a href="../datenschutz.html" th:href="@{/datenschutz.html}">Datenschutz</a> </div> </footer> </body> diff --git a/sass/juplo.scss b/sass/juplo.scss index 14013167..2511b213 100644 --- a/sass/juplo.scss +++ b/sass/juplo.scss @@ -66,6 +66,10 @@ $button-hover-border-color: #000 !important; color: #ccc; background-color: #fff; } +#navigation li.s > ul.selected +{ + margin-top: 1em; +} #navigation li.s > a.selected:after, #navigation li.s > a.leaf:after, #navigation li.s > strong.selected:after, @@ -117,14 +121,46 @@ body footer { flex-shrink: 0; + display: flex; + justify-content: flex-end; } -main { +main, +#copyright +{ flex-grow: 1; max-width: 768px; min-width: 568px; overflow: hidden; } -nav { +nav, +#footerlinks +{ flex-grow: 0; min-width: 293px; } + + +input[type=submit], +input[type=reset] +{ + @extend .button; +} +input[type=text], +input[type=password], +input[type=email], +input[type=tel] +{ + @extend .input; +} +textarea +{ + @extend .textarea; +} +select +{ + // @extend .select; +} +input[type=file] +{ + // @extend .file-input; +} -- 2.20.1