Skip to content

Commit eea132c

Browse files
authored
Merge branch '4.6' into IBX-10519-add-footer-box-shadow
2 parents 0fde8ae + 632ad6c commit eea132c

File tree

10 files changed

+21
-7
lines changed

10 files changed

+21
-7
lines changed

src/bundle/Resources/public/img/ibexa-icons.svg

Lines changed: 4 additions & 0 deletions
Loading
Lines changed: 4 additions & 0 deletions
Loading

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@
3939
timePicker.dispatchEvent(new Event('input'));
4040
formInput.dispatchEvent(new Event('input'));
4141
}
42-
43-
searchForm.submit();
4442
};
4543
const attachStatusFilterEvents = (filterNode) => {
4644
if (!filterNode) {
@@ -129,6 +127,7 @@
129127
clearFilter(statusFilterNode);
130128
clearFilter(typeFilterNode);
131129
datetimeFilterNodes.forEach((input) => clearFilter(input));
130+
searchForm.submit();
132131
};
133132

134133
attachInitEvents();

src/bundle/Resources/public/js/scripts/quick.action.manager.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
return false;
2626
});
2727

28+
const maxExtraPadding = Math.max(...buttonsToRender.map((config) => config.extraBottomPadding || 2));
29+
2830
buttonsToRender.forEach((buttonConfig, index) => {
2931
const { container } = buttonConfig;
3032

@@ -36,7 +38,7 @@
3638
container.style.right = '2rem';
3739
container.style.zIndex = buttonConfig.zIndex || 1040;
3840

39-
const bottomPosition = `${index * ACTION_BTN_VERTICAL_SPACING + 2}rem`;
41+
const bottomPosition = `${index * ACTION_BTN_VERTICAL_SPACING + maxExtraPadding}rem`;
4042

4143
container.style.bottom = bottomPosition;
4244
});

src/bundle/Resources/public/scss/_back-to-top.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
opacity: 0;
1212
visibility: hidden;
1313
transition: opacity $ibexa-admin-transition-duration $ibexa-admin-transition;
14+
box-shadow: $ibexa-edit-header-box-shadow;
1415

1516
&--visible {
1617
opacity: 1;

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
.ibexa-notifications-modal {
22
cursor: auto;
33

4+
&.ibexa-side-panel {
5+
z-index: 10250;
6+
}
7+
48
&__footer {
59
display: flex;
610
justify-content: flex-end;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
bottom: 0;
44
right: calculateRem(32px);
55
width: calculateRem(400px);
6-
z-index: 50000;
6+
z-index: 10300;
77
}
88

99
.ibexa-notification-list {

src/bundle/Resources/public/scss/ui/modules/muti-file-upload/_upload.popup.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.c-upload-popup {
22
background: rgba($ibexa-color-black, 0.35);
33
position: fixed;
4-
z-index: 99999;
4+
z-index: 10100;
55
top: 0;
66
left: 0;
77
height: 100vh;

src/bundle/Resources/public/scss/ui/modules/universal-discovery/_global.loader.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.m-ud-global-loader {
22
position: fixed;
3-
z-index: 99999;
3+
z-index: 10100;
44
background: $ibexa-color-dark;
55
width: 100%;
66
height: 100%;

src/bundle/Resources/public/scss/ui/modules/universal-discovery/mixins/_selected.items.panel.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
border-top-right-radius: $ibexa-border-radius;
1212
border-bottom-right-radius: $ibexa-border-radius;
1313
box-shadow: calculateRem(4px) calculateRem(22px) calculateRem(47px) 0 rgba($ibexa-color-info, 0.15);
14-
z-index: 1;
14+
z-index: 2;
1515
transition: all $ibexa-admin-transition-duration $ibexa-admin-transition;
1616

1717
&__header {

0 commit comments

Comments
 (0)