Skip to content

Commit 87257b6

Browse files
authored
Merge branch 'next' into ROU-11968-card
2 parents d70aa54 + 034d047 commit 87257b6

File tree

90 files changed

+18
-9
lines changed

Some content is hidden

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

90 files changed

+18
-9
lines changed
-476 Bytes

core/src/components/button/button.ionic.scss

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@
102102
--padding-end: #{globals.$ion-space-400};
103103

104104
@include globals.typography(globals.$ion-body-action-sm);
105+
min-width: globals.$ion-scale-1600;
105106

106107
min-height: #{globals.$ion-scale-1000};
107108
}
@@ -111,6 +112,7 @@
111112
--padding-end: #{globals.$ion-space-500};
112113

113114
@include globals.typography(globals.$ion-body-action-md);
115+
min-width: globals.$ion-scale-1800;
114116

115117
min-height: #{globals.$ion-scale-1200};
116118
}
@@ -120,6 +122,7 @@
120122
--padding-end: #{globals.$ion-space-700};
121123

122124
@include globals.typography(globals.$ion-body-action-lg);
125+
min-width: globals.$ion-scale-2000;
123126

124127
min-height: #{globals.$ion-scale-1400};
125128
}
@@ -128,22 +131,28 @@
128131
// -------------------------------------------------------------------------------
129132

130133
/* Button containing only an icon */
131-
::slotted(ion-icon[slot="start"]),
132-
::slotted(ion-icon[slot="end"]),
133-
::slotted(ion-icon[slot="icon-only"]) {
134-
font-size: globals.$ion-font-size-500;
134+
:host(.button-small),
135+
:host(.button-medium) {
136+
::slotted(ion-icon[slot="start"]),
137+
::slotted(ion-icon[slot="end"]),
138+
::slotted(ion-icon[slot="icon-only"]) {
139+
width: globals.$ion-scale-500;
140+
height: globals.$ion-scale-500;
141+
}
135142
}
136143

137144
:host(.button-large) {
138145
::slotted(ion-icon[slot="start"]),
139146
::slotted(ion-icon[slot="end"]),
140147
::slotted(ion-icon[slot="icon-only"]) {
141-
font-size: globals.$ion-font-size-600;
148+
width: globals.$ion-scale-600;
149+
height: globals.$ion-scale-600;
142150
}
143151
}
144152

145153
:host(.button-has-icon-only) {
146154
--padding-end: var(--padding-top);
155+
min-width: unset;
147156

148157
aspect-ratio: 1 / 1;
149158
}
@@ -158,8 +167,8 @@
158167
::slotted(ion-spinner[slot="start"]),
159168
::slotted(ion-spinner[slot="end"]),
160169
::slotted(ion-spinner[slot="icon-only"]) {
161-
width: globals.$ion-space-500;
162-
height: globals.$ion-space-500;
170+
width: globals.$ion-scale-500;
171+
height: globals.$ion-scale-500;
163172
}
164173

165174
// Button Shapes

core/src/components/button/test/theme-ionic/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ <h4>Preview options</h4>
3434

3535
<p>
3636
<ion-select id="select-size" justify="space-between" interface="alert" label="Size" placeholder="">
37-
<ion-select-option selected="true" value="">default</ion-select-option>
3837
<ion-select-option value="small">Small</ion-select-option>
38+
<ion-select-option selected="true" value="medium">Medium</ion-select-option>
3939
<ion-select-option value="large">Large</ion-select-option>
4040
</ion-select>
4141

0 commit comments

Comments
 (0)