Skip to content

Commit b947d1b

Browse files
authored
fix(ui5-shellbar, ui5-breadcrumbs, ui5-barcode-scanner-dialog): align popover paddings (#4894)
Fixes: #4872
1 parent 336737e commit b947d1b

File tree

8 files changed

+27
-6
lines changed

8 files changed

+27
-6
lines changed

packages/fiori/src/BarcodeScannerDialog.hbs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<ui5-dialog stretch
2+
class="ui5-barcode-scanner-dialog-root"
23
dir={{effectiveDir}}
34
@ui5-before-open={{_startReader}}
45
@ui5-after-close={{_resetReader}}>

packages/fiori/src/BarcodeScannerDialog.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { BrowserMultiFormatReader, NotFoundException } from "@zxing/library";
1010
import BarcodeScannerDialogTemplate from "./generated/templates/BarcodeScannerDialogTemplate.lit.js";
1111

1212
// Styles
13-
import barcodeScannerDialogCss from "./generated/themes/BarcodeScannerDialog.css.js";
13+
import BarcodeScannerDialogCss from "./generated/themes/BarcodeScannerDialog.css.js";
1414

1515
// Texts
1616
import {
@@ -134,7 +134,7 @@ class BarcodeScannerDialog extends UI5Element {
134134
}
135135

136136
static get staticAreaStyles() {
137-
return [barcodeScannerDialogCss];
137+
return [BarcodeScannerDialogCss];
138138
}
139139

140140
static async onDefine() {

packages/fiori/src/ShellBar.js

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ import ShellBarPopoverTemplate from "./generated/templates/ShellBarPopoverTempla
3535

3636
// Styles
3737
import styles from "./generated/themes/ShellBar.css.js";
38+
import ShellBarPopoverCss from "./generated/themes/ShellBarPopover.css.js";
3839

3940
const HANDLE_RESIZE_DEBOUNCE_RATE = 200; // ms
4041

@@ -413,10 +414,6 @@ class ShellBar extends UI5Element {
413414
return metadata;
414415
}
415416

416-
static get styles() {
417-
return styles;
418-
}
419-
420417
static get render() {
421418
return litRender;
422419
}
@@ -429,6 +426,14 @@ class ShellBar extends UI5Element {
429426
return ShellBarPopoverTemplate;
430427
}
431428

429+
static get styles() {
430+
return styles;
431+
}
432+
433+
static get staticAreaStyles() {
434+
return [ShellBarPopoverCss];
435+
}
436+
432437
static get FIORI_3_BREAKPOINTS() {
433438
return [
434439
599,

packages/fiori/src/ShellBarPopover.hbs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<ui5-popover class="ui5-shellbar-menu-popover"
2+
hide-arrow
23
placement-type="Bottom"
34
@ui5-before-open={{_menuPopoverBeforeOpen}}
45
@ui5-after-close={{_menuPopoverAfterClose}}

packages/fiori/src/themes/BarcodeScannerDialog.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
.ui5-barcode-scanner-dialog-root::part(content) {
2+
padding: .4375rem;
3+
}
4+
15
/* video */
26
.ui5-barcode-scanner-dialog-video-wrapper,
37
.ui5-barcode-scanner-dialog-video {
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
.ui5-shellbar-menu-popover::part(content),
2+
.ui5-shellbar-overflow-popover::part(content) {
3+
padding: 0;
4+
}
5+

packages/main/src/BreadcrumbsPopover.hbs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<ui5-responsive-popover
2+
class="ui5-breadcrumbs-popover"
23
hide-arrow
34
content-only-on-desktop
45
placement-type="Bottom"

packages/main/src/themes/BreadcrumbsPopover.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
.ui5-breadcrumbs-popover::part(content) {
2+
padding: 0;
3+
}
4+
15
.ui5-breadcrumbs-popover-footer {
26
display: flex;
37
justify-content: flex-end;

0 commit comments

Comments
 (0)