From eb588d6ea3c70d9e23135d329d395cf69115bf3f Mon Sep 17 00:00:00 2001
From: siebenseitig <45-siebenseitig@users.noreply.git.cccv.de>
Date: Sat, 26 Dec 2020 11:46:52 +0100
Subject: [PATCH] feat: update margin-bottom
---
src/plainui/jinja2/plainui/assembly.html | 3 +++
src/plainui/jinja2/plainui/board.html | 3 +++
src/plainui/jinja2/plainui/board_entry.html | 2 +-
src/plainui/jinja2/plainui/board_private.html | 3 +++
src/plainui/jinja2/plainui/ccc_events.html | 1 +
src/plainui/jinja2/plainui/conferences.html | 2 +-
src/plainui/jinja2/plainui/event.html | 1 +
src/plainui/jinja2/plainui/fahrplan.html | 3 +++
src/plainui/jinja2/plainui/index.html | 2 +-
src/plainui/jinja2/plainui/room.html | 2 +-
src/plainui/jinja2/plainui/rooms.html | 2 +-
src/plainui/jinja2/plainui/search.html | 2 +-
src/plainui/jinja2/plainui/stream.html | 3 ++-
src/plainui/jinja2/plainui/tag.html | 2 +-
src/plainui/jinja2/plainui/upcoming.html | 3 +--
src/plainui/jinja2/plainui/user.html | 4 ++--
16 files changed, 26 insertions(+), 12 deletions(-)
diff --git a/src/plainui/jinja2/plainui/assembly.html b/src/plainui/jinja2/plainui/assembly.html
index aca14f438..b1b2abbe8 100644
--- a/src/plainui/jinja2/plainui/assembly.html
+++ b/src/plainui/jinja2/plainui/assembly.html
@@ -69,4 +69,7 @@
{{ list_events.list(sos_private, is_favorite_events, is_scheduled_events ) }}
{% endif %}
</div>
+
+ <hr class="my-11 border-top-0">
+
{% endblock %}
diff --git a/src/plainui/jinja2/plainui/board.html b/src/plainui/jinja2/plainui/board.html
index d9a59af9a..a055f645a 100644
--- a/src/plainui/jinja2/plainui/board.html
+++ b/src/plainui/jinja2/plainui/board.html
@@ -75,4 +75,7 @@
{% endif %}
{% endfor -%}
</ul>
+
+ <hr class="my-11 border-top-0">
+
{% endblock %}
diff --git a/src/plainui/jinja2/plainui/board_entry.html b/src/plainui/jinja2/plainui/board_entry.html
index 6ee33fd9c..2775229ff 100644
--- a/src/plainui/jinja2/plainui/board_entry.html
+++ b/src/plainui/jinja2/plainui/board_entry.html
@@ -4,7 +4,7 @@
{% block title %}{{conf.name}} - {{ entry.title }}{% endblock %}
{% block content %}
- <article class="pb-11">
+ <article class="mb-11">
{{ titleMacro.title(title=entry.title,
share_url = url('plainui:board_entry', conf_slug=conf.slug, id=entry.id),
report_url = entry.id,
diff --git a/src/plainui/jinja2/plainui/board_private.html b/src/plainui/jinja2/plainui/board_private.html
index f951722eb..bfdac5c66 100644
--- a/src/plainui/jinja2/plainui/board_private.html
+++ b/src/plainui/jinja2/plainui/board_private.html
@@ -68,4 +68,7 @@
</li>
{% endfor -%}
</ul>
+
+ <hr class="my-11 border-top-0">
+
{% endblock %}
diff --git a/src/plainui/jinja2/plainui/ccc_events.html b/src/plainui/jinja2/plainui/ccc_events.html
index bac0505b1..db005daf0 100644
--- a/src/plainui/jinja2/plainui/ccc_events.html
+++ b/src/plainui/jinja2/plainui/ccc_events.html
@@ -20,4 +20,5 @@
{{ list_events.list(events_ccc, is_favorite_events, is_scheduled_events ) }}
</div>
+ <hr class="my-11 border-top-0">
{% endblock %}
diff --git a/src/plainui/jinja2/plainui/conferences.html b/src/plainui/jinja2/plainui/conferences.html
index 2543fa037..83291fe87 100644
--- a/src/plainui/jinja2/plainui/conferences.html
+++ b/src/plainui/jinja2/plainui/conferences.html
@@ -2,7 +2,7 @@
{% block title %}{{ _("Conferences") }}{% endblock %}
{% block content %}
{{ titleMacro.title(_("Conferences")) }}
- <ul>
+ <ul class="my-11">
{% for conf in conferences %}
<li><a href="{{ url('plainui:landing', conf_slug=conf.slug) }}">{{conf.name}}</a></li>
{% endfor %}
diff --git a/src/plainui/jinja2/plainui/event.html b/src/plainui/jinja2/plainui/event.html
index 7aa9522ce..c54ace95a 100644
--- a/src/plainui/jinja2/plainui/event.html
+++ b/src/plainui/jinja2/plainui/event.html
@@ -49,6 +49,7 @@
{{ list_events.slider(events_upcoming, is_favorite_events, is_scheduled_events ) }}
</div>
+ <hr class="my-11 border-top-0">
</article>
{% endblock %}
diff --git a/src/plainui/jinja2/plainui/fahrplan.html b/src/plainui/jinja2/plainui/fahrplan.html
index a1d44bd86..bf80cf662 100644
--- a/src/plainui/jinja2/plainui/fahrplan.html
+++ b/src/plainui/jinja2/plainui/fahrplan.html
@@ -73,4 +73,7 @@
{% elif mode == 'calendar' %}
{{ calendar(events) }}
{% endif %}
+
+ <hr class="my-11 border-top-0">
+
{% endblock %}
diff --git a/src/plainui/jinja2/plainui/index.html b/src/plainui/jinja2/plainui/index.html
index 93e54e08b..790286c2a 100644
--- a/src/plainui/jinja2/plainui/index.html
+++ b/src/plainui/jinja2/plainui/index.html
@@ -46,7 +46,7 @@
<hr class="my-8">
-<div class="border p-6 my-8">
+<div class="border p-6 mt-8 mb-11">
TODO: Tracks...
</div>
diff --git a/src/plainui/jinja2/plainui/room.html b/src/plainui/jinja2/plainui/room.html
index c09107bf8..d2dd77024 100644
--- a/src/plainui/jinja2/plainui/room.html
+++ b/src/plainui/jinja2/plainui/room.html
@@ -23,7 +23,7 @@
<p>{{ markdownMacro.markdown(markdown=room.description | safe) }}</p>
{% endif %}
- <div class="mt-4">
+ <div class="mt-4 mb-11">
<h4>{{ _("Links") }}</h4>
<ul>
{% for link in room.links.all() %}
diff --git a/src/plainui/jinja2/plainui/rooms.html b/src/plainui/jinja2/plainui/rooms.html
index a8a3082d1..af545cc56 100644
--- a/src/plainui/jinja2/plainui/rooms.html
+++ b/src/plainui/jinja2/plainui/rooms.html
@@ -5,7 +5,7 @@
share_url = url('plainui:rooms', conf_slug=conf.slug),
report_url = url('plainui:rooms', conf_slug=conf.slug)) }}
- <ul>
+ <ul class="mt-8 mb-11">
{% for room in rooms %}
<li><a href="{{ url('plainui:room', conf_slug=conf.slug, room_id=room.id) }}">{{room.name}}</a>
<ul>
diff --git a/src/plainui/jinja2/plainui/search.html b/src/plainui/jinja2/plainui/search.html
index aef601561..ed2195ca3 100644
--- a/src/plainui/jinja2/plainui/search.html
+++ b/src/plainui/jinja2/plainui/search.html
@@ -1,7 +1,7 @@
{% extends "plainui/base.html" %}
{% block title %}{{conf.name}} - {{ _("Search Results") }}{% endblock %}
{% block content %}
-<div>
+<div class="mb-11">
<div class="row justify-content-center">
<div class="col-auto"><h1>{{ _("Search Results") }}</h1></div>
<div class="w-100"></div>
diff --git a/src/plainui/jinja2/plainui/stream.html b/src/plainui/jinja2/plainui/stream.html
index aac5f8c2c..7d6cdfd50 100644
--- a/src/plainui/jinja2/plainui/stream.html
+++ b/src/plainui/jinja2/plainui/stream.html
@@ -11,8 +11,9 @@
<p>TODO: Stream</p>
</figure>
- <div class="my-8">
+ <div class="mt-8 mb-11">
<h2 class="mb-5">{{_("External Ressources")}}</h2>
{{ markdownMacro.markdown(markdown="TODO: add some notes as markdown for the livestream event") }}
</div>
+
{% endblock %}
diff --git a/src/plainui/jinja2/plainui/tag.html b/src/plainui/jinja2/plainui/tag.html
index 38c676337..09d4d9c57 100644
--- a/src/plainui/jinja2/plainui/tag.html
+++ b/src/plainui/jinja2/plainui/tag.html
@@ -1,7 +1,7 @@
{% extends "plainui/base.html" %}
{% block title %}{{conf.name}} - {{ _("Tag %(name)s", name=tag.slug) }}{% endblock %}
{% block content %}
-<div>
+<div class="mb-11">
<div class="row justify-content-center">
<div class="col-auto"><h1>{{ _("Tag %(name)s", name=tag.slug) }}</h1></div>
<div class="w-100"></div>
diff --git a/src/plainui/jinja2/plainui/upcoming.html b/src/plainui/jinja2/plainui/upcoming.html
index dade71f59..434e7e578 100644
--- a/src/plainui/jinja2/plainui/upcoming.html
+++ b/src/plainui/jinja2/plainui/upcoming.html
@@ -5,8 +5,7 @@
{% block content %}
{{ titleMacro.title(_("Upcoming events")) }}
- <h2>{{ _("upcoming events") }}</h2>
- <div class="border p-6">
+ <div class="border mt-8 mb-11 p-6">
{{ list_events.slider(events, my_favorite_events, my_scheduled_events ) }}
</div>
{% endblock %}
diff --git a/src/plainui/jinja2/plainui/user.html b/src/plainui/jinja2/plainui/user.html
index 395b177b6..08405936e 100644
--- a/src/plainui/jinja2/plainui/user.html
+++ b/src/plainui/jinja2/plainui/user.html
@@ -7,7 +7,7 @@
{% block title %}{{ _("%(conf)s - User %(name)s", conf=conf.name, name=display_user.username) }}{% endblock %}
{% block content %}
-<div class="border my-5 p-6">
+<div class="border mt-8 mb-11 p-6">
<div class="row">
<div class="col">
<h2 class="w-100 text-center bg-secondary p-2">{{ display_user.username }}</h2>
@@ -26,7 +26,7 @@
</div>
</div>
-<div class="border my-5 p-6">
+<div class="border my-8 p-6">
<div class="row">
<div class="col">
<h2 class="bg-secondary text-center p-2">{{ _("badges") }}</h2>
--
GitLab