Skip to content

Commit eb71a6c

Browse files
alerts moved to the bottom center of the page
1 parent 35791d2 commit eb71a6c

8 files changed

Lines changed: 44 additions & 17 deletions

File tree

src/django_smartbase_admin/static/sb_admin/src/css/_base.css

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,4 +104,12 @@
104104
mark {
105105
@apply text-dark-900 bg-notice-100;
106106
}
107+
108+
#notification-messages {
109+
@apply z-1000 fixed bottom-72 left-24 right-24 mx-auto max-w-1180 mb-24 flex flex-col items-center gap-16 overflow-y-auto;
110+
max-height: calc(100vh - 6rem);
111+
@screen xl {
112+
left: 17.75rem;
113+
}
114+
}
107115
}
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<div id="notification-messages" hx-swap-oob="beforeend"
2-
class="messagelist z-1000 fixed right-0 left-0 xl:left-260 mx-24{% if classes %} {{ classes }}{% endif %}">
1+
<div id="notification-messages" hx-swap-oob="beforeend" class="messagelist{% if classes %} {{ classes }}{% endif %}">
32
{% for message in messages %}
43
{% if message.level == DEFAULT_MESSAGE_LEVELS.SUCCESS %}
54
{% include 'sb_admin/partials/messages/alert_success.html' with text=message %}
@@ -8,7 +7,7 @@
87
{% elif message.level == DEFAULT_MESSAGE_LEVELS.ERROR %}
98
{% include 'sb_admin/partials/messages/alert_error.html' with text=message %}
109
{% else %}
11-
{% include 'sb_admin/partials/messages/alert_success.html' with text=message %}
10+
{% include 'sb_admin/partials/messages/alert_info.html' with text=message %}
1211
{% endif %}
1312
{% endfor %}
1413
</div>

src/django_smartbase_admin/templates/sb_admin/partials/messages/alert_base.html

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
{% block content %}
2-
<div {% block attributes %}{% endblock %} class="alert border mb-16 shadow {% block colors %}bg-notice-50 border-notice-100 text-notice-900{% endblock %}">
2+
<div {% block attributes %}{% endblock %} class="alert border shadow {% block colors %}bg-notice-50 border-notice-100 text-notice-900{% endblock %}">
33
{% if OVERRIDE_CONTENT_OF_NOTIFICATION in message.extra_tags %}
44
{{ text|safe }}
55
{% else %}
66
<div class="flex">
77
{% block icon %}
8-
<svg class="w-20 h-20 mr-12 text-notice">
8+
<svg class="w-20 h-20 mr-12 text-notice shrink-0">
99
<use xlink:href="#Info"></use>
1010
</svg>
1111
{% endblock %}
1212
<h5 class="font-semibold">{{ text|safe }}</h5>
1313
<div class="flex ml-auto items-center">
14-
{% include 'sb_admin/partials/messages/alert_close.html' %}
14+
{% block close %}
15+
{% include 'sb_admin/partials/messages/alert_close.html' with css_class="hover:text-notice" %}
16+
{% endblock %}
1517
</div>
1618
</div>
1719
{% endif %}
Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1-
<svg class="w-16 h-16 ml-24 cursor-pointer hover:text-notice js-alert-close">
2-
<use xlink:href="#Close"></use>
3-
</svg>
1+
<div class="ml-16 flex-center js-alert-close p-8 -m-8 cursor-pointer group">
2+
<svg class="w-16 h-16 transition-colors {{ css_class|default:'' }}">
3+
<use xlink:href="#Close"></use>
4+
</svg>
5+
</div>

src/django_smartbase_admin/templates/sb_admin/partials/messages/alert_error.html

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,11 @@
33
{% block colors %}bg-negative-50 border-negative-100 text-negative-900{% endblock %}
44

55
{% block icon %}
6-
<svg class="w-20 h-20 mr-12 text-negative">
7-
<use xlink:href="#Info"></use>
6+
<svg class="w-20 h-20 mr-12 text-negative shrink-0">
7+
<use xlink:href="#Close-one"></use>
88
</svg>
99
{% endblock %}
10+
11+
{% block close %}
12+
{% include 'sb_admin/partials/messages/alert_close.html' with css_class="group-hover:text-negative" %}
13+
{% endblock %}
Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
11
{% extends 'sb_admin/partials/messages/alert_base.html' %}
22

33
{% block colors %}bg-notice-50 border-notice-100 text-notice-900{% endblock %}
4+
{% block attributes %}remove-me="5s"{% endblock %}
45

56
{% block icon %}
6-
<svg class="w-20 h-20 mr-12 text-notice">
7+
<svg class="w-20 h-20 mr-12 text-notice shrink-0">
78
<use xlink:href="#Info"></use>
89
</svg>
910
{% endblock %}
11+
12+
{% block close %}
13+
{% include 'sb_admin/partials/messages/alert_close.html' with css_class="group-hover:text-notice" %}
14+
{% endblock %}

src/django_smartbase_admin/templates/sb_admin/partials/messages/alert_success.html

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@
44
{% block attributes %}remove-me="5s"{% endblock %}
55

66
{% block icon %}
7-
<svg class="w-20 h-20 mr-12 text-success">
8-
<use xlink:href="#Info"></use>
7+
<svg class="w-20 h-20 mr-12 text-success shrink-0">
8+
<use xlink:href="#Check-one"></use>
99
</svg>
1010
{% endblock %}
11+
12+
{% block close %}
13+
{% include 'sb_admin/partials/messages/alert_close.html' with css_class="group-hover:text-success" %}
14+
{% endblock %}
Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
{% extends 'sb_admin/partials/messages/alert_base.html' %}
22

33
{% block colors %}bg-warning-50 border-warning-100 text-warning-900{% endblock %}
4-
{% block attributes %}remove-me="5s"{% endblock %}
54

65
{% block icon %}
7-
<svg class="w-20 h-20 mr-12 text-warning">
8-
<use xlink:href="#Info"></use>
6+
<svg class="w-20 h-20 mr-12 text-warning shrink-0">
7+
<use xlink:href="#Attention"></use>
98
</svg>
109
{% endblock %}
10+
11+
{% block close %}
12+
{% include 'sb_admin/partials/messages/alert_close.html' with css_class="group-hover:text-warning" %}
13+
{% endblock %}

0 commit comments

Comments
 (0)