Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions src/BootstrapAdminUi/assets/styles/_alert.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,3 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/

.sylius {
&.alert {
background-color: #fff;
}
}
2 changes: 1 addition & 1 deletion src/BootstrapAdminUi/public/app.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/BootstrapAdminUi/public/app.rtl.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -12,34 +12,30 @@
{% for type in ['success', 'error', 'info', 'warning'] %}
{% for flash in session.flashbag.get(type) %}
<div
class="mt-3 sylius alert alert-{{ type == 'error' ? 'danger' : type }}"
class="mt-3 sylius alert alert-{{ type == 'error' ? 'danger' : type }} alert-dismissible"
role="alert"
{{ sylius_test_html_attribute('sylius-flash-message') }}
{{ sylius_test_html_attribute('sylius-flash-message-type', type) }}
>
<div class="d-flex justify-content-between">
<div class="d-flex">
<div>
{{ ux_icon(icons[type]) }}
</div>
<div class="mx-2">
<h4 class="alert-title">
{% set header = 'sylius.ui.' ~ type %}
{{ header|trans }}
</h4>
<div class="text-secondary">
{% if flash is iterable %}
{{ flash.message|trans(flash.parameters, 'flashes') }}
{% else %}
{{ flash|trans({}, 'flashes') }}
{% endif %}
</div>
</div>
<div class="alert-icon">
{{ ux_icon(icons[type]) }}
</div>
<div>
<h4 class="alert-heading">
{% set header = 'sylius.ui.' ~ type %}
{{ header|trans }}
</h4>
<div class="alert-description">
{% if flash is iterable %}
{{ flash.message|trans(flash.parameters, 'flashes') }}
{% else %}
{{ flash|trans({}, 'flashes') }}
{% endif %}
</div>
<span class="justify-self-end close" data-bs-dismiss="alert" aria-label="Close">
{{ ux_icon('tabler:x') }}
</span>
</div>
<a class="btn-close" data-bs-dismiss="alert" aria-label="close">
{{ ux_icon('tabler:x') }}
</a>
</div>
{% endfor %}
{% endfor %}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="input-group ps-2 pt-2 pb-3 menu-search">
<button class="btn btn-sm" type="button" disabled data-menu-search-icon>{{ ux_icon('tabler:search', {'class': 'icon mx-1'}) }}</button>
<button class="btn btn-sm" type="button" data-menu-search-clear>{{ ux_icon('tabler:x', {'class': 'icon mx-1'}) }}</button>
<input class="form-control form-control-sm" placeholder="{{ 'sylius.ui.search_menu'|trans }}..." type="text" data-menu-search>
<button class="btn btn-sm btn-dark" type="button" data-menu-search-clear>{{ ux_icon('tabler:x', {'class': 'icon mx-1'}) }}</button>
<input class="form-control form-control-sm text-white" placeholder="{{ 'sylius.ui.search_menu'|trans }}..." type="text" data-menu-search>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
</tbody>
</table>
</div>
<div class="card-footer d-flex align-items-center">
<div class="card-footer d-flex align-items-center gap-2 flex-wrap">
<div class="text-muted">
{{ pagination.results_count(data) }}
</div>
Expand Down