Skip to content
Snippets Groups Projects
Commit 3bce7688 authored by Thomas Schneider's avatar Thomas Schneider
Browse files

Merge branch 'design' into 'main' 

Design

See merge request !4
parents 6bc645be 25562b33
No related branches found
No related tags found
1 merge request!4Design
Show whitespace changes
Inline Side-by-side
frontend/src/main.less
+ 46
− 0
View file @ 3bce7688
......@@ -51,6 +51,16 @@ body, @{inputs}, @{buttons} {
@{inputs} {
padding: .2rem .3rem;
&.error {
border-color: red;
}
}
.input-error {
width: 100%;
font-size: .875em;
color: red;
grid-column-start: 2;
}
@{buttons} {
......@@ -287,3 +297,39 @@ main {
display: none;
}
}
.flash {
border: 1px solid transparent;
border-radius: 4px;
padding: 0.5rem 1rem;
position: relative;
.flash-background {
opacity: 0.5;
z-index: -1;
position: absolute;
top: 0;
bottom: 0;
left: 0;
right: 0;
}
&.flash-error {
border-color: red;
.flash-background {
background-color: red;
}
}
&.flash-message {
border-color: var(--accent2);
.flash-background {
background-color: var(--accent2);
}
}
& > div {
opacity: 1;
}
}
schilder2000/templates/_base.html.j2
+ 30
− 0
View file @ 3bce7688
......@@ -5,6 +5,32 @@
href="{{ url_for(where) }}"
{%- endmacro -%}
{%- macro render_field(field, class="") -%}
{% if field.type == "CSRFTokenField" -%}
{{ field }}
{%- else -%}
<div class="box">
{%- set error = ' error' if field.errors else '' -%}
{{ field.label(class="for-text"+error) }}
{{ field(class=class+error) }}
{%- for err in field.errors -%}
<div class="input-error">{{ err|e }}</div>
{%- endfor -%}
</div>
{%- endif -%}
{%- endmacro -%}
{%- macro flashes() -%}
{%- with messages = get_flashed_messages(with_categories=true) -%}
{%- for category, m in messages -%}
<div class="flash flash-{{ category }}">
<div>{{ m }}</div>
<div class="flash-background"></div>
</div>
{%- endfor -%}
{%- endwith -%}
{%- endmacro -%}
<!DOCTYPE HTML>
<html lang="{{ lang|default('de') }}">
<head>
......@@ -40,6 +66,10 @@
{%- endblock nav -%}
<main>
<div class="flashes">
{{ flashes() }}
</div>
{%- block main -%}
{%- endblock main -%}
</main>
......
schilder2000/templates/schild.html.j2
+ 0
− 31
View file @ 3bce7688
{% extends "_base.html.j2" %}
{% macro render_field(field, class="") -%}
{% if field.type == "CSRFTokenField" -%}
{{ field }}
{%- else -%}
<div class="box">
{%- set error = ' error' if field.errors else '' -%}
{{ field.label(class="for-text"+error) }}
{{ field(class=class+error) }}
{%- if field.errors -%}
<ul class="errors">
{%- for err in field.errors -%}
<li>{{ err|e }}</li>
{%- endfor -%}
</ul>
{%- endif -%}
</div>
{%- endif -%}
{%- endmacro %}
{% block title -%}
{%- if schild -%}
{{ schild.title }}
......@@ -29,18 +10,6 @@
{% block main -%}
<div class="section-container">
<div class="section">
{%- with messages = get_flashed_messages() -%}
{%- if messages -%}
<ul class="flashes">
{%- for m in messages -%}
<li>{{ m }}</li>
{%- endfor -%}
</ul>
{%- endif -%}
{%- endwith -%}
</div>
<div class="section">
<form method="post" action="">
{{ form.csrf_token }}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment