Skip to content
Snippets Groups Projects
Commit 0e9f7550 authored by siebenseitig's avatar siebenseitig
Browse files

refactor: remove border-tertiary and use default border color

parent 8b13a62d
Branches
Tags
No related merge requests found
Showing
with 33 additions and 33 deletions
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -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>
......
......@@ -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">
......
......@@ -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>
......
......@@ -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">
......
......@@ -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>
......
{% 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>
......
{% macro markdown(markdown) -%}
<section class="rc3-markdown border border-tertiary py-5 px-8">
<section class="rc3-markdown border p-6">
{{- markdown -}}
</section>
{%- endmacro %}
......
{% 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>
......
{% 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 %}
......
{% 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>
......
{% 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">
......
......@@ -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>
......
......@@ -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>
......
......@@ -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) }}
......
......@@ -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>
......
......@@ -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>
......
......@@ -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}}">
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment