Skip to content

Commit 2d6c79b

Browse files
authored
Merge branch 'master' into simeonoff/merge-sassdocs
2 parents 078feea + 7e9bbef commit 2d6c79b

File tree

6 files changed

+27
-27
lines changed

6 files changed

+27
-27
lines changed

projects/igniteui-angular/src/lib/core/styles/components/calendar/_calendar-theme.scss

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -406,24 +406,24 @@
406406

407407
$cal-header-year-margin: 0;
408408
$cal-header-date-margin: 0;
409-
$cal-header-padding: em(16px);
409+
$cal-header-padding: rem(16px);
410410

411411
$variant: map.get($theme, 'variant');
412412
$bootstrap-theme: $variant == 'bootstrap';
413413
$not-bootstrap-theme: $variant != 'bootstrap';
414414

415415
$cal-picker-padding: map.get((
416-
material: em(16px),
417-
fluent: em(16px),
418-
bootstrap: em(8px),
419-
indigo-design: em(16px),
416+
material: rem(16px),
417+
fluent: rem(16px),
418+
bootstrap: rem(8px),
419+
indigo-design: rem(16px),
420420
), $variant);
421421

422422
$cal-value-w: map.get((
423-
material: em(40px),
424-
fluent: em(40px),
425-
bootstrap: em(32px),
426-
indigo-design: em(40px),
423+
material: rem(40px),
424+
fluent: rem(40px),
425+
bootstrap: rem(32px),
426+
indigo-design: rem(40px),
427427
), $variant);
428428

429429
$border-width: map.get((
@@ -444,8 +444,8 @@
444444
$cal-value-br: math.div($cal-value-w, 2);
445445
$cal-value-fw: 600;
446446

447-
$cal-value-month-margin: 0 em(12px);
448-
$cal-value-month-height: em(91px);
447+
$cal-value-month-margin: 0 rem(12px);
448+
$cal-value-month-height: rem(91px);
449449

450450
$cal-row-padding: rem(8px);
451451
$cal-row-margin: rem(2px) 0;
@@ -516,7 +516,7 @@
516516
flex-flow: row nowrap;
517517

518518
%cal-header-display {
519-
min-width: em(168px);
519+
min-width: rem(168px);
520520
}
521521
}
522522

@@ -555,7 +555,7 @@
555555

556556
%cal-picker-display {
557557
display: flex;
558-
height: em(56px);
558+
height: rem(56px);
559559
align-items: center;
560560
padding-bottom: $cal-picker-padding;
561561
background: var-get($theme, 'picker-background-color');

projects/igniteui-angular/src/lib/core/styles/components/checkbox/_checkbox-theme.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@
9393

9494
// If updating the WIDTH of the checkbox here, please update it in the grid theme as well.
9595
// It is under the name of $cbx-size
96-
$size: em(20px);
97-
$size-bs: em(16px);
96+
$size: rem(20px);
97+
$size-bs: rem(16px);
9898
$checkbox-radius: math.div($size, 2);
9999

100100
$variant: map.get($theme, variant);
@@ -121,7 +121,7 @@
121121
indigo-design: none,
122122
), $variant);
123123

124-
$label-margin: em(8px);
124+
$label-margin: rem(8px);
125125

126126
$mark-stroke: map.get((
127127
material: 3,
@@ -140,7 +140,7 @@
140140
$mark-length: 24;
141141
$mark-x-factor: math.div($mark-stroke, $mark-length);
142142

143-
$ripple-size: em(48px);
143+
$ripple-size: rem(48px);
144144
$ripple-radius: math.div($ripple-size, 2);
145145

146146
$ripple-theme: ripple-theme(

projects/igniteui-angular/src/lib/core/styles/components/grid-toolbar/_grid-toolbar-theme.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@
281281
%igx-grid-toolbar__dd-list-items {
282282
cursor: pointer;
283283
position: relative;
284-
padding: em(8px) em(16px);
284+
padding: rem(8px) rem(16px);
285285
color: var-get($theme, 'item-text-color');
286286
white-space: nowrap;
287287

projects/igniteui-angular/src/lib/core/styles/components/progress/_progress-theme.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125
), $variant);
126126

127127
$stripe-color: var-get($theme, 'stripes-color');
128-
$value-fs: em(14px, 16px);
128+
$value-fs: rem(14px, 16px);
129129
$value-fw: 600;
130130
$value-margin: 0;
131131

projects/igniteui-angular/src/lib/core/styles/components/radio/_radio-theme.scss

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,17 +77,17 @@
7777
@include css-vars($theme);
7878
@include scale-in-out($start-scale: .9);
7979

80-
$label-margin: em(8px);
80+
$label-margin: rem(8px);
8181

8282
$variant: map.get($theme, variant);
8383
$bootstrap-theme: $variant == 'bootstrap';
8484
$not-bootstrap-theme: $variant != 'bootstrap';
8585

8686
$size: map.get((
87-
material: em(20px),
88-
fluent: em(20px),
89-
bootstrap: em(16px),
90-
indigo-design: em(20px),
87+
material: rem(20px),
88+
fluent: rem(20px),
89+
bootstrap: rem(16px),
90+
indigo-design: rem(20px),
9191
), $variant);
9292

9393
$scale: map.get((
@@ -120,7 +120,7 @@
120120

121121
$transition: all .2s ease-in;
122122

123-
$ripple-size: em(48px);
123+
$ripple-size: rem(48px);
124124
$ripple-radius: math.div($ripple-size, 2);
125125

126126
$ripple-theme: ripple-theme(

projects/igniteui-angular/src/lib/core/styles/components/switch/_switch-theme.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,10 +232,10 @@
232232

233233
$switch-thumb-height: $switch-thumb-width;
234234

235-
$ripple-size: em(48px);
235+
$ripple-size: rem(48px);
236236
$ripple-radius: math.div($ripple-size, 2);
237237

238-
$label-margin: em(8px);
238+
$label-margin: rem(8px);
239239

240240
$input-transition: all .2s $ease-in-out-quad;
241241

0 commit comments

Comments
 (0)