Skip to content

Commit 4d0d56f

Browse files
authored
Merge branch 'ionic-team:main' into main
2 parents 96c5e41 + 3f8346e commit 4d0d56f

File tree

8 files changed

+71
-71
lines changed

8 files changed

+71
-71
lines changed

.github/workflows/assign-issues.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
issues: write
1212
steps:
1313
- name: 'Auto-assign issue'
14-
uses: pozil/auto-assign-issue@b787bcda4fa1620522e73e7a5fe0f3b57b03b6ad # v2.0.1
14+
uses: pozil/auto-assign-issue@d4b175c7e47cd6d5067f5aa83c9f21b93f8c723e # v2.1.1
1515
with:
1616
assignees: brandyscarney, thetaPC, joselrio, rugoncalves, BenOsodrac, JoaoFerreira-FrontEnd, OS-giulianasilva, tanner-reits
1717
numOfAssignee: 1

core/package-lock.json

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

core/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"@capacitor/haptics": "^6.0.0",
4242
"@capacitor/keyboard": "^6.0.0",
4343
"@capacitor/status-bar": "^6.0.0",
44-
"@clack/prompts": "^0.8.0",
44+
"@clack/prompts": "^0.9.0",
4545
"@ionic/eslint-config": "^0.3.0",
4646
"@ionic/prettier-config": "^2.0.0",
4747
"@playwright/test": "^1.46.1",
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,24 @@
11
@import "./select-modal";
2+
@import "../item/item.ios.vars";
3+
@import "../radio/radio.ios.vars";
4+
5+
ion-item {
6+
--inner-padding-end: 0;
7+
}
8+
9+
/**
10+
* The bottom border of the item should only be displayed
11+
* under the text and not the radio icon.
12+
*/
13+
ion-radio::after {
14+
@include position(null, null, 0, calc($radio-ios-icon-width + $item-ios-padding-start));
15+
position: absolute;
16+
17+
width: calc(100% - $radio-ios-icon-width - $item-ios-padding-start); /* Adjust width based on the shift */
18+
19+
border-width: #{0px 0px $item-ios-border-bottom-width 0px};
20+
border-style: #{$item-ios-border-bottom-style};
21+
border-color: #{$item-ios-border-bottom-color};
22+
23+
content: "";
24+
}

core/src/components/select-modal/select-modal.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ export class SelectModal implements ComponentInterface {
8181
<ion-radio-group value={checked} onIonChange={(ev) => this.callOptionHandler(ev)}>
8282
{this.options.map((option) => (
8383
<ion-item
84+
lines="none"
8485
class={{
8586
// TODO FW-4784
8687
'item-radio-checked': option.value === checked,
-10 Bytes
Loading
-1 Bytes
Loading
-32 Bytes
Loading

0 commit comments

Comments
 (0)