mirror of
https://github.com/ionic-team/ionic-framework.git
synced 2026-03-13 10:22:08 +08:00
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
This commit is contained in:
@@ -30,6 +30,6 @@
|
||||
"components/toolbar/toolbar.ios";
|
||||
|
||||
|
||||
// iOS Platform
|
||||
@import
|
||||
"platform/cordova.ios";
|
||||
// iOS Platform
|
||||
@import
|
||||
"platform/cordova.ios";
|
||||
|
||||
@@ -30,6 +30,12 @@
|
||||
"components/toolbar/toolbar.md";
|
||||
|
||||
|
||||
// Material Design w/ iOS Platform
|
||||
@import
|
||||
"platform/cordova.md";
|
||||
// Material Design w/ iOS Platform
|
||||
@import
|
||||
"platform/cordova.md";
|
||||
|
||||
|
||||
// Roboto Font
|
||||
@at-root {
|
||||
@import "./fonts/roboto";
|
||||
}
|
||||
|
||||
@@ -30,6 +30,12 @@
|
||||
"components/toolbar/toolbar.wp";
|
||||
|
||||
|
||||
// Windows w/ iOS Platform
|
||||
@import
|
||||
"platform/cordova.wp";
|
||||
// Windows w/ iOS Platform
|
||||
@import
|
||||
"platform/cordova.wp";
|
||||
|
||||
|
||||
// Noto Sans Font
|
||||
@at-root {
|
||||
@import "./fonts/noto-sans";
|
||||
}
|
||||
|
||||
@@ -81,9 +81,3 @@ $toggle-md-handle-background-color-off: color($colors-md, light) !default;
|
||||
font-size: $font-size-md-base;
|
||||
background-color: $background-md-color;
|
||||
}
|
||||
|
||||
|
||||
// Roboto Font
|
||||
@at-root {
|
||||
@import "../fonts/roboto";
|
||||
}
|
||||
|
||||
@@ -80,9 +80,3 @@ $input-wp-border-color: rgba(0, 0, 0, .5) !default;
|
||||
font-size: $font-size-wp-base;
|
||||
background-color: $background-wp-color;
|
||||
}
|
||||
|
||||
|
||||
// Noto Sans Font
|
||||
@at-root {
|
||||
@import "../fonts/noto-sans";
|
||||
}
|
||||
|
||||
@@ -58,9 +58,3 @@ $item-md-padding-icon-bottom: 10px !default;
|
||||
font-size: $font-size-md-base;
|
||||
background-color: $background-md-color;
|
||||
}
|
||||
|
||||
|
||||
// Roboto Font
|
||||
@at-root {
|
||||
@import "../fonts/roboto";
|
||||
}
|
||||
|
||||
@@ -63,9 +63,3 @@ $input-wp-border-color: rgba(0, 0, 0, .5) !default;
|
||||
font-size: $font-size-wp-base;
|
||||
background-color: $background-wp-color;
|
||||
}
|
||||
|
||||
|
||||
// Noto Sans Font
|
||||
@at-root {
|
||||
@import "../fonts/noto-sans";
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user