Skip to content
Snippets Groups Projects
Commit 39c5577c authored by HeJ's avatar HeJ
Browse files

Merge branch 'design-fixes' into 'develop'

Design fixes

Closes #610

See merge request hub/hub!1113
parents 4b204712 a0969ee3
Branches
Tags
No related merge requests found
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
{% import "plainui/components/list_assemblies.html.j2" as list_assm with context %} {% import "plainui/components/list_assemblies.html.j2" as list_assm with context %}
{% import "plainui/components/list_rooms.html.j2" as list_rooms with context %} {% import "plainui/components/list_rooms.html.j2" as list_rooms with context %}
{% import "plainui/components/function_btns.html.j2" as fbtns with context %} {% import "plainui/components/function_btns.html.j2" as fbtns with context %}
{% import "plainui/components/map.html.j2" as mapMacro %} {% import "plainui/components/map.html.j2" as mapMacro with context %}
{% import "plainui/components/alert.html.j2" as alert %} {% import "plainui/components/alert.html.j2" as alert %}
{% block title %} {% block title %}
...@@ -337,5 +337,15 @@ ...@@ -337,5 +337,15 @@
Warning: Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Warning: Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor.
{% endcall %} {% endcall %}
</dd> </dd>
<dt class="h2 pb-3 mb-3 border-bottom">Buttons</dt>
<dd class="mb-10 d-flex gap-3 flex-wrap">
<div class="btn btn-primary">Primary</div>
<div class="btn btn-secondary">Secondary</div>
<div class="btn btn-success">Success</div>
<div class="btn btn-info">Info</div>
<div class="btn btn-warning">Waning</div>
<div class="btn btn-danger">Danger</div>
</dd>
</dl> </dl>
{% endblock content %} {% endblock content %}
...@@ -117,6 +117,6 @@ ...@@ -117,6 +117,6 @@
{% block fullpage_add %} {% block fullpage_add %}
{% if mode == 'calendar' %}<div class="p-3 border m-2">{{ calendar(events) }}</div>{% endif %} {% if mode == 'calendar' %}<div class="bg-black p-3 border m-2">{{ calendar(events) }}</div>{% endif %}
{% endblock fullpage_add %} {% endblock fullpage_add %}
This diff is collapsed.
$public-fahrplan-body-padding: 0.7rem; $public-fahrplan-body-padding: 0.7rem;
.hub-fahrplan { .hub-fahrplan {
background-color: $body-bg-dark;
display: flex; display: flex;
overflow: auto; overflow: auto;
z-index: 5; z-index: 5;
......
$public-fahrplan-body-padding: 0.7rem; $public-fahrplan-body-padding: 0.7rem;
.hub-fahrplan { .hub-fahrplan {
background-color: $body-bg-dark;
display: flex; display: flex;
overflow: auto; overflow: auto;
z-index: 5; z-index: 5;
......
...@@ -14,8 +14,9 @@ ...@@ -14,8 +14,9 @@
@import "../base"; @import "../base";
body { body {
background-image: url("38c3/img/grid-12x16.svg"); background-image: url("38c3/img/blob-collision-wall-1.svg");
background-repeat: repeat; background-position: 100% 100%;
background-repeat: no-repeat;
} }
.hub-alert { .hub-alert {
......
...@@ -18,3 +18,5 @@ $hub-head-category-font: 400 2.1rem "Space Grotesk"; ...@@ -18,3 +18,5 @@ $hub-head-category-font: 400 2.1rem "Space Grotesk";
$hub-section-title-color: $primary; $hub-section-title-color: $primary;
$hub-head-main-color: $primary; $hub-head-main-color: $primary;
$hub-list-item-bg: #29114c; $hub-list-item-bg: #29114c;
$hub-badge-grey-color: $gray-500;
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment