From 0e9f75506054176c52b5499db4a0651a594baaa2 Mon Sep 17 00:00:00 2001
From: siebenseitig <45-siebenseitig@users.noreply.git.cccv.de>
Date: Sat, 26 Dec 2020 11:38:51 +0100
Subject: [PATCH] refactor: remove border-tertiary and use default border color
---
src/plainui/jinja2/plainui/assemblies.html | 6 +++---
src/plainui/jinja2/plainui/assemblies_all.html | 2 +-
src/plainui/jinja2/plainui/assemblies_events.html | 4 ++--
src/plainui/jinja2/plainui/assembly.html | 14 +++++++-------
src/plainui/jinja2/plainui/board.html | 2 +-
src/plainui/jinja2/plainui/board_edit.html | 2 +-
src/plainui/jinja2/plainui/board_private.html | 2 +-
src/plainui/jinja2/plainui/ccc_events.html | 4 ++--
.../jinja2/plainui/components/livestream.html | 2 +-
.../jinja2/plainui/components/markdown.html | 2 +-
.../jinja2/plainui/components/resourcesbox.html | 2 +-
src/plainui/jinja2/plainui/components/slider.html | 2 +-
src/plainui/jinja2/plainui/components/tagbox.html | 2 +-
.../jinja2/plainui/components/three_cards.html | 2 +-
src/plainui/jinja2/plainui/dereferrer.html | 2 +-
src/plainui/jinja2/plainui/event.html | 4 ++--
src/plainui/jinja2/plainui/fahrplan.html | 6 +++---
src/plainui/jinja2/plainui/header.html | 2 +-
src/plainui/jinja2/plainui/index.html | 2 +-
src/plainui/jinja2/plainui/login.html | 2 +-
src/plainui/jinja2/plainui/password_change.html | 2 +-
.../jinja2/plainui/password_reset_complete.html | 2 +-
.../jinja2/plainui/password_reset_confirm.html | 2 +-
.../jinja2/plainui/password_reset_done.html | 2 +-
.../jinja2/plainui/password_reset_form.html | 2 +-
src/plainui/jinja2/plainui/profile.html | 4 ++--
src/plainui/jinja2/plainui/redeem_token.html | 6 +++---
src/plainui/jinja2/plainui/report_content.html | 2 +-
src/plainui/jinja2/plainui/sos_edit.html | 2 +-
src/plainui/jinja2/plainui/stream.html | 2 +-
src/plainui/jinja2/plainui/upcoming.html | 2 +-
31 files changed, 47 insertions(+), 47 deletions(-)
diff --git a/src/plainui/jinja2/plainui/assemblies.html b/src/plainui/jinja2/plainui/assemblies.html
index cf90119f6..2607eeceb 100644
--- a/src/plainui/jinja2/plainui/assemblies.html
+++ b/src/plainui/jinja2/plainui/assemblies.html
@@ -40,21 +40,21 @@
<hr class="my-5">
<h2>{{ _("upcoming events") }}</h2>
- <div class="border border-tertiary p-6">
+ <div class="border p-6">
{{ list_events.slider(events_upcoming, is_favorite_events, is_scheduled_events ) }}
</div>
<hr class="my-5">
<h2>{{ _("recommended events") }}</h2>
- <div class="border border-tertiary p-6">
+ <div class="border p-6">
TODO: implement recommendation algo. Actual displayes faved events
{{ list_events.grid(events_recommended, is_favorite_events, is_scheduled_events ) }}
</div>
<hr class="my-5">
- <div class="border border-tertiary p-6">
+ <div class="border p-6">
Idea / TODO: Maybe list of assemblies which hosting the running / upcoming events?
{{ list_assm.list(assemblies, my_favorite_assemblies) }}
</div>
diff --git a/src/plainui/jinja2/plainui/assemblies_all.html b/src/plainui/jinja2/plainui/assemblies_all.html
index bca09a485..5795466b0 100644
--- a/src/plainui/jinja2/plainui/assemblies_all.html
+++ b/src/plainui/jinja2/plainui/assemblies_all.html
@@ -34,7 +34,7 @@
{% endif %}
</div> #}
</div>
- <div class="border border-tertiary p-6 my-8">
+ <div class="border p-6 my-8">
{{ list_assm.list(assemblies, my_favorite_assemblies) }}
</div>
diff --git a/src/plainui/jinja2/plainui/assemblies_events.html b/src/plainui/jinja2/plainui/assemblies_events.html
index 1bcc85cd3..f2163a752 100644
--- a/src/plainui/jinja2/plainui/assemblies_events.html
+++ b/src/plainui/jinja2/plainui/assemblies_events.html
@@ -9,14 +9,14 @@
}}
<h2>{{ _("Running and Upcoming Events") }}</h2>
- <div class="border border-tertiary p-6">
+ <div class="border p-6">
{{ list_events.slider(events_upcoming, is_favorite_events, is_scheduled_events ) }}
</div>
<hr class="my-8">
<h2>{{ _("All Assemblies Events") }}</h2>
- <div class="border border-tertiary p-6">
+ <div class="border p-6">
{{ list_events.list(events_from_assemblies, is_favorite_events, is_scheduled_events ) }}
</div>
diff --git a/src/plainui/jinja2/plainui/assembly.html b/src/plainui/jinja2/plainui/assembly.html
index 5ca3ce53b..aca14f438 100644
--- a/src/plainui/jinja2/plainui/assembly.html
+++ b/src/plainui/jinja2/plainui/assembly.html
@@ -29,7 +29,7 @@
{% endif %}
{% if assembly.description != None and assembly.description != "" -%}
{{- markdownMacro.markdown(markdown=assembly.description_html | safe) -}}
- <hr class="my-8 border-tertiary">
+ <hr class="my-8">
{% endif %}
@@ -42,27 +42,27 @@
</div>
</div>
- <hr class="my-8 border-tertiary">
+ <hr class="my-8">
<h2>{{ _("assembly rooms") }}</h2>
- <div class="border border-tertiary p-6">
+ <div class="border p-6">
{{ list_rooms.list(assembly.rooms.all() ) }}
</div>
- <hr class="my-8 border-tertiary">
+ <hr class="my-8">
<h2>{{ _("assembly events") }}</h2>
- <div class="border border-tertiary p-6">
+ <div class="border p-6">
{{ list_events.grid(events, is_favorite_events, is_scheduled_events ) }}
</div>
- <hr class="my-8 border-tertiary">
+ <hr class="my-8">
<h2 class="">{{ _("Self-organized Sessions") }}</h2>
{% if can_create_sos -%}
<a class="btn btn-secondary mb-2 " href="{{ url('plainui:sos_new', conf_slug=conf.slug, assembly_slug=assembly.slug) }}">{{ _("new Self-organized Session") }}</a>
{%- endif %}
- <div class="border border-tertiary p-6 mb-8">
+ <div class="border p-6 mb-8">
{{ list_events.list(sos, is_favorite_events, is_scheduled_events ) }}
{% if sos_private %}
<h3 class="mt-4 bg bg-info p-2 px-5 text-white text-center">non public Selforganized Sessions</h3>
diff --git a/src/plainui/jinja2/plainui/board.html b/src/plainui/jinja2/plainui/board.html
index 8967c215f..d9a59af9a 100644
--- a/src/plainui/jinja2/plainui/board.html
+++ b/src/plainui/jinja2/plainui/board.html
@@ -7,7 +7,7 @@
share_url = url('plainui:board', conf_slug=conf.slug),
report_url = url('plainui:board', conf_slug=conf.slug)) }}
- <div class="border border-tertiary my-8 p-6">
+ <div class="border my-8 p-6">
<ul class="row mb-0 list-unstyled mw-664 mx-auto">
{#<li class="col-12 mb-3">
<form class="input-group" id="search_board" method="POST" action="{{ url('plainui:search', conf_slug=conf.slug) }}" role="search">
diff --git a/src/plainui/jinja2/plainui/board_edit.html b/src/plainui/jinja2/plainui/board_edit.html
index aa6aff935..5686dba59 100644
--- a/src/plainui/jinja2/plainui/board_edit.html
+++ b/src/plainui/jinja2/plainui/board_edit.html
@@ -5,7 +5,7 @@
<form
method="POST"
- class="border p-6 my-11{% if form.errors %} border-danger{% else %} border-tertiary{% endif %}"
+ class="border p-6 my-11{% if form.errors %} border-danger{% endif %}"
>
<h1 class="text-center bg-info p-3 text-white h3">{{_("Edit Board Entry")}}</h1>
diff --git a/src/plainui/jinja2/plainui/board_private.html b/src/plainui/jinja2/plainui/board_private.html
index 27dbce78e..f951722eb 100644
--- a/src/plainui/jinja2/plainui/board_private.html
+++ b/src/plainui/jinja2/plainui/board_private.html
@@ -6,7 +6,7 @@
{% block content %}
{{ titleMacro.title(_("My Bulletin Board")) }}
- <div class="border border-tertiary my-8 p-6">
+ <div class="border my-8 p-6">
<ul class="row mb-0 list-unstyled mw-664 mx-auto">
{# <li class="col-12 mb-3">
<form class="input-group" id="search_board" method="POST" action="{{ url('plainui:search', conf_slug=conf.slug) }}" role="search">
diff --git a/src/plainui/jinja2/plainui/ccc_events.html b/src/plainui/jinja2/plainui/ccc_events.html
index b8d9d15c7..bac0505b1 100644
--- a/src/plainui/jinja2/plainui/ccc_events.html
+++ b/src/plainui/jinja2/plainui/ccc_events.html
@@ -13,10 +13,10 @@
<hr class="my-8">
{{ markdownMacro.markdown(markdown="TODO: explain what ccc curated events are/ content team?") }}
- <hr class="my-5 border-tertiary">
+ <hr class="my-8">
<h2>{{ _("curated events") }}</h2>
- <div class="border border-tertiary p-6">
+ <div class="border p-6">
{{ list_events.list(events_ccc, is_favorite_events, is_scheduled_events ) }}
</div>
diff --git a/src/plainui/jinja2/plainui/components/livestream.html b/src/plainui/jinja2/plainui/components/livestream.html
index 1f5575291..ccd6e44d5 100644
--- a/src/plainui/jinja2/plainui/components/livestream.html
+++ b/src/plainui/jinja2/plainui/components/livestream.html
@@ -1,7 +1,7 @@
{% macro livestream(title, event, upcomingEvents, recommendedEvents) -%}
<div>
<h2 class="mb-5">{{ title }}</h2>
- <div class="row border border-tertiary p-6 text-center mx-0">
+ <div class="row border p-6 text-center mx-0">
<div class="col-5">
<h3 class="mb-5">{{_("Live Stream")}}<br> TODO: Streaming Data</h3>
<div>
diff --git a/src/plainui/jinja2/plainui/components/markdown.html b/src/plainui/jinja2/plainui/components/markdown.html
index f7ffeeea2..8f6c6f9ab 100644
--- a/src/plainui/jinja2/plainui/components/markdown.html
+++ b/src/plainui/jinja2/plainui/components/markdown.html
@@ -1,5 +1,5 @@
{% macro markdown(markdown) -%}
- <section class="rc3-markdown border border-tertiary py-5 px-8">
+ <section class="rc3-markdown border p-6">
{{- markdown -}}
</section>
{%- endmacro %}
diff --git a/src/plainui/jinja2/plainui/components/resourcesbox.html b/src/plainui/jinja2/plainui/components/resourcesbox.html
index 89c80decb..d50697d53 100644
--- a/src/plainui/jinja2/plainui/components/resourcesbox.html
+++ b/src/plainui/jinja2/plainui/components/resourcesbox.html
@@ -1,7 +1,7 @@
{% macro resourcesbox(resources) -%}
<div>
<h4 class="h2 mb-5">{{_("External Ressources")}}</h4>
- <div class="border border-tertiary p-6">
+ <div class="border p-6">
<ul class="border border-secondary p-3 pl-6 mb-0">
<li class="pr-2"><a href="/foo" title="title">TODO: </a></li>
<li class="pr-2"><a href="/foo" title="title">loop</a></li>
diff --git a/src/plainui/jinja2/plainui/components/slider.html b/src/plainui/jinja2/plainui/components/slider.html
index 0558439e0..17b6baf10 100644
--- a/src/plainui/jinja2/plainui/components/slider.html
+++ b/src/plainui/jinja2/plainui/components/slider.html
@@ -1,5 +1,5 @@
{% macro slider(items) -%}
- <section class="rc3-slider border border-tertiary p-6">
+ <section class="rc3-slider border p-6">
{% if items %}
<ul class="rc3-slider__container row row-cols-1 row-cols-sm-2 row-cols-lg-3 flex-nowrap mb-0 list-unstyled">
{% for item in items %}
diff --git a/src/plainui/jinja2/plainui/components/tagbox.html b/src/plainui/jinja2/plainui/components/tagbox.html
index d96640925..0a167f767 100644
--- a/src/plainui/jinja2/plainui/components/tagbox.html
+++ b/src/plainui/jinja2/plainui/components/tagbox.html
@@ -1,7 +1,7 @@
{% macro tagbox(conf_slug, tags) -%}
<div>
<h4 class="h2 mb-5">{{_("Tags")}}</h4>
- <ul class="border border-tertiary px-6 pt-6 pb-5 list-unstyled mb-0 d-flex flex-row flex-wrap justify-content-center align-items-center">
+ <ul class="border px-6 pt-6 pb-5 list-unstyled mb-0 d-flex flex-row flex-wrap justify-content-center align-items-center">
{%- for tag in tags %}
<li class="pr-2 mb-2">
<a href="{{ url('plainui:tag', conf_slug=conf_slug, tag_slug=tag.tag.slug) }}" class="btn btn-tag-secondary">{{tag.tag.slug}}</a>
diff --git a/src/plainui/jinja2/plainui/components/three_cards.html b/src/plainui/jinja2/plainui/components/three_cards.html
index fdf87b7c7..163a2f11c 100644
--- a/src/plainui/jinja2/plainui/components/three_cards.html
+++ b/src/plainui/jinja2/plainui/components/three_cards.html
@@ -1,6 +1,6 @@
{% macro three_cards(cards) -%}
{% if cards %}
- <div class="border border-tertiary p-6 text-light text-center mx-0">
+ <div class="border p-6 text-light text-center mx-0">
<div class="card-deck">
{% for card in cards %}
<article class="card">
diff --git a/src/plainui/jinja2/plainui/dereferrer.html b/src/plainui/jinja2/plainui/dereferrer.html
index e070c7887..39a59f907 100644
--- a/src/plainui/jinja2/plainui/dereferrer.html
+++ b/src/plainui/jinja2/plainui/dereferrer.html
@@ -3,7 +3,7 @@
{% block content %}
<article class="d-flex justify-content-center align-items-center my-11">
- <section class="p-5 border border-primary text-center mw-810">
+ <section class="p-5 border text-center mw-810">
<h1>{{ _("Hey") }}</h1>
<p>{{ _("You are leaving the »RC3-area«. For external sites, streams and applications the actual owners are completely and solely responsible regarding data protection, copyright, youth protection, etc.!")}}</p>
diff --git a/src/plainui/jinja2/plainui/event.html b/src/plainui/jinja2/plainui/event.html
index af73b7fc8..7aa9522ce 100644
--- a/src/plainui/jinja2/plainui/event.html
+++ b/src/plainui/jinja2/plainui/event.html
@@ -42,10 +42,10 @@
</div>
</aside>
- <hr class="my-5 border-tertiary">
+ <hr class="my-8">
<h2>{{ _("upcoming events") }}</h2>
- <div class="border border-tertiary p-6">
+ <div class="border p-6">
{{ list_events.slider(events_upcoming, is_favorite_events, is_scheduled_events ) }}
</div>
diff --git a/src/plainui/jinja2/plainui/fahrplan.html b/src/plainui/jinja2/plainui/fahrplan.html
index b7a5351ce..a1d44bd86 100644
--- a/src/plainui/jinja2/plainui/fahrplan.html
+++ b/src/plainui/jinja2/plainui/fahrplan.html
@@ -11,14 +11,14 @@
{# TODO: Download options
<h2>{{ _("download") }}</h2>
- <div class="row border border-tertiary p-5 text-center mx-0">
+ <div class="row border p-5 text-center mx-0">
<a href="#" class="btn btn-primary m-2">{{ _("Xcal") }}</a>
<a href="#" class="btn btn-primary m-2">{{ _("Xml") }}</a>
<a href="#" class="btn btn-primary m-2">{{ _("Json") }}</a>
<a href="#" class="btn btn-primary m-2">{{ _("QR-Code") }}</a>
</div> #}
- <form method="GET" class="border border-tertiary p-5">
+ <form method="GET" class="border p-5">
<input type="hidden" name="mode" value="{{mode}}">
{% if show_day_filters %}<input type="hidden" name="show_day_filters" value="y">{% endif %}
{% if show_assembly_filters %}<input type="hidden" name="show_assembly_filters" value="y">{% endif %}
@@ -66,7 +66,7 @@
{% endif %}
</form>
- <hr class="my-5 border-primary">
+ <hr class="my-8">
{% if mode == 'list' %}
{{ list_events.list(events, my_favorite_events, my_scheduled_events) }}
diff --git a/src/plainui/jinja2/plainui/header.html b/src/plainui/jinja2/plainui/header.html
index 3d421a837..078af6fd8 100644
--- a/src/plainui/jinja2/plainui/header.html
+++ b/src/plainui/jinja2/plainui/header.html
@@ -14,7 +14,7 @@
</a>
<form class="rc3-header__main-search input-group" method="POST" action="{{ url('plainui:search', conf_slug=conf.slug) }}" role="search">
{{ csrf_input }}
- <input class="form-control col rc3-header__main-search-input border border-secondary" name="q" type="text" placeholder="{{ _("search") }}" value="{% if search_query is defined %}{{ search_query }}{% endif %}">
+ <input class="form-control col rc3-header__main-search-input" name="q" type="text" placeholder="{{ _("search") }}" value="{% if search_query is defined %}{{ search_query }}{% endif %}">
<button class="rc3-header__main-search-btn input-group-append btn btn-secondary">
<svg width="1em" height="1em" viewBox="0 0 16 16" class=" bi bi-search" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
<title>{{ _("search") }}</title>
diff --git a/src/plainui/jinja2/plainui/index.html b/src/plainui/jinja2/plainui/index.html
index 51be43df2..93e54e08b 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 border-tertiary p-6 my-8">
+<div class="border p-6 my-8">
TODO: Tracks...
</div>
diff --git a/src/plainui/jinja2/plainui/login.html b/src/plainui/jinja2/plainui/login.html
index 4792e98dd..546bf5791 100644
--- a/src/plainui/jinja2/plainui/login.html
+++ b/src/plainui/jinja2/plainui/login.html
@@ -11,7 +11,7 @@
<form
method="POST"
id="login"
- class="mw-810 border p-6 mx-auto mb-11{% if form.errors %} border-danger{% else %} border-tertiary{% endif %}"
+ class="mw-810 border p-6 mx-auto mb-11{% if form.errors %} border-danger{% endif %}"
>
<h1 class="text-center bg-info p-3 text-white h3">{{ _("login") }}</h1>
<input type="hidden" name="next" value="{{next}}">
diff --git a/src/plainui/jinja2/plainui/password_change.html b/src/plainui/jinja2/plainui/password_change.html
index 571eedb99..dc959b26e 100644
--- a/src/plainui/jinja2/plainui/password_change.html
+++ b/src/plainui/jinja2/plainui/password_change.html
@@ -9,7 +9,7 @@
</div>
</div>
-<form method="POST" class="mw-810 border p-6 mx-auto mb-11{% if error %} border-danger{% else %} border-tertiary{% endif %} mt-6">
+<form method="POST" class="mw-810 border p-6 mx-auto mb-11{% if error %} border-danger{% endif %} mt-6">
<h1 class="text-center bg-info p-3 text-white h3">{{ _("Change password") }}</h1>
diff --git a/src/plainui/jinja2/plainui/password_reset_complete.html b/src/plainui/jinja2/plainui/password_reset_complete.html
index a853a3641..6b8a6e375 100644
--- a/src/plainui/jinja2/plainui/password_reset_complete.html
+++ b/src/plainui/jinja2/plainui/password_reset_complete.html
@@ -8,7 +8,7 @@
</div>
</div>
-<div class="border-tertiary p-6 mw-810 border p-6 mx-auto mb-11">
+<div class="p-6 mw-810 border p-6 mx-auto mb-11">
<h1 class="text-center bg-info p-3 text-white h3">{{ title }}</h1>
<p class="my-5 font-headings text-white text-center">{{ _("Your password has been set. You may go ahead and log in now.") }}</p>
diff --git a/src/plainui/jinja2/plainui/password_reset_confirm.html b/src/plainui/jinja2/plainui/password_reset_confirm.html
index 0d880e319..8a5271ccc 100644
--- a/src/plainui/jinja2/plainui/password_reset_confirm.html
+++ b/src/plainui/jinja2/plainui/password_reset_confirm.html
@@ -8,7 +8,7 @@
</div>
</div>
-<form method="POST" id="login-change" class="mw-810 border p-6 mx-auto mb-11{% if error %} border-danger{% else %} border-tertiary{% endif %} mt-6">
+<form method="POST" id="login-change" class="mw-810 border p-6 mx-auto mb-11{% if error %} border-danger{% endif %} mt-6">
<h1 class="text-center bg-info p-3 text-white h3">{{ _("enter new password") }}</h1>
diff --git a/src/plainui/jinja2/plainui/password_reset_done.html b/src/plainui/jinja2/plainui/password_reset_done.html
index 2253a2833..3784b21ba 100644
--- a/src/plainui/jinja2/plainui/password_reset_done.html
+++ b/src/plainui/jinja2/plainui/password_reset_done.html
@@ -8,7 +8,7 @@
</div>
</div>
-<div class="border-tertiary p-6 mw-810 border p-6 mx-auto mb-11">
+<div class="p-6 mw-810 border p-6 mx-auto mb-11">
<h1 class="text-center bg-info p-3 text-white h3">{{ title }}</h1>
<p class="mt-5 mb-3 font-headings text-white text-center">{{ _("We’ve emailed you instructions for setting your password, if an account exists with the email you entered. You should receive them shortly.") }}</p>
diff --git a/src/plainui/jinja2/plainui/password_reset_form.html b/src/plainui/jinja2/plainui/password_reset_form.html
index f6630da66..12438d6c1 100644
--- a/src/plainui/jinja2/plainui/password_reset_form.html
+++ b/src/plainui/jinja2/plainui/password_reset_form.html
@@ -9,7 +9,7 @@
</div>
</div>
-<form method="POST" id="login-reset" class="mw-810 border p-6 mx-auto mb-11{% if error %} border-danger{% else %} border-tertiary{% endif %}">
+<form method="POST" id="login-reset" class="mw-810 border p-6 mx-auto mb-11{% if error %} border-danger{% endif %}">
<h1 class="text-center bg-info p-3 text-white h3">{{ _("reset password") }}</h1>
<input type="hidden" name="next" value="{{next}}">
diff --git a/src/plainui/jinja2/plainui/profile.html b/src/plainui/jinja2/plainui/profile.html
index 58d6ac531..a6af9a4c1 100644
--- a/src/plainui/jinja2/plainui/profile.html
+++ b/src/plainui/jinja2/plainui/profile.html
@@ -69,7 +69,7 @@
<hr class="my-8">
<h2>{{ _("My Favorites") }}</h2>
-<div class="border border-tertiary p-6">
+<div class="border p-6">
<h3 class="bg bg-info p-2 px-5 text-white text-center">{{ ("Events") }}</h3>
{{ list_events.list(my_favorite_events, is_favorite_events, is_fahrplan_events ) }}
<h3 class="bg bg-info p-2 px-5 text-white text-center mt-8">{{ _("Assemblies") }}</h3>
@@ -79,7 +79,7 @@
<hr class="my-8">
<h2>{{ _("My Fahrplan") }}</h2>
-<div class="border border-tertiary p-6">
+<div class="border p-6">
{{ list_events.list(my_fahrplan_events, is_favorite_events, is_fahrplan_events ) }}
</div>
diff --git a/src/plainui/jinja2/plainui/redeem_token.html b/src/plainui/jinja2/plainui/redeem_token.html
index db6773341..96cb168ea 100644
--- a/src/plainui/jinja2/plainui/redeem_token.html
+++ b/src/plainui/jinja2/plainui/redeem_token.html
@@ -13,7 +13,7 @@
<button type="submit" class="btn btn-primary">{{ _("Yes")}}</button>
</form>
{% elif step == 'token' %}
- <form class="border p-6 my-8 border-tertiary" method="GET" action="{{ url('plainui:redeem_token', conf_slug=conf.slug) }}">
+ <form class="border p-6 my-8" method="GET" action="{{ url('plainui:redeem_token', conf_slug=conf.slug) }}">
{{ form_elements.errors(form) }}
{{ form_elements.text(form, 'jwt') }}
<div class="d-flex">
@@ -22,7 +22,7 @@
</form>
{%- else %}
<div>
- <form class="border p-6 my-8 border-tertiary" method="POST" action="{{ url('plainui:redeem_token_create_user', conf_slug=conf.slug) }}">
+ <form class="border p-6 my-8" method="POST" action="{{ url('plainui:redeem_token_create_user', conf_slug=conf.slug) }}">
<h2 class="text-center bg-info p-3 text-white h3">{{ _("Create new Account") }}</h2>
{% if footnote %}<small>{{ _("Use the next form if you already have an account") }}<small>{% endif %}
{{ csrf_input }}
@@ -38,7 +38,7 @@
</div>
<div>
- <form class="border p-6 my-8 border-tertiary" method="POST" action="{{ url('plainui:redeem_token_add_to_user', conf_slug=conf.slug) }}">
+ <form class="border p-6 my-8" method="POST" action="{{ url('plainui:redeem_token_add_to_user', conf_slug=conf.slug) }}">
<h2 class="text-center bg-info p-3 text-white h3" id="#login">{{ _("Got an Account already? Login here") }}</h2>
{{ csrf_input }}
{{ form_elements.errors(form_add) }}
diff --git a/src/plainui/jinja2/plainui/report_content.html b/src/plainui/jinja2/plainui/report_content.html
index 755a6de32..4a171fc05 100644
--- a/src/plainui/jinja2/plainui/report_content.html
+++ b/src/plainui/jinja2/plainui/report_content.html
@@ -37,7 +37,7 @@
<p>{{ _("Your message will be read and processed by one of our angels. We assure you to keep your personal data safe and hidden if not needed to solve your problem.") }}</p>
</form>
- <hr class="my-8 border-secondary">
+ <hr class="my-8">
{{ markdownMacro.markdown(markdown=page.rendered_body|safe) }}
diff --git a/src/plainui/jinja2/plainui/sos_edit.html b/src/plainui/jinja2/plainui/sos_edit.html
index 2fb083cd0..86a80b1dd 100644
--- a/src/plainui/jinja2/plainui/sos_edit.html
+++ b/src/plainui/jinja2/plainui/sos_edit.html
@@ -2,7 +2,7 @@
{% extends "plainui/base.html" %}
{% block title %}{{conf.name}} - Edit Self-organized Session{% endblock %}
{% block content %}
- <form method="POST" class="border p-6 mx-auto my-11{% if form.errors %} border-danger{% else %} border-tertiary{% endif %}">
+ <form method="POST" class="border p-6 mx-auto my-11{% if form.errors %} border-danger{% endif %}">
<h1 class="text-center bg-info p-3 text-white h3">{{ _("Self-organized Session") }}</h1>
{{ csrf_input }}
diff --git a/src/plainui/jinja2/plainui/stream.html b/src/plainui/jinja2/plainui/stream.html
index b5720ea9b..aac5f8c2c 100644
--- a/src/plainui/jinja2/plainui/stream.html
+++ b/src/plainui/jinja2/plainui/stream.html
@@ -7,7 +7,7 @@
share_url = url('plainui:stream', conf_slug=conf.slug, room_id=room.id, link_id=link.id),
report_url = url('plainui:stream', conf_slug=conf.slug, room_id=room.id, link_id=link.id)
) }}
- <figure class="border border-tertiary p-6 my-8">
+ <figure class="border p-6 my-8">
<p>TODO: Stream</p>
</figure>
diff --git a/src/plainui/jinja2/plainui/upcoming.html b/src/plainui/jinja2/plainui/upcoming.html
index 9b0e45e3f..dade71f59 100644
--- a/src/plainui/jinja2/plainui/upcoming.html
+++ b/src/plainui/jinja2/plainui/upcoming.html
@@ -6,7 +6,7 @@
{{ titleMacro.title(_("Upcoming events")) }}
<h2>{{ _("upcoming events") }}</h2>
- <div class="border border-tertiary p-6">
+ <div class="border p-6">
{{ list_events.slider(events, my_favorite_events, my_scheduled_events ) }}
</div>
{% endblock %}
--
GitLab