Commit 0e941e09 authored by RAHUL RATHORE's avatar RAHUL RATHORE
Browse files

fix: font-awesome load by angular cli

parent b4f41a05

packages/carrier-mobile-ionic/angular.json

+4 −6
Original line number Diff line number Diff line
@@ -42,12 +42,9 @@ 
							"src/manifest.json"

						],

						"styles": [

							{

								"input": "src/theme/variables.scss"

							},

							{

								"input": "src/global.scss"

							}

							"../../node_modules/font-awesome/scss/font-awesome.scss",

							"src/theme/variables.scss",

							"src/global.scss"

						],

						"scripts": []

					},
@@ -97,6 +94,7 @@ 
						"tsConfig": "src/tsconfig.spec.json",

						"karmaConfig": "src/karma.conf.js",

						"styles": [

							"../../node_modules/font-awesome/scss/font-awesome.scss",

							{

								"input": "src/theme/variables.scss"

							},

packages/carrier-mobile-ionic/src/global.scss

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 
@import 'theme/fonts/google-font-Jura';



$fa-font-path: './assets/fonts' !default;

// @import '~font-awesome/scss/font-awesome';



@import '~@ever-platform/common-angular/src/scss/everbie.common';

packages/merchant-tablet-ionic/angular.json

+4 −6
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 
						],

						"styles": [

							"../../node_modules/bootstrap/dist/css/bootstrap.min.css",

							"../../node_modules/font-awesome/scss/font-awesome.scss",

							{

								"input": "src/theme/variables.scss"

							},
@@ -99,12 +100,9 @@ 
						"karmaConfig": "src/karma.conf.js",

						"styles": [

							"../../node_modules/bootstrap/dist/css/bootstrap.min.css",

							{

								"input": "src/theme/variables.scss"

							},

							{

								"input": "src/global.scss"

							}

							"../../node_modules/font-awesome/scss/font-awesome.scss",

							"src/theme/variables.scss",

							"src/global.scss"

						],

						"scripts": [],

						"assets": [

packages/merchant-tablet-ionic/src/global.scss

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
@import '~@ionic/angular/css/flex-utils.css';



$fa-font-path: './assets/fonts' !default;

@import '~font-awesome/scss/font-awesome';



@import '~@ever-platform/common-angular/src/scss/everbie.common';

packages/shop-mobile-ionic/angular.json

+4 −6
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
						],

						"styles": [

							"../../node_modules/bootstrap/dist/css/bootstrap.min.css",

							"../../node_modules/font-awesome/scss/font-awesome.scss",

							{

								"input": "src/theme/variables.scss"

							},
@@ -102,12 +103,9 @@ 
						"karmaConfig": "src/karma.conf.js",

						"styles": [

							"../../node_modules/bootstrap/dist/css/bootstrap.min.css",

							{

								"input": "src/theme/variables.scss"

							},

							{

								"input": "src/global.scss"

							}

							"../../node_modules/font-awesome/scss/font-awesome.scss",

							"src/theme/variables.scss",

							"src/global.scss"

						],

						"scripts": [],

						"assets": [