Skip to content

Commit e50b2e1

Browse files
committed
Review fixes pt 3
1 parent 820b180 commit e50b2e1

File tree

6 files changed

+11
-10
lines changed

6 files changed

+11
-10
lines changed

src/bundle/Resources/public/js/scripts/admin.notifications.list.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
const SELECTOR_TOGGLE_NOTIFICATION = '.ibexa-notification-view-all__mail';
55
const { showErrorNotification } = ibexa.helpers.notification;
66
const { getJsonFromResponse } = ibexa.helpers.request;
7-
const markAllAsReadBtn = doc.querySelector('.ibexa-notification-list__mark-all-read');
7+
const markAllAsReadBtn = doc.querySelector('.ibexa-notification-list__btn--mark-all-as-read');
88
const markAsReadBtn = doc.querySelector('.ibexa-notification-list__btn--mark-as-read');
99
const deleteBtn = doc.querySelector('.ibexa-notification-list__btn--delete');
1010
const notificationsCheckboxes = [

src/bundle/Resources/public/scss/_notifications.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
border-radius: 0 $ibexa-border-radius $ibexa-border-radius 0;
7474
border: calculateRem(1px) solid $ibexa-color-light;
7575
background-color: $ibexa-color-white;
76-
transition: width 0.3s ease;
76+
transition: width $ibexa-admin-transition-duration $ibexa-admin-transition;
7777
}
7878

7979
&__table-btns {

src/bundle/Resources/public/scss/_side-panel.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
background-color: $ibexa-color-white;
33
padding: calculateRem(8px) 0;
44
width: calculateRem(516px);
5-
height: calc(100vh - #{calculateRem(73px)});
5+
height: calc(100vh - calculateRem(73px));
66
position: fixed;
77
top: calculateRem(73px);
88
right: 0;

src/bundle/Resources/views/themes/admin/account/notifications/filters.html.twig

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,9 @@
4444

4545
<div class="ibexa-list-filters__items accordion">
4646
{{ form_row(search_form.type) }}
47-
{% if search_form.statuses is defined %}{{ form_row(search_form.statuses) }}{% endif %}
47+
{% if search_form.statuses is defined %}
48+
{{ form_row(search_form.statuses) }}
49+
{% endif %}
4850
{{ form_row(search_form.createdRange) }}
4951
{{ form_rest(search_form) }}
5052
</div>

src/bundle/Resources/views/themes/admin/account/notifications/list_all.html.twig

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% extends "@ibexadesign/ui/layout.html.twig" %}
1+
{% extends '@ibexadesign/ui/layout.html.twig' %}
22

33
{% import '@ibexadesign/ui/component/macros.html.twig' as html %}
44
{% import _self as macros %}
@@ -12,7 +12,7 @@
1212
{% block title %}{{ 'ibexa_notifications'|trans|desc('Notifications') }}{% endblock %}
1313

1414
{% block header %}
15-
<div class="ibexa-notification-list__mark-all-read">
15+
<div class="ibexa-notification-list__btn--mark-all-as-read">
1616
<button class="btn ibexa-btn ibexa-btn--secondary">
1717
{{ 'ibexa_notifications.btn.mark_all_as_read'|trans|desc('Mark all as read') }}
1818
</button>
@@ -25,7 +25,7 @@
2525

2626
{% block content %}
2727
{{ form_start(form_remove, {
28-
'action': path('ibexa.notifications.delete_multiple'),
28+
action: path('ibexa.notifications.delete_multiple'),
2929
'attr': {
3030
'class': 'ibexa-toggle-btn-state ibexa-notification-list__hidden-btn',
3131
'data-toggle-button-id': '#confirm-' ~ form_remove.remove.vars.id

src/bundle/Resources/views/themes/admin/ui/component/side_panel/side_panel.html.twig

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@
66
{% set config_panel_footer_class = 'ibexa-side-panel__footer' ~ (footer_class is defined ? footer_class ~ '')%}
77

88
{% set attr = attr|default({})|merge({
9-
class: (' '
10-
~ class|default('') ~ ' '
11-
~ attr.class|default(''))|trim ~ ' ' ~ config_panel_main_class,
9+
~ attr.class|default(''))|trim ~ ' '
10+
~ config_panel_main_class,
1211
}) %}
1312

1413
{% if id is defined %}

0 commit comments

Comments
 (0)