Skip to content

Commit 8f08de1

Browse files
committed
fix(sass): move the @at-root font import to the components file
the user will need to include this import themselves if they include components individually fixes #5931
1 parent 203b078 commit 8f08de1

File tree

7 files changed

+21
-33
lines changed

7 files changed

+21
-33
lines changed

ionic/components.ios.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@
3030
"components/toolbar/toolbar.ios";
3131

3232

33-
// iOS Platform
34-
@import
35-
"platform/cordova.ios";
33+
// iOS Platform
34+
@import
35+
"platform/cordova.ios";

ionic/components.md.scss

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,12 @@
3030
"components/toolbar/toolbar.md";
3131

3232

33-
// Material Design w/ iOS Platform
34-
@import
35-
"platform/cordova.md";
33+
// Material Design w/ iOS Platform
34+
@import
35+
"platform/cordova.md";
36+
37+
38+
// Roboto Font
39+
@at-root {
40+
@import "./fonts/roboto";
41+
}

ionic/components.wp.scss

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,12 @@
3030
"components/toolbar/toolbar.wp";
3131

3232

33-
// Windows w/ iOS Platform
34-
@import
35-
"platform/cordova.wp";
33+
// Windows w/ iOS Platform
34+
@import
35+
"platform/cordova.wp";
36+
37+
38+
// Noto Sans Font
39+
@at-root {
40+
@import "./fonts/noto-sans";
41+
}

ionic/themes/dark.md.scss

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,3 @@ $toggle-md-handle-background-color-off: color($colors-md, light) !default;
8181
font-size: $font-size-md-base;
8282
background-color: $background-md-color;
8383
}
84-
85-
86-
// Roboto Font
87-
@at-root {
88-
@import "../fonts/roboto";
89-
}

ionic/themes/dark.wp.scss

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,3 @@ $input-wp-border-color: rgba(0, 0, 0, .5) !default;
8080
font-size: $font-size-wp-base;
8181
background-color: $background-wp-color;
8282
}
83-
84-
85-
// Noto Sans Font
86-
@at-root {
87-
@import "../fonts/noto-sans";
88-
}

ionic/themes/default.md.scss

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,3 @@ $item-md-padding-icon-bottom: 10px !default;
5858
font-size: $font-size-md-base;
5959
background-color: $background-md-color;
6060
}
61-
62-
63-
// Roboto Font
64-
@at-root {
65-
@import "../fonts/roboto";
66-
}

ionic/themes/default.wp.scss

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,3 @@ $input-wp-border-color: rgba(0, 0, 0, .5) !default;
6363
font-size: $font-size-wp-base;
6464
background-color: $background-wp-color;
6565
}
66-
67-
68-
// Noto Sans Font
69-
@at-root {
70-
@import "../fonts/noto-sans";
71-
}

0 commit comments

Comments
 (0)