Skip to content

Commit 2220d83

Browse files
committed
Merge remote-tracking branch 'origin/feature-8.0' into feature-8.1
2 parents 6945adc + adf220b commit 2220d83

File tree

93 files changed

+1260
-432
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+1260
-432
lines changed

.github/CODEOWNERS

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -13,30 +13,7 @@
1313

1414
* @ionic-team/framework
1515

16-
# Frameworks
17-
18-
## Angular
19-
20-
/packages/angular/ @sean-perkins @thetaPC
21-
/packages/angular-server @sean-perkins @thetaPC
22-
/packages/angular/test @thetaPC
23-
24-
## Vue
25-
26-
/packages/vue/ @thetaPC
27-
/packages/vue-router/ @liamdebeasi @thetaPC
28-
/packages/vue/test/ @thetaPC
29-
/packages/vue-router/__tests__ @thetaPC
30-
31-
# Components
32-
33-
/core/src/components/datetime/ @sean-perkins
34-
35-
/core/src/components/nav/ @sean-perkins
36-
/core/src/components/nav-link/ @sean-perkins
37-
3816
# Utilities
3917

40-
/core/src/utils/content/ @sean-perkins
4118
/core/src/utils/gesture/ @liamdebeasi
4219
/core/src/utils/input-shims/ @liamdebeasi

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion

README.md

Lines changed: 3 additions & 3 deletions

core/api.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -550,7 +550,7 @@ ion-infinite-scroll-content,prop,loadingText,IonicSafeString | string | undefine
550550

551551
ion-input,scoped
552552
ion-input,prop,autocapitalize,string,'off',false,false
553-
ion-input,prop,autocomplete,"name" | "on" | "off" | "honorific-prefix" | "given-name" | "additional-name" | "family-name" | "honorific-suffix" | "nickname" | "email" | "username" | "new-password" | "current-password" | "one-time-code" | "organization-title" | "organization" | "street-address" | "address-line1" | "address-line2" | "address-line3" | "address-level4" | "address-level3" | "address-level2" | "address-level1" | "country" | "country-name" | "postal-code" | "cc-name" | "cc-given-name" | "cc-additional-name" | "cc-family-name" | "cc-number" | "cc-exp" | "cc-exp-month" | "cc-exp-year" | "cc-csc" | "cc-type" | "transaction-currency" | "transaction-amount" | "language" | "bday" | "bday-day" | "bday-month" | "bday-year" | "sex" | "tel" | "tel-country-code" | "tel-national" | "tel-area-code" | "tel-local" | "tel-extension" | "impp" | "url" | "photo",'off',false,false
553+
ion-input,prop,autocomplete,"name" | "email" | "tel" | "url" | "on" | "off" | "honorific-prefix" | "given-name" | "additional-name" | "family-name" | "honorific-suffix" | "nickname" | "username" | "new-password" | "current-password" | "one-time-code" | "organization-title" | "organization" | "street-address" | "address-line1" | "address-line2" | "address-line3" | "address-level4" | "address-level3" | "address-level2" | "address-level1" | "country" | "country-name" | "postal-code" | "cc-name" | "cc-given-name" | "cc-additional-name" | "cc-family-name" | "cc-number" | "cc-exp" | "cc-exp-month" | "cc-exp-year" | "cc-csc" | "cc-type" | "transaction-currency" | "transaction-amount" | "language" | "bday" | "bday-day" | "bday-month" | "bday-year" | "sex" | "tel-country-code" | "tel-national" | "tel-area-code" | "tel-local" | "tel-extension" | "impp" | "photo",'off',false,false
554554
ion-input,prop,autocorrect,"off" | "on",'off',false,false
555555
ion-input,prop,autofocus,boolean,false,false,false
556556
ion-input,prop,clearInput,boolean,false,false,false
@@ -1175,7 +1175,7 @@ ion-row,shadow
11751175
ion-searchbar,scoped
11761176
ion-searchbar,prop,animated,boolean,false,false,false
11771177
ion-searchbar,prop,autocapitalize,string,'off',false,false
1178-
ion-searchbar,prop,autocomplete,"name" | "on" | "off" | "honorific-prefix" | "given-name" | "additional-name" | "family-name" | "honorific-suffix" | "nickname" | "email" | "username" | "new-password" | "current-password" | "one-time-code" | "organization-title" | "organization" | "street-address" | "address-line1" | "address-line2" | "address-line3" | "address-level4" | "address-level3" | "address-level2" | "address-level1" | "country" | "country-name" | "postal-code" | "cc-name" | "cc-given-name" | "cc-additional-name" | "cc-family-name" | "cc-number" | "cc-exp" | "cc-exp-month" | "cc-exp-year" | "cc-csc" | "cc-type" | "transaction-currency" | "transaction-amount" | "language" | "bday" | "bday-day" | "bday-month" | "bday-year" | "sex" | "tel" | "tel-country-code" | "tel-national" | "tel-area-code" | "tel-local" | "tel-extension" | "impp" | "url" | "photo",'off',false,false
1178+
ion-searchbar,prop,autocomplete,"name" | "email" | "tel" | "url" | "on" | "off" | "honorific-prefix" | "given-name" | "additional-name" | "family-name" | "honorific-suffix" | "nickname" | "username" | "new-password" | "current-password" | "one-time-code" | "organization-title" | "organization" | "street-address" | "address-line1" | "address-line2" | "address-line3" | "address-level4" | "address-level3" | "address-level2" | "address-level1" | "country" | "country-name" | "postal-code" | "cc-name" | "cc-given-name" | "cc-additional-name" | "cc-family-name" | "cc-number" | "cc-exp" | "cc-exp-month" | "cc-exp-year" | "cc-csc" | "cc-type" | "transaction-currency" | "transaction-amount" | "language" | "bday" | "bday-day" | "bday-month" | "bday-year" | "sex" | "tel-country-code" | "tel-national" | "tel-area-code" | "tel-local" | "tel-extension" | "impp" | "photo",'off',false,false
11791179
ion-searchbar,prop,autocorrect,"off" | "on",'off',false,false
11801180
ion-searchbar,prop,cancelButtonIcon,string,config.get('backButtonIcon', arrowBackSharp) as string,false,false
11811181
ion-searchbar,prop,cancelButtonText,string,'Cancel',false,false

core/package-lock.json

Lines changed: 6 additions & 6 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
@@ -77,7 +77,7 @@
7777
"build.docs.json": "stencil build --docs-json dist/docs.json",
7878
"clean": "node scripts/clean.js",
7979
"css.minify": "cleancss -O2 -o ./css/ionic.bundle.css ./css/ionic.bundle.css",
80-
"css.sass": "sass --embed-sources src/css:./css",
80+
"css.sass": "sass --embed-sources --style compressed src/css:./css",
8181
"eslint": "eslint src",
8282
"lint": "npm run lint.ts && npm run lint.sass && npm run prettier -- --write --cache",
8383
"lint.fix": "npm run lint.ts.fix && npm run lint.sass.fix && npm run prettier -- --write --cache",

core/scripts/readme.md

Lines changed: 2 additions & 42 deletions

core/src/components/button/button.ios.scss

Lines changed: 42 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -149,19 +149,44 @@
149149
}
150150

151151
::slotted(ion-icon[slot="icon-only"]) {
152-
font-size: 1.125em;
152+
/**
153+
* The values were provided through a native iOS app.
154+
* min font size: 15px, default font size: 18px, max font size: 43px
155+
*
156+
* Since the `ion-button` uses `rem` for the font size, we can't
157+
* just pass the desired icon font size in `em` to the `
158+
* dynamic-font-clamp`. Instead, we need to adjust the base size
159+
* to account for the ion-button` font size.
160+
*
161+
* For example, if the default font size of `ion-button` is 16px
162+
* (derived from rem), then the base size can use the default font
163+
* size of the icon.
164+
*/
165+
font-size: dynamic-font-clamp(0.84, 18px, 2.39, 1em);
153166
}
154167

155168
:host(.button-small.button-has-icon-only) {
156169
// TODO(FW-6053): replace em value with the min-height variable.
157170
min-width: clamp(23px, 2.16em, 54px);
158171
// TODO(FW-6053): replace em value with the min-height variable.
159172
min-height: clamp(23px, 2.16em, 54px);
160-
161173
}
162174

163175
:host(.button-small) ::slotted(ion-icon[slot="icon-only"]) {
164-
font-size: 1.4em;
176+
/**
177+
* The values were provided through a native iOS app.
178+
* min font size: 12px, default font size: 17px, max font size: 40px
179+
*
180+
* Since the `ion-button` uses `rem` for the font size, we can't
181+
* just pass the desired icon font size in `em` to the `
182+
* dynamic-font-clamp`. Instead, we need to adjust the base size
183+
* to account for the ion-button` font size.
184+
*
185+
* For example, if the default font size of `ion-button` is 13px
186+
* (derived from rem) and the default font size of the icon is
187+
* 17px, then the base size would need to be increased.
188+
*/
189+
font-size: dynamic-font-clamp(0.58, 20.93px, 1.92, 1em);
165190
}
166191

167192
:host(.button-large.button-has-icon-only) {
@@ -172,7 +197,20 @@
172197
}
173198

174199
:host(.button-large) ::slotted(ion-icon[slot="icon-only"]) {
175-
font-size: 1em;
200+
/**
201+
* The values were provided through a native iOS app.
202+
* min font size: 15px, default font size: 18px, max font size: 43px
203+
*
204+
* Since the `ion-button` uses `rem` for the font size, we can't
205+
* just pass the desired icon font size in `em` to the `
206+
* dynamic-font-clamp`. Instead, we need to adjust the base size
207+
* to account for the ion-button` font size.
208+
*
209+
* For example, if the default font size of `ion-button` is 20px
210+
* (derived from rem) and the default font size of the icon is
211+
* 18px, then the base size would need to be decreased.
212+
*/
213+
font-size: dynamic-font-clamp(1.05, 14.4px, 2.99, 1em);
176214
}
177215

178216
// iOS Button Focused

core/src/components/button/button.md.scss

Lines changed: 45 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,21 @@
142142
}
143143

144144
::slotted(ion-icon[slot="icon-only"]) {
145-
font-size: 1.6em;
145+
/**
146+
* The values were provided through MD design,
147+
* large and small are based on the iOS sizes.
148+
* min font size: 15px, default font size: 22.4px, max font size: 43px
149+
*
150+
* Since the `ion-button` uses `rem` for the font size, we can't
151+
* just pass the desired icon font size in `em` to the `
152+
* dynamic-font-clamp`. Instead, we need to adjust the base size
153+
* to account for the ion-button` font size.
154+
*
155+
* For example, if the default font size of `ion-button` is 14px
156+
* (derived from rem) and the default font size of the icon is
157+
* 22.4px, then the base size would need to be increased.
158+
*/
159+
font-size: dynamic-font-clamp(0.59, 25.6px, 1.68, 1em);
146160
}
147161

148162
:host(.button-small.button-has-icon-only) {
@@ -153,7 +167,21 @@
153167
}
154168

155169
:host(.button-small) ::slotted(ion-icon[slot="icon-only"]) {
156-
font-size: 1.23em;
170+
/**
171+
* The values were provided through MD design,
172+
* large and small are based on the iOS sizes.
173+
* min font size: 12px, default font size: 16px, max font size: 40px
174+
*
175+
* Since the `ion-button` uses `rem` for the font size, we can't
176+
* just pass the desired icon font size in `em` to the `
177+
* dynamic-font-clamp`. Instead, we need to adjust the base size
178+
* to account for the ion-button` font size.
179+
*
180+
* For example, if the default font size of `ion-button` is 13px
181+
* (derived from rem) and the default font size of the icon is
182+
* 16px, then the base size would need to be increased.
183+
*/
184+
font-size: dynamic-font-clamp(0.66, 19.7px, 2.05, 1em);
157185
}
158186

159187
:host(.button-large.button-has-icon-only) {
@@ -164,7 +192,21 @@
164192
}
165193

166194
:host(.button-large) ::slotted(ion-icon[slot="icon-only"]) {
167-
font-size: 1.4em;
195+
/**
196+
* The values were provided through MD design,
197+
* large and small are based on the iOS sizes.
198+
* min font size: 15px, default font size: 28px, max font size: 43px
199+
*
200+
* Since the `ion-button` uses `rem` for the font size, we can't
201+
* just pass the desired icon font size in `em` to the `
202+
* dynamic-font-clamp`. Instead, we need to adjust the base size
203+
* to account for the ion-button` font size.
204+
*
205+
* For example, if the default font size of `ion-button` is 20px
206+
* (derived from rem) and the default font size of the icon is
207+
* 28px, then the base size would need to be increased.
208+
*/
209+
font-size: dynamic-font-clamp(0.67, 22.4px, 1.92, 1em);
168210
}
169211

170212
// Material Design Button: Hover
-48 Bytes

0 commit comments

Comments
 (0)