Skip to content

Commit d602f02

Browse files
Merge branch 'ROU-11323' into ROU-11324
2 parents 1129d9a + db3239a commit d602f02

File tree

8 files changed

+19
-24
lines changed

8 files changed

+19
-24
lines changed

core/src/components/item/item.common.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
@import "../../themes/functions.string";
21
@import "../../themes/mixins";
32

43
// Item

core/src/components/radio/radio.common.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
@import "../../themes/functions.string";
21
@import "../../themes/mixins";
32
@import "./radio.vars.scss";
43

core/src/components/range/range.common.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
@import "../../themes/mixins";
2-
@import "../../themes/functions.string";
32
@import "./range.vars.scss";
43

54
// Range

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
--knob-handle-size: #{globals.$ion-scale-1000};
1313
--bar-height: #{globals.$ion-scale-200};
1414
--bar-background: #{globals.$ion-primitives-neutral-100};
15-
--bar-background-active: #{ion-color(primary, base)};
15+
--bar-background-active: #{globals.ion-color(primary, base)};
1616
--bar-border-radius: #{globals.$ion-border-radius-400};
1717
--height: 42px;
1818

@@ -31,7 +31,7 @@
3131

3232
:host(.ion-color) .range-bar-active,
3333
:host(.ion-color) .range-tick-active {
34-
background: current-color(base);
34+
background: globals.current-color(base);
3535
}
3636

3737
::slotted(ion-icon[slot]) {
@@ -63,7 +63,7 @@
6363
* overlapping the range. The buffer is added to the
6464
* bottom of the range label instead of the host.
6565
*/
66-
@include padding(calc(#{globals.$ion-space-200} + dynamic-font(12px)), null, null, null);
66+
@include padding(calc(globals.$ion-space-200 + globals.dynamic-font(12px)), null, null, null);
6767
}
6868

6969
:host(.range-has-pin.range-label-placement-stacked) .label-text-wrapper {
@@ -72,7 +72,7 @@
7272
* margin to the bottom of the label, it provides a buffer
7373
* for the pin to move into when it is pressed.
7474
*/
75-
@include margin(null, null, calc(#{globals.$ion-space-200} + dynamic-font(12px)), null);
75+
@include margin(null, null, calc(globals.$ion-space-200 + globals.dynamic-font(12px)), null);
7676
}
7777

7878
.range-bar-active {
@@ -84,16 +84,16 @@
8484

8585
&.has-ticks {
8686
@include border-radius(0);
87-
@include margin(null, calc(-1 * #{globals.$ion-scale-100} * 0.5), null, calc(-1 * #{globals.$ion-scale-100} * 0.5));
87+
@include margin(null, calc(-1 * globals.$ion-scale-100 * 0.5), null, calc(-1 * globals.$ion-scale-100 * 0.5));
8888
}
8989
}
9090

9191
.range-tick {
92-
@include margin-horizontal(calc(#{globals.$ion-scale-100} * -0.5), null);
92+
@include margin-horizontal(calc(globals.$ion-scale-100 * -0.5), null);
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((42px * 0.5) - (globals.$ion-scale-300 * 0.5));
9797

9898
width: globals.$ion-scale-100;
9999
height: globals.$ion-scale-300;
@@ -113,7 +113,7 @@
113113

114114
background: transparent;
115115

116-
font-size: dynamic-font(12px);
116+
font-size: globals.dynamic-font(12px);
117117

118118
text-align: center;
119119

@@ -123,7 +123,7 @@
123123
.range-knob {
124124
border-width: globals.$ion-border-size-025;
125125
border-style: solid;
126-
border-color: #{ion-color(primary, base)};
126+
border-color: globals.ion-color(primary, base);
127127
}
128128

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

core/src/components/segment-button/segment-button.common.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
@import "../../themes/functions.string";
21
@import "../../themes/mixins";
32

43
// Segment Button: Common

core/src/components/spinner/spinner.common.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
@import "../../themes/functions.string";
2-
@import "../../themes/functions.color";
31
@import "../../themes/mixins";
2+
// Required to use the current-color function
3+
@import "../../themes/functions.color";
44

55
// Spinners
66
// --------------------------------------------------

core/src/components/toast/toast.common.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
@import "../../themes/mixins";
2-
// Necessary for the mixins to work.
3-
@import "../../themes/functions.string";
2+
// Required to use the current-color function
43
@import "../../themes/functions.color";
54

65
// Toast

core/src/themes/mixins.scss

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@
309309
// ----------------------------------------------------------
310310
@mixin svg-background-image($svg, $flip-rtl: false) {
311311
$url: url-encode($svg);
312-
$viewBox: str-split(str-extract($svg, "viewBox='", "'"), " ");
312+
$viewBox: string.str-split(string.str-extract($svg, "viewBox='", "'"), " ");
313313

314314
@if $flip-rtl != true or $viewBox == null {
315315
@include multi-dir() {
@@ -318,9 +318,9 @@
318318
} @else {
319319
$transform: "transform='translate(#{nth($viewBox, 3)}, 0) scale(-1, 1)'";
320320
$flipped-url: $svg;
321-
$flipped-url: str-replace($flipped-url, "<path", "<path #{$transform}");
322-
$flipped-url: str-replace($flipped-url, "<line", "<line #{$transform}");
323-
$flipped-url: str-replace($flipped-url, "<polygon", "<polygon #{$transform}");
321+
$flipped-url: string.str-replace($flipped-url, "<path", "<path #{$transform}");
322+
$flipped-url: string.str-replace($flipped-url, "<line", "<line #{$transform}");
323+
$flipped-url: string.str-replace($flipped-url, "<polygon", "<polygon #{$transform}");
324324
$flipped-url: url-encode($flipped-url);
325325

326326
@include ltr() {
@@ -575,10 +575,10 @@
575575

576576
@each $transform in $transforms {
577577
@if (str-index($transform, translate3d)) {
578-
$transform: str-replace($transform, "translate3d(");
579-
$transform: str-replace($transform, ")");
578+
$transform: string.str-replace($transform, "translate3d(");
579+
$transform: string.str-replace($transform, ")");
580580

581-
$coordinates: str-split($transform, ",");
581+
$coordinates: string.str-split($transform, ",");
582582

583583
$x: nth($coordinates, 1);
584584
$y: nth($coordinates, 2);

0 commit comments

Comments
 (0)