Skip to content

Commit 87446b1

Browse files
authored
2 parents 3431241 + b4fe243 commit 87446b1

6 files changed

Lines changed: 23 additions & 33 deletions

File tree

src/BootstrapAdminUi/assets/styles/_alert.scss

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,3 @@
66
* For the full copyright and license information, please view the LICENSE
77
* file that was distributed with this source code.
88
*/
9-
10-
.sylius {
11-
&.alert {
12-
background-color: #fff;
13-
}
14-
}

src/BootstrapAdminUi/public/app.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/BootstrapAdminUi/public/app.rtl.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/BootstrapAdminUi/templates/shared/crud/common/content/flashes.html.twig

Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -12,34 +12,30 @@
1212
{% for type in ['success', 'error', 'info', 'warning'] %}
1313
{% for flash in session.flashbag.get(type) %}
1414
<div
15-
class="mt-3 sylius alert alert-{{ type == 'error' ? 'danger' : type }}"
15+
class="mt-3 sylius alert alert-{{ type == 'error' ? 'danger' : type }} alert-dismissible"
1616
role="alert"
1717
{{ sylius_test_html_attribute('sylius-flash-message') }}
1818
{{ sylius_test_html_attribute('sylius-flash-message-type', type) }}
1919
>
20-
<div class="d-flex justify-content-between">
21-
<div class="d-flex">
22-
<div>
23-
{{ ux_icon(icons[type]) }}
24-
</div>
25-
<div class="mx-2">
26-
<h4 class="alert-title">
27-
{% set header = 'sylius.ui.' ~ type %}
28-
{{ header|trans }}
29-
</h4>
30-
<div class="text-secondary">
31-
{% if flash is iterable %}
32-
{{ flash.message|trans(flash.parameters, 'flashes') }}
33-
{% else %}
34-
{{ flash|trans({}, 'flashes') }}
35-
{% endif %}
36-
</div>
37-
</div>
20+
<div class="alert-icon">
21+
{{ ux_icon(icons[type]) }}
22+
</div>
23+
<div>
24+
<h4 class="alert-heading">
25+
{% set header = 'sylius.ui.' ~ type %}
26+
{{ header|trans }}
27+
</h4>
28+
<div class="alert-description">
29+
{% if flash is iterable %}
30+
{{ flash.message|trans(flash.parameters, 'flashes') }}
31+
{% else %}
32+
{{ flash|trans({}, 'flashes') }}
33+
{% endif %}
3834
</div>
39-
<span class="justify-self-end close" data-bs-dismiss="alert" aria-label="Close">
40-
{{ ux_icon('tabler:x') }}
41-
</span>
4235
</div>
36+
<a class="btn-close" data-bs-dismiss="alert" aria-label="close">
37+
{{ ux_icon('tabler:x') }}
38+
</a>
4339
</div>
4440
{% endfor %}
4541
{% endfor %}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div class="input-group ps-2 pt-2 pb-3 menu-search">
22
<button class="btn btn-sm" type="button" disabled data-menu-search-icon>{{ ux_icon('tabler:search', {'class': 'icon mx-1'}) }}</button>
3-
<button class="btn btn-sm" type="button" data-menu-search-clear>{{ ux_icon('tabler:x', {'class': 'icon mx-1'}) }}</button>
4-
<input class="form-control form-control-sm" placeholder="{{ 'sylius.ui.search_menu'|trans }}..." type="text" data-menu-search>
3+
<button class="btn btn-sm btn-dark" type="button" data-menu-search-clear>{{ ux_icon('tabler:x', {'class': 'icon mx-1'}) }}</button>
4+
<input class="form-control form-control-sm text-white" placeholder="{{ 'sylius.ui.search_menu'|trans }}..." type="text" data-menu-search>
55
</div>

src/BootstrapAdminUi/templates/shared/crud/index/content/grid/data_table.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
</tbody>
3636
</table>
3737
</div>
38-
<div class="card-footer d-flex align-items-center">
38+
<div class="card-footer d-flex align-items-center gap-2 flex-wrap">
3939
<div class="text-muted">
4040
{{ pagination.results_count(data) }}
4141
</div>

0 commit comments

Comments
 (0)