Skip to content

Commit 58c9b0d

Browse files
authored
Merge branch 'next' into ROU-12556-v2
2 parents 0eff320 + 253329b commit 58c9b0d

21 files changed

Lines changed: 26 additions & 5 deletions
File renamed without changes.
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
@use "../../themes/ionic/ionic.globals.scss" as globals;
2+
@use "./popover.common";
3+
4+
// Ionic Popover
5+
// --------------------------------------------------
6+
7+
:host {
8+
--width: 250px;
9+
--max-height: 90%;
10+
--box-shadow: #{globals.$ion-elevation-4};
11+
--backdrop-opacity: 0.3;
12+
}
13+
14+
.popover-content {
15+
@include globals.border-radius(globals.$ion-border-radius-400);
16+
@include globals.transform-origin(start, top);
17+
}
18+
19+
.popover-viewport {
20+
transition-delay: 100ms;
21+
}

core/src/components/popover/popover.ios.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import "./popover";
1+
@import "./popover.common";
22
@import "./popover.ios.vars";
33

44
// iOS Popover

core/src/components/popover/popover.md.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import "./popover";
1+
@import "./popover.common";
22
@import "./popover.md.vars";
33

44
// Material Design Popover

core/src/components/popover/popover.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ import { configureDismissInteraction, configureKeyboardInteraction, configureTri
5353
styleUrls: {
5454
ios: 'popover.ios.scss',
5555
md: 'popover.md.scss',
56-
ionic: 'popover.md.scss',
56+
ionic: 'popover.ionic.scss',
5757
},
5858
shadow: true,
5959
})

core/src/components/popover/test/basic/popover.e2e.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { configs, test } from '@utils/test/playwright';
33

44
import { PopoverFixture } from '../fixture';
55

6-
configs().forEach(({ title, screenshot, config }) => {
6+
configs({ modes: ['md', 'ios', 'ionic-md'] }).forEach(({ title, screenshot, config }) => {
77
test.describe(title('popover: rendering'), async () => {
88
test('should not have visual regressions', async ({ page }) => {
99
const popoverFixture = new PopoverFixture(page);
@@ -18,7 +18,7 @@ configs().forEach(({ title, screenshot, config }) => {
1818
/**
1919
* This behavior does not vary across directions.
2020
*/
21-
configs({ directions: ['ltr'] }).forEach(({ title, screenshot, config }) => {
21+
configs({ directions: ['ltr'], modes: ['md', 'ios', 'ionic-md'] }).forEach(({ title, screenshot, config }) => {
2222
test.describe(title('popover: rendering variants'), async () => {
2323
let popoverFixture!: PopoverFixture;
2424
test.beforeEach(async ({ page }) => {
Loading
Loading
Loading
Loading

0 commit comments

Comments
 (0)