diff --git a/packages/core/src/components/icon/icon.scss b/packages/core/src/components/icon/icon.scss index 0a742920d1..e8b88dbb5b 100644 --- a/packages/core/src/components/icon/icon.scss +++ b/packages/core/src/components/icon/icon.scss @@ -1,6 +1,5 @@ @import "../../themes/ionic.globals"; -@import "../../../node_modules/ionicons/dist/scss/ionicons"; // Icon // -------------------------------------------------- diff --git a/packages/core/src/themes/ionic.components.scss b/packages/core/src/themes/ionic.components.scss index 9fb15921af..18544a1c99 100644 --- a/packages/core/src/themes/ionic.components.scss +++ b/packages/core/src/themes/ionic.components.scss @@ -246,6 +246,5 @@ // Fonts // -------------------------------------------------- @import -"../fonts/ionicons", "../fonts/noto-sans", "../fonts/roboto"; diff --git a/packages/core/src/themes/ionic.globals.scss b/packages/core/src/themes/ionic.globals.scss index 664a16dd48..5529d99c9c 100644 --- a/packages/core/src/themes/ionic.globals.scss +++ b/packages/core/src/themes/ionic.globals.scss @@ -19,10 +19,6 @@ $app-direction: ltr !default; $font-path: "/dist/fonts" !default; -// Ionicons font path -$ionicons-font-path: $font-path !default; - - // Hairline width $hairlines-width: .55px !default; diff --git a/packages/core/src/themes/ionic.ionicons.scss b/packages/core/src/themes/ionic.ionicons.scss deleted file mode 100644 index b1eab136a7..0000000000 --- a/packages/core/src/themes/ionic.ionicons.scss +++ /dev/null @@ -1,4 +0,0 @@ - -// Ionicons build for Ionic Apps -@import -"../fonts/ionicons"; diff --git a/packages/core/tsconfig.json b/packages/core/tsconfig.json index 8637d52011..00c47a22bc 100644 --- a/packages/core/tsconfig.json +++ b/packages/core/tsconfig.json @@ -1,19 +1,19 @@ { "compilerOptions": { "allowJs": true, - "alwaysStrict": true, "allowSyntheticDefaultImports": true, "allowUnreachableCode": false, - "declaration": false, + "alwaysStrict": true, "experimentalDecorators": true, "forceConsistentCasingInFileNames": true, + "jsx": "react", + "jsxFactory": "h", "lib": [ "dom", "es2015" ], - "moduleResolution": "node", "module": "es2015", - "target": "es2015", + "moduleResolution": "node", "noImplicitAny": true, "noImplicitReturns": true, "noUnusedLocals": true, @@ -21,16 +21,14 @@ "outDir": "dist", "pretty": true, "removeComments": false, - "sourceMap": false, - "jsx": "react", - "jsxFactory": "h" + "target": "es2015" }, "include": [ - "**/*.ts", - "**/*.tsx", - "types/jsx.d.ts" + "src/**/*.ts", + "src/**/**/*.tsx" ], "exclude": [ - "node_modules" + "node_modules", + "src/animations" ] } diff --git a/packages/ionic-angular/scripts/demos/sass.config.js b/packages/ionic-angular/scripts/demos/sass.config.js index e8b89ffed9..64c66cc8bb 100644 --- a/packages/ionic-angular/scripts/demos/sass.config.js +++ b/packages/ionic-angular/scripts/demos/sass.config.js @@ -42,7 +42,6 @@ module.exports = { */ includePaths: [ 'src/themes', - 'node_modules/ionicons/dist/scss', 'src/fonts' ], diff --git a/packages/ionic-angular/scripts/demos/variables.scss b/packages/ionic-angular/scripts/demos/variables.scss index 72910b8cc8..62e90971ac 100644 --- a/packages/ionic-angular/scripts/demos/variables.scss +++ b/packages/ionic-angular/scripts/demos/variables.scss @@ -62,14 +62,6 @@ $colors: ( @import "ionic.theme.default"; -// Ionicons -// -------------------------------------------------- -// The premium icon font for Ionic. For more info, please see: -// http://ionicframework.com/docs/ionicons/ - -@import "ionic.ionicons"; - - // Fonts // -------------------------------------------------- // Roboto font is used by default for Material Design. Noto sans diff --git a/packages/ionic-angular/scripts/e2e/copy.config.js b/packages/ionic-angular/scripts/e2e/copy.config.js index 8f1ad8f0ab..78fef81a26 100644 --- a/packages/ionic-angular/scripts/e2e/copy.config.js +++ b/packages/ionic-angular/scripts/e2e/copy.config.js @@ -11,7 +11,7 @@ module.exports = { dest: '{{WWW}}' }, copyFonts: { - src: [path.join(process.cwd(), 'node_modules', 'ionicons', 'dist', 'fonts', '**', '*'), path.join(process.cwd(), 'src', 'fonts', '**', '*')], + src: [path.join(process.cwd(), 'node_modules', 'dist', 'fonts', '**', '*'), path.join(process.cwd(), 'src', 'fonts', '**', '*')], dest: path.join('{{WWW}}', 'assets', 'fonts') }, copyPolyfills: { diff --git a/packages/ionic-angular/scripts/e2e/variables.scss b/packages/ionic-angular/scripts/e2e/variables.scss index a89826721c..79d09bb5dc 100644 --- a/packages/ionic-angular/scripts/e2e/variables.scss +++ b/packages/ionic-angular/scripts/e2e/variables.scss @@ -1,8 +1,7 @@ // Ionic Variables and Theming. For more info, please see: // http://ionicframework.com/docs/theming/ -// Font path is used to include ionicons, -// roboto, and noto sans fonts +// Font path is used to include roboto and noto sans fonts $font-path: "../assets/fonts"; @import "ionic.globals"; @@ -70,14 +69,6 @@ $colors: ( @import "ionic.theme.default"; -// Ionicons -// -------------------------------------------------- -// The premium icon font for Ionic. For more info, please see: -// http://ionicframework.com/docs/ionicons/ - -@import "ionic.ionicons"; - - // Fonts // -------------------------------------------------- // Roboto font is used by default for Material Design. Noto sans diff --git a/packages/ionic-angular/scripts/gulp/util.ts b/packages/ionic-angular/scripts/gulp/util.ts index 1edc62dbc1..6a56fd01cd 100644 --- a/packages/ionic-angular/scripts/gulp/util.ts +++ b/packages/ionic-angular/scripts/gulp/util.ts @@ -128,8 +128,7 @@ export function copyGlobToDest(sourceGlob: string[], destPath: string) { export function copyFonts(destinationPath: string) { return src([ - 'src/fonts/*.+(ttf|woff|woff2)', - 'node_modules/ionicons/dist/fonts/*.+(ttf|woff|woff2)' + 'src/fonts/*.+(ttf|woff|woff2)' ]) .pipe(dest(destinationPath)); } @@ -141,14 +140,12 @@ export function compileSass(destinationPath: string) { let rename = require('gulp-rename'); let buildConfig = require('../build/config'); - let ioniconsPath = join(NODE_MODULES_ROOT, 'ionicons/dist/scss/'); - return src([ join(SRC_ROOT, 'themes/ionic.build.default.scss'), join(SRC_ROOT, 'themes/ionic.build.dark.scss') ]) .pipe(sass({ - includePaths: [ioniconsPath] + includePaths: [] }).on('error', sass.logError) ) .pipe(autoprefixer(buildConfig.autoprefixer)) diff --git a/packages/ionic-angular/src/fonts/ionicons.scss b/packages/ionic-angular/src/fonts/ionicons.scss deleted file mode 100644 index 436a309139..0000000000 --- a/packages/ionic-angular/src/fonts/ionicons.scss +++ /dev/null @@ -1,50 +0,0 @@ - -// Ionicons Icon Font CSS -// -------------------------- -// Ionicons CSS for Ionic's element -// ionicons-icons.scss has the icons and their unicode characters - -$ionicons-font-path: $font-path !default; - -@import "ionicons-icons"; -@import "ionicons-variables"; - - -@font-face { - font-family: "Ionicons"; - src: url("#{$ionicons-font-path}/ionicons.woff2?v=#{$ionicons-version}") format("woff2"), - url("#{$ionicons-font-path}/ionicons.woff?v=#{$ionicons-version}") format("woff"), - url("#{$ionicons-font-path}/ionicons.ttf?v=#{$ionicons-version}") format("truetype"); - font-weight: normal; - font-style: normal; -} - -ion-icon { - display: inline-block; - - font-family: "Ionicons"; - -moz-osx-font-smoothing: grayscale; - -webkit-font-smoothing: antialiased; - font-style: normal; - font-variant: normal; - font-weight: normal; - line-height: 1; - text-rendering: auto; - text-transform: none; - speak: none; - - @include rtl() { - &[aria-label^="arrow"]::before, - &[flip-rtl]::before { - transform: scaleX(-1); - } - - &[unflip-rtl]::before { - transform: scaleX(1); - } - } - - &::before { - display: inline-block; - } -} diff --git a/packages/ionic-angular/src/themes/ionic.components.scss b/packages/ionic-angular/src/themes/ionic.components.scss index 9fb15921af..18544a1c99 100644 --- a/packages/ionic-angular/src/themes/ionic.components.scss +++ b/packages/ionic-angular/src/themes/ionic.components.scss @@ -246,6 +246,5 @@ // Fonts // -------------------------------------------------- @import -"../fonts/ionicons", "../fonts/noto-sans", "../fonts/roboto"; diff --git a/packages/ionic-angular/src/themes/ionic.globals.scss b/packages/ionic-angular/src/themes/ionic.globals.scss index 664a16dd48..5529d99c9c 100644 --- a/packages/ionic-angular/src/themes/ionic.globals.scss +++ b/packages/ionic-angular/src/themes/ionic.globals.scss @@ -19,10 +19,6 @@ $app-direction: ltr !default; $font-path: "/dist/fonts" !default; -// Ionicons font path -$ionicons-font-path: $font-path !default; - - // Hairline width $hairlines-width: .55px !default; diff --git a/packages/ionic-angular/src/themes/ionic.ionicons.scss b/packages/ionic-angular/src/themes/ionic.ionicons.scss deleted file mode 100644 index b1eab136a7..0000000000 --- a/packages/ionic-angular/src/themes/ionic.ionicons.scss +++ /dev/null @@ -1,4 +0,0 @@ - -// Ionicons build for Ionic Apps -@import -"../fonts/ionicons";