diff --git a/src/plainui/jinja2/plainui/assemblies.html b/src/plainui/jinja2/plainui/assemblies.html index 9b2ce574039c6b0b3c288884010c7f73a38ef6dc..e2a0d5537571c5bfdde927f616765a1ee8cc0626 100644 --- a/src/plainui/jinja2/plainui/assemblies.html +++ b/src/plainui/jinja2/plainui/assemblies.html @@ -40,24 +40,18 @@ <hr class="my-8"> <h2>{{ _("upcoming events") }}</h2> - <div class="border p-6"> - {{ list_events.slider(events_upcoming, is_favorite_events, is_scheduled_events ) }} - </div> + {{ list_events.slider(events_upcoming, is_favorite_events, is_scheduled_events ) }} <hr class="my-8"> <h2>{{ _("recommended events") }}</h2> - <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> + {# TODO: implement recommendation algo. Actual displayes faved events #} + {{ list_events.grid(events_recommended, is_favorite_events, is_scheduled_events ) }} <hr class="my-8"> - <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> + {# Idea / TODO: Maybe list of assemblies which hosting the running / upcoming events? #} + {{ list_assm.list(assemblies, my_favorite_assemblies) }} <hr class="mt-11 border-top-0"> diff --git a/src/plainui/jinja2/plainui/assemblies_all.html b/src/plainui/jinja2/plainui/assemblies_all.html index 43bd1a07996331a0c0e7df0216222f5cd0eeffb8..514114f4f82dc76a53716de1346650f310cd0be7 100644 --- a/src/plainui/jinja2/plainui/assemblies_all.html +++ b/src/plainui/jinja2/plainui/assemblies_all.html @@ -8,7 +8,7 @@ report_url = url('plainui:assemblies_all')) }} <div class="mb-2"> - <a href="{{ url('plainui:assemblies') }}" role="button" class="btn btn btn-secondary"> + <a href="{{ url('plainui:assemblies') }}" > {{ _("assemblies startseite") }} </a> {# actually we don't need a filter here. but maybe coming. @@ -34,9 +34,7 @@ {% endif %} </div> #} </div> - <div class="border p-6 my-8"> - {{ list_assm.list(assemblies, my_favorite_assemblies) }} - </div> + {{ list_assm.list(assemblies, my_favorite_assemblies) }} <hr class="border-top-0 my-11"> diff --git a/src/plainui/jinja2/plainui/assembly.html b/src/plainui/jinja2/plainui/assembly.html index fd7a5c11f6c54fd97009233a4c24069419210d43..879d3c6c0fa55af029e3b3ee0eef621c83a77324 100644 --- a/src/plainui/jinja2/plainui/assembly.html +++ b/src/plainui/jinja2/plainui/assembly.html @@ -19,10 +19,10 @@ ) }} <div class="d-flex mb-8"> - <a href="{{ url('plainui:assemblies') }}" role="button" class="mr-2 btn btn-secondary"> + <a href="{{ url('plainui:assemblies') }}" role="button" class="mr-2"> assemblies start seite </a> - <a class="mr-2 col-auto btn btn-secondary" href="{{ url('plainui:assemblies_all') }}" role="button">all assemblies</a> + <a class="mr-2 col-auto" href="{{ url('plainui:assemblies_all') }}" role="button">all assemblies</a> </div> {% if assembly.banner_image %} @@ -54,44 +54,36 @@ <hr class="my-8"> <h2>{{ _("assembly rooms") }}</h2> - <div class="border p-6"> - {{ list_rooms.list(assembly.rooms.all() ) }} - </div> + {{ list_rooms.list(assembly.rooms.all() ) }} <hr class="my-8"> <h2>{{ _("assembly events") }}</h2> - <div class="border p-6"> - {{ list_events.grid(events, is_favorite_events, is_scheduled_events ) }} - </div> + {{ list_events.grid(events, is_favorite_events, is_scheduled_events ) }} <hr class="my-8"> <h2>{{ _("assembly badges") }}</h2> - <div class="border p-6"> - <div class="row"> - {% if not badges %} - {{ _("No badges publicly available.") }} - {% endif %} - {% for badge_link in badges %} - {{ badge_elements.badge(badge_link) }} - {% endfor %} - </div> + <div class="row"> + {% if not badges %} + {{ _("No badges publicly available.") }} + {% endif %} + {% for badge_link in badges %} + {{ badge_elements.badge(badge_link) }} + {% endfor %} </div> <hr class="my-8"> <h2>{{ _("Self-organized Sessions") }}</h2> {% if can_create_sos -%} - <a class="btn btn-secondary mb-2 " href="{{ url('plainui:sos_new', assembly_slug=assembly.slug) }}">{{ _("new Self-organized Session") }}</a> + <a class="btn btn-primary mb-2 " href="{{ url('plainui:sos_new', assembly_slug=assembly.slug) }}">{{ _("new Self-organized Session") }}</a> {%- endif %} - <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> - {{ list_events.list(sos_private, is_favorite_events, is_scheduled_events ) }} - {% endif %} - </div> + {{ 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> + {{ list_events.list(sos_private, is_favorite_events, is_scheduled_events ) }} + {% endif %} <hr class="my-8"> diff --git a/src/plainui/jinja2/plainui/components/list_assemblies.html b/src/plainui/jinja2/plainui/components/list_assemblies.html index 5d86349be813b2be1336dfaab47baaf6c74be9d4..44561a7ce176d4a299482dc24ea5c6df1feeeeba 100644 --- a/src/plainui/jinja2/plainui/components/list_assemblies.html +++ b/src/plainui/jinja2/plainui/components/list_assemblies.html @@ -20,7 +20,7 @@ {% macro list_el(assembly, faved) -%} {% set link = url('plainui:assembly', assembly_slug=assembly.slug ) %} - {% set color="plattform" if assembly.is_official else "assembly" %} + {% set color="transparent" if assembly.is_official else "transparent" %} <li class="d-flex border border-{{ color }} bg-gradient-{{ color }}-horizontal p-2 align-items-center font-headings{% if not first %} mt-3{% endif %}"> <a @@ -67,7 +67,7 @@ {% macro tile(assembly, faved) -%} {% set link = url('plainui:assembly', assembly_slug=assembly.slug ) %} - {% set color="plattform" if assembly.is_official else "assembly" %} + {% set color="transparent" if assembly.is_official else "transparent" %} <article class="h-100 d-flex flex-column border border-{{ color }}-dark bg-gradient-{{ color }}-vertical"> <a href="{{ link }}" diff --git a/src/plainui/jinja2/plainui/components/list_rooms.html b/src/plainui/jinja2/plainui/components/list_rooms.html index cf216a4d7f9fcb3e64d67e61ee668d28c01b6ba0..ba2bc57067ad0f3b9a55527b27505c03296c503c 100644 --- a/src/plainui/jinja2/plainui/components/list_rooms.html +++ b/src/plainui/jinja2/plainui/components/list_rooms.html @@ -20,7 +20,7 @@ {% macro list_el(room) -%} {% set link = url('plainui:room', room_slug=room.slug) %} - {% set color="secondary" %} + {% set color="white" %} <li class="mt-3 d-flex border border-{{ color }} p-2 align-items-center font-headings"> <span class="btn-icon-big text-white" title="{{ _("roomtype") ~ ': ' ~ _(room.room_type) }}"> {{ icon(room.room_type) }} diff --git a/src/plainui/jinja2/plainui/components/listbox.html b/src/plainui/jinja2/plainui/components/listbox.html index 8e3787e01855437bf1feae55fcf528fea8fbfa6b..0ce6370009c5037ff491e3bda45bd3c0d1cf2743 100644 --- a/src/plainui/jinja2/plainui/components/listbox.html +++ b/src/plainui/jinja2/plainui/components/listbox.html @@ -9,17 +9,17 @@ {% else %} {% set link = item.link %} {% endif %} - <li class="mt-2 d-flex border border-secondary bg-gradient-plattform-horizontal p-2 align-items-center"> + <li class="mt-2 d-flex border border-primary bg-gradient-plattform-horizontal p-2 align-items-center"> <a href="{{ link }}" class="text-white mr-auto"> {{item.name}} </a> - <a href="#" class="mr-2 btn btn-secondary">+ schedule</a> - <a href="#" class="mr-2 btn btn-secondary"> + <a href="#" class="mr-2 btn btn-transparent">+ schedule</a> + <a href="#" class="mr-2 btn btn-transparent"> <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-heart" fill="currentColor" xmlns="http://www.w3.org/2000/svg"> <path fill-rule="evenodd" d="M8 2.748l-.717-.737C5.6.281 2.514.878 1.4 3.053c-.523 1.023-.641 2.5.314 4.385.92 1.815 2.834 3.989 6.286 6.357 3.452-2.368 5.365-4.542 6.286-6.357.955-1.886.838-3.362.314-4.385C13.486.878 10.4.28 8.717 2.01L8 2.748zM8 15C-7.333 4.868 3.279-3.04 7.824 1.143c.06.055.119.112.176.171a3.12 3.12 0 0 1 .176-.17C12.72-3.042 23.333 4.867 8 15z"/> </svg> </a> - <a href="#" class="btn btn-secondary"> + <a href="#" class="btn btn-transparent"> <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-share" fill="currentColor" xmlns="http://www.w3.org/2000/svg"> <path fill-rule="evenodd" d="M13.5 1a1.5 1.5 0 1 0 0 3 1.5 1.5 0 0 0 0-3zM11 2.5a2.5 2.5 0 1 1 .603 1.628l-6.718 3.12a2.499 2.499 0 0 1 0 1.504l6.718 3.12a2.5 2.5 0 1 1-.488.876l-6.718-3.12a2.5 2.5 0 1 1 0-3.256l6.718-3.12A2.5 2.5 0 0 1 11 2.5zm-8.5 4a1.5 1.5 0 1 0 0 3 1.5 1.5 0 0 0 0-3zm11 5.5a1.5 1.5 0 1 0 0 3 1.5 1.5 0 0 0 0-3z"/> </svg> diff --git a/src/plainui/styles/_util-classes.scss b/src/plainui/styles/_util-classes.scss index 0344164b7f7c0a98a7b7862f8e467f0312e1127a..bf41aa90a33a606c3ed574e68162e742e6bc92b7 100644 --- a/src/plainui/styles/_util-classes.scss +++ b/src/plainui/styles/_util-classes.scss @@ -64,19 +64,27 @@ h6, } .bg-gradient-plattform-vertical { - background: $gradient-plattform-vertical; + // background: $gradient-plattform-vertical; + background: none; + background-color: $bg-opacity-color; } .bg-gradient-assembly-vertical { - background: $gradient-assembly-vertical; + // background: $gradient-assembly-vertical; + background: none; + background-color: $bg-opacity-color; } .bg-gradient-plattform-horizontal { - background: $gradient-plattform-horizontal; + // background: $gradient-plattform-horizontal; + background: none; + background-color: $bg-opacity-color; } .bg-gradient-assembly-horizontal { - background: $gradient-assembly-horizontal; + // background: $gradient-assembly-horizontal; + background: none; + background-color: $bg-opacity-color; } .fs-medium {