Skip to content

Commit bc373d5

Browse files
Merge branch 'ROU-11323' into ROU-11324
2 parents 7918734 + eb17aa4 commit bc373d5

File tree

12 files changed

+43
-88
lines changed

12 files changed

+43
-88
lines changed
-9.95 KB
Loading

core/src/components/input/input.ionic.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
@use "../../themes/ionic/ionic.globals.scss" as globals;
22
@import "./input";
3-
@import "./input.ionic.vars";
43
@import "./input.ionic.outline.scss";
54

65
// Ionic Input

core/src/components/input/input.ionic.vars.scss

Lines changed: 0 additions & 2 deletions
This file was deleted.

core/src/components/item/item.ionic.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
@use "../../themes/ionic/ionic.globals.scss" as globals;
22
@use "./item.common";
3-
@use "./item.ionic.vars" as vars;
43

54
// Item
65
// --------------------------------------------------
76

87
:host {
9-
--background: #{vars.$item-ionic-background};
8+
--background: #{globals.$ion-primitives-base-white};
109
--background-activated: #{globals.$ion-primitives-neutral-200};
1110
--border-color: #{globals.$ion-primitives-neutral-300};
1211
--border-style: #{globals.$ion-border-style-solid};

core/src/components/item/item.ionic.vars.scss

Lines changed: 0 additions & 10 deletions
This file was deleted.

core/src/components/list-header/list-header.ionic.scss

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
@use "../../themes/ionic/ionic.globals.scss" as globals;
2-
@use "../item/item.ionic.vars" as itemVars;
32
@import "./list-header";
43

54
:host {
@@ -10,7 +9,7 @@
109

1110
min-height: 58px;
1211

13-
/**
12+
/**
1413
* The focus rings from components like buttons and links
1514
* are being cut off. This style ensures that the focus ring
1615
* is completely visible.
@@ -19,13 +18,13 @@
1918

2019
/* stylelint-disable */
2120
@include ltr() {
22-
padding-right: calc(var(--ion-safe-area-right, 0px) + #{itemVars.$item-ionic-padding-end});
23-
padding-left: calc(var(--ion-safe-area-left, 0px) + #{itemVars.$item-ionic-padding-start});
21+
padding-right: calc(var(--ion-safe-area-right, 0px) + #{globals.$ion-space-400});
22+
padding-left: calc(var(--ion-safe-area-left, 0px) + #{globals.$ion-space-400});
2423
}
2524

2625
@include rtl() {
27-
padding-right: calc(var(--ion-safe-area-right, 0px) + #{itemVars.$item-ionic-padding-start});
28-
padding-left: calc(var(--ion-safe-area-left, 0px) + #{itemVars.$item-ionic-padding-end});
26+
padding-right: calc(var(--ion-safe-area-right, 0px) + #{globals.$ion-space-400});
27+
padding-left: calc(var(--ion-safe-area-left, 0px) + #{globals.$ion-space-400});
2928
}
3029
/* stylelint-enable */
3130
}

core/src/components/list/list.ionic.scss

Lines changed: 10 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
@use "../../themes/ionic/ionic.globals.scss" as globals;
2-
@use "../item/item.ionic.vars" as itemVars;
3-
@import "./list.ionic.vars.scss";
42

53
// Ionic List
64
// --------------------------------------------------
@@ -11,7 +9,7 @@ ion-list {
119

1210
display: block;
1311

14-
background: #{itemVars.$item-ionic-background};
12+
background: #{globals.$ion-primitives-base-white};
1513

1614
contain: content;
1715
list-style-type: none;
@@ -52,7 +50,7 @@ ion-list {
5250
* The top of the list should not have a border radius because
5351
* that would include the header.
5452
*/
55-
@include globals.border-radius(initial, initial, $list-ionic-border-radius-round, $list-ionic-border-radius-round);
53+
@include globals.border-radius(initial, initial, globals.$ion-border-radius-400, globals.$ion-border-radius-400);
5654
}
5755

5856
// Target the first element in the list after the header
@@ -62,7 +60,7 @@ ion-list {
6260
* The bottom of the first element should not have a border radius
6361
* because that would not look connected to the rest.
6462
*/
65-
@include globals.border-radius($list-ionic-border-radius-round, $list-ionic-border-radius-round, initial, initial);
63+
@include globals.border-radius(globals.$ion-border-radius-400, globals.$ion-border-radius-400, initial, initial);
6664
}
6765

6866
/* Soft */
@@ -72,7 +70,7 @@ ion-list {
7270
* The top of the list should not have a border radius because
7371
* that would include the header.
7472
*/
75-
@include globals.border-radius(initial, initial, $list-ionic-border-radius-soft, $list-ionic-border-radius-soft);
73+
@include globals.border-radius(initial, initial, globals.$ion-border-radius-200, globals.$ion-border-radius-200);
7674
}
7775

7876
// Target the first element in the list after the header
@@ -82,7 +80,7 @@ ion-list {
8280
* The bottom of the first element should not have a border radius
8381
* because that would not look connected to the rest.
8482
*/
85-
@include globals.border-radius($list-ionic-border-radius-soft, $list-ionic-border-radius-soft, initial, initial);
83+
@include globals.border-radius(globals.$ion-border-radius-200, globals.$ion-border-radius-200, initial, initial);
8684
}
8785

8886
/* Rectangular */
@@ -92,12 +90,7 @@ ion-list {
9290
* The top of the list should not have a border radius because
9391
* that would include the header.
9492
*/
95-
@include globals.border-radius(
96-
initial,
97-
initial,
98-
$list-ionic-border-radius-rectangular,
99-
$list-ionic-border-radius-rectangular
100-
);
93+
@include globals.border-radius(initial, initial, globals.$ion-border-radius-0, globals.$ion-border-radius-0);
10194
}
10295

10396
// Target the first element in the list after the header
@@ -107,29 +100,24 @@ ion-list {
107100
* The bottom of the first element should not have a border radius
108101
* because that would not look connected to the rest.
109102
*/
110-
@include globals.border-radius(
111-
$list-ionic-border-radius-rectangular,
112-
$list-ionic-border-radius-rectangular,
113-
initial,
114-
initial
115-
);
103+
@include globals.border-radius(globals.$ion-border-radius-0, globals.$ion-border-radius-0, initial, initial);
116104
}
117105
}
118106

119107
.list-ionic:not(:has(ion-list-header)) {
120108
/* Round */
121109
&.list-round {
122-
@include globals.border-radius($list-ionic-border-radius-round);
110+
@include globals.border-radius(globals.$ion-border-radius-400);
123111
}
124112

125113
/* Soft */
126114
&.list-soft {
127-
@include globals.border-radius($list-ionic-border-radius-soft);
115+
@include globals.border-radius(globals.$ion-border-radius-200);
128116
}
129117

130118
/* Rectangular */
131119
&.list-rectangular {
132-
@include globals.border-radius($list-ionic-border-radius-rectangular);
120+
@include globals.border-radius(globals.$ion-border-radius-0);
133121
}
134122
}
135123

core/src/components/list/list.ionic.vars.scss

Lines changed: 0 additions & 11 deletions
This file was deleted.

core/src/components/range/range.ionic.scss

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@
55
// --------------------------------------------------
66

77
:host {
8-
--knob-border-radius: 50%;
8+
--knob-border-radius: #{globals.$ion-border-radius-full};
99
--knob-background: #{globals.$ion-primitives-base-white};
10-
--knob-box-shadow: 0;
11-
--knob-size: 22px;
10+
--knob-box-shadow: none;
11+
--knob-size: #{globals.$ion-scale-600};
1212
--knob-handle-size: #{globals.$ion-scale-1000};
1313
--bar-height: #{globals.$ion-scale-200};
1414
--bar-background: #{globals.$ion-primitives-neutral-100};
1515
--bar-background-active: #{globals.ion-color(primary, base)};
1616
--bar-border-radius: #{globals.$ion-border-radius-400};
17-
--height: 42px;
17+
--height: #{globals.$ion-scale-1000};
1818

1919
@include globals.typography(globals.$ion-body-md-regular);
2020

@@ -39,11 +39,11 @@
3939
}
4040

4141
::slotted([slot="start"]) {
42-
@include margin(0, 16px, 0, 0);
42+
@include margin(0, globals.$ion-space-400, 0, 0);
4343
}
4444

4545
::slotted([slot="end"]) {
46-
@include margin(0, 0, 0, 16px);
46+
@include margin(0, 0, 0, globals.$ion-space-400);
4747
}
4848

4949
::slotted([slot="label"]) {
@@ -93,7 +93,7 @@
9393
@include border-radius(globals.$ion-border-radius-0);
9494

9595
position: absolute;
96-
top: calc((42px * 0.5) - (globals.$ion-scale-300 * 0.5));
96+
top: calc((var(--height) * 0.5) - (globals.$ion-scale-300 * 0.5));
9797

9898
width: globals.$ion-scale-100;
9999
height: globals.$ion-scale-300;
@@ -109,7 +109,7 @@
109109
.range-pin {
110110
@include padding(globals.$ion-space-300, globals.$ion-space-300, globals.$ion-space-300, globals.$ion-space-300);
111111

112-
min-width: 28px;
112+
min-width: globals.$ion-scale-700;
113113

114114
transform: translate3d(0, calc(-100% + 11px), 0) scale(1);
115115

@@ -122,8 +122,9 @@
122122

123123
.range-knob {
124124
border-width: globals.$ion-border-size-025;
125-
border-style: solid;
125+
border-style: globals.$ion-border-style-solid;
126126
border-color: globals.ion-color(primary, base);
127+
box-sizing: border-box;
127128
}
128129

129130
// Ionic Range: Disabled (based on iOS Range)

core/src/components/tab-bar/tab-bar.ionic.scss

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
@use "../../themes/ionic/ionic.globals.scss" as globals;
22
@use "./tab-bar.common";
3-
@import "./tab-bar.ionic.vars";
43

54
:host {
6-
--background: #{$tabbar-ionic-background};
7-
--background-activated: #{$tabbar-ionic-background-activated};
8-
--background-focused: #{$tabbar-ionic-background-focused};
9-
--color: #{$tabbar-ionic-color};
10-
--color-selected: #{$tabbar-ionic-color-selected};
5+
--background: #{globals.$tabbar-ionic-background};
6+
--background-activated: #{globals.$tabbar-ionic-background-activated};
7+
--background-focused: #{globals.$tabbar-ionic-background-focused};
8+
--border: #{globals.$ion-border-size-0} #{globals.$ion-border-style-solid} #{globals.$tabbar-ionic-border-color};
9+
--color: #{globals.$tabbar-ionic-color};
10+
--color-selected: #{globals.$tabbar-ionic-color-selected};
1111

1212
/**
1313
* Tab bar has a box sizing of content-box to ensure the padding

0 commit comments

Comments
 (0)