Skip to content

Commit 9cd800d

Browse files
committed
Merge branch 'main' of github.com:ionic-team/ionic-framework into tabs-router-fixes
2 parents a54a934 + cdb4456 commit 9cd800d

File tree

2 files changed

+35
-9
lines changed

2 files changed

+35
-9
lines changed

core/scripts/testing/styles.css

Lines changed: 26 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/src/components/popover/test/size/index.html

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
ion-app > ion-content {
1717
--background: #dddddd;
1818
}
19-
ion-content button {
19+
ion-content button.trigger {
2020
padding: 12px 16px;
2121
}
2222
.grid {
@@ -57,26 +57,30 @@
5757
<div class="grid">
5858
<div class="grid-item">
5959
<h2>Cover</h2>
60-
<button id="cover-trigger">Trigger</button>
60+
<button id="cover-trigger" class="trigger">Trigger</button>
6161
<ion-popover show-backdrop="false" class="cover-popover" trigger="cover-trigger" size="cover">
6262
<ion-content class="ion-padding"> My really really really really long content </ion-content>
6363
</ion-popover>
6464
</div>
6565
<div class="grid-item">
6666
<h2>With Event</h2>
67-
<button id="event-trigger" onclick="openPopover('event-popover', event, 'false')">Trigger</button>
67+
<button id="event-trigger" class="trigger" onclick="openPopover('event-popover', event, 'false')">
68+
Trigger
69+
</button>
6870
</div>
6971

7072
<div class="grid-item">
7173
<h2>Auto</h2>
72-
<button id="auto-trigger">Trigger</button>
74+
<button id="auto-trigger" class="trigger">Trigger</button>
7375
<ion-popover show-backdrop="false" class="auto-popover" trigger="auto-trigger">
7476
<ion-content class="ion-padding"> My really really really really long content </ion-content>
7577
</ion-popover>
7678
</div>
7779
<div class="grid-item">
7880
<h2>No Event</h2>
79-
<button id="no-event-trigger" onclick="openPopover('no-event-popover', null, 'true')">Trigger</button>
81+
<button id="no-event-trigger" class="trigger" onclick="openPopover('no-event-popover', null, 'true')">
82+
Trigger
83+
</button>
8084
</div>
8185
</div>
8286
</ion-content>

0 commit comments

Comments
 (0)