chore(ionicons): remove ionicon font and scss

This commit is contained in:
Adam Bradley
2017-07-17 08:48:51 -05:00
parent e6ce405972
commit 201821f2fd
14 changed files with 13 additions and 105 deletions

View File

@ -1,6 +1,5 @@
@import "../../themes/ionic.globals"; @import "../../themes/ionic.globals";
@import "../../../node_modules/ionicons/dist/scss/ionicons";
// Icon // Icon
// -------------------------------------------------- // --------------------------------------------------

View File

@ -246,6 +246,5 @@
// Fonts // Fonts
// -------------------------------------------------- // --------------------------------------------------
@import @import
"../fonts/ionicons",
"../fonts/noto-sans", "../fonts/noto-sans",
"../fonts/roboto"; "../fonts/roboto";

View File

@ -19,10 +19,6 @@ $app-direction: ltr !default;
$font-path: "/dist/fonts" !default; $font-path: "/dist/fonts" !default;
// Ionicons font path
$ionicons-font-path: $font-path !default;
// Hairline width // Hairline width
$hairlines-width: .55px !default; $hairlines-width: .55px !default;

View File

@ -1,4 +0,0 @@
// Ionicons build for Ionic Apps
@import
"../fonts/ionicons";

View File

@ -1,19 +1,19 @@
{ {
"compilerOptions": { "compilerOptions": {
"allowJs": true, "allowJs": true,
"alwaysStrict": true,
"allowSyntheticDefaultImports": true, "allowSyntheticDefaultImports": true,
"allowUnreachableCode": false, "allowUnreachableCode": false,
"declaration": false, "alwaysStrict": true,
"experimentalDecorators": true, "experimentalDecorators": true,
"forceConsistentCasingInFileNames": true, "forceConsistentCasingInFileNames": true,
"jsx": "react",
"jsxFactory": "h",
"lib": [ "lib": [
"dom", "dom",
"es2015" "es2015"
], ],
"moduleResolution": "node",
"module": "es2015", "module": "es2015",
"target": "es2015", "moduleResolution": "node",
"noImplicitAny": true, "noImplicitAny": true,
"noImplicitReturns": true, "noImplicitReturns": true,
"noUnusedLocals": true, "noUnusedLocals": true,
@ -21,16 +21,14 @@
"outDir": "dist", "outDir": "dist",
"pretty": true, "pretty": true,
"removeComments": false, "removeComments": false,
"sourceMap": false, "target": "es2015"
"jsx": "react",
"jsxFactory": "h"
}, },
"include": [ "include": [
"**/*.ts", "src/**/*.ts",
"**/*.tsx", "src/**/**/*.tsx"
"types/jsx.d.ts"
], ],
"exclude": [ "exclude": [
"node_modules" "node_modules",
"src/animations"
] ]
} }

View File

@ -42,7 +42,6 @@ module.exports = {
*/ */
includePaths: [ includePaths: [
'src/themes', 'src/themes',
'node_modules/ionicons/dist/scss',
'src/fonts' 'src/fonts'
], ],

View File

@ -62,14 +62,6 @@ $colors: (
@import "ionic.theme.default"; @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 // Fonts
// -------------------------------------------------- // --------------------------------------------------
// Roboto font is used by default for Material Design. Noto sans // Roboto font is used by default for Material Design. Noto sans

View File

@ -11,7 +11,7 @@ module.exports = {
dest: '{{WWW}}' dest: '{{WWW}}'
}, },
copyFonts: { 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') dest: path.join('{{WWW}}', 'assets', 'fonts')
}, },
copyPolyfills: { copyPolyfills: {

View File

@ -1,8 +1,7 @@
// Ionic Variables and Theming. For more info, please see: // Ionic Variables and Theming. For more info, please see:
// http://ionicframework.com/docs/theming/ // http://ionicframework.com/docs/theming/
// Font path is used to include ionicons, // Font path is used to include roboto and noto sans fonts
// roboto, and noto sans fonts
$font-path: "../assets/fonts"; $font-path: "../assets/fonts";
@import "ionic.globals"; @import "ionic.globals";
@ -70,14 +69,6 @@ $colors: (
@import "ionic.theme.default"; @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 // Fonts
// -------------------------------------------------- // --------------------------------------------------
// Roboto font is used by default for Material Design. Noto sans // Roboto font is used by default for Material Design. Noto sans

View File

@ -128,8 +128,7 @@ export function copyGlobToDest(sourceGlob: string[], destPath: string) {
export function copyFonts(destinationPath: string) { export function copyFonts(destinationPath: string) {
return src([ return src([
'src/fonts/*.+(ttf|woff|woff2)', 'src/fonts/*.+(ttf|woff|woff2)'
'node_modules/ionicons/dist/fonts/*.+(ttf|woff|woff2)'
]) ])
.pipe(dest(destinationPath)); .pipe(dest(destinationPath));
} }
@ -141,14 +140,12 @@ export function compileSass(destinationPath: string) {
let rename = require('gulp-rename'); let rename = require('gulp-rename');
let buildConfig = require('../build/config'); let buildConfig = require('../build/config');
let ioniconsPath = join(NODE_MODULES_ROOT, 'ionicons/dist/scss/');
return src([ return src([
join(SRC_ROOT, 'themes/ionic.build.default.scss'), join(SRC_ROOT, 'themes/ionic.build.default.scss'),
join(SRC_ROOT, 'themes/ionic.build.dark.scss') join(SRC_ROOT, 'themes/ionic.build.dark.scss')
]) ])
.pipe(sass({ .pipe(sass({
includePaths: [ioniconsPath] includePaths: []
}).on('error', sass.logError) }).on('error', sass.logError)
) )
.pipe(autoprefixer(buildConfig.autoprefixer)) .pipe(autoprefixer(buildConfig.autoprefixer))

View File

@ -1,50 +0,0 @@
// Ionicons Icon Font CSS
// --------------------------
// Ionicons CSS for Ionic's <ion-icon> 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;
}
}

View File

@ -246,6 +246,5 @@
// Fonts // Fonts
// -------------------------------------------------- // --------------------------------------------------
@import @import
"../fonts/ionicons",
"../fonts/noto-sans", "../fonts/noto-sans",
"../fonts/roboto"; "../fonts/roboto";

View File

@ -19,10 +19,6 @@ $app-direction: ltr !default;
$font-path: "/dist/fonts" !default; $font-path: "/dist/fonts" !default;
// Ionicons font path
$ionicons-font-path: $font-path !default;
// Hairline width // Hairline width
$hairlines-width: .55px !default; $hairlines-width: .55px !default;

View File

@ -1,4 +0,0 @@
// Ionicons build for Ionic Apps
@import
"../fonts/ionicons";