Skip to content

Commit 8e7ac8a

Browse files
authored
Merge pull request #272 from NativeScript/fatme/fix-theme-with-scss
fix: fix the theme when app is created with scss styles
2 parents ae4fbd2 + 0ea4da3 commit 8e7ac8a

File tree

5 files changed

+23
-4
lines changed

5 files changed

+23
-4
lines changed

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@nativescript/schematics",
3-
"version": "0.8.0",
3+
"version": "1.0.0",
44
"description": "Schematics for NativeScript Angular apps.",
55
"scripts": {
66
"build": "tsc -p tsconfig.json",

src/add-ns/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ const addDependencies = () => (tree: Tree, context: SchematicContext) => {
372372

373373
const devDepsToAdd = {
374374
'nativescript-dev-webpack': '~1.3.0',
375-
'@nativescript/schematics': '~0.8.0',
375+
'@nativescript/schematics': '~1.0.0',
376376
'@nativescript/tslint-rules': '~0.0.2',
377377
};
378378
packageJson.devDependencies = {...devDepsToAdd, ...packageJson.devDependencies};

src/ng-new/application/_files/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"@angular/cli": "~8.3.0",
2828
"@angular/compiler-cli": "~8.2.0",
2929
"@angular-devkit/core": "~8.2.0",
30-
"@nativescript/schematics": "~0.8.0",<% if(webpack) { %>
30+
"@nativescript/schematics": "~1.0.0",<% if(webpack) { %>
3131
"nativescript-dev-webpack": "~1.3.0",
3232
"@ngtools/webpack": "~8.2.0",
3333
<% } %>"typescript": "~3.5.3"

src/ng-new/shared/_files/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"@angular/cli": "~8.3.0",
4141
"@angular/compiler-cli": "~8.2.0",
4242
"@angular-devkit/build-angular": "~0.803.0",
43-
"@nativescript/schematics": "~0.8.0",
43+
"@nativescript/schematics": "~1.0.0",
4444
"@nativescript/tslint-rules": "~0.0.4",
4545
"@types/jasmine": "~3.3.8",
4646
"@types/jasminewd2": "~2.0.3",
+19
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,21 @@
1+
@import "~@nativescript/theme/core";
2+
@import "~@nativescript/theme/blue";
3+
14
// Place any CSS rules you want to apply on both iOS and Android here.
25
// This is where the vast majority of your CSS code goes.
6+
7+
// Font icon class
8+
.fab {
9+
font-family: "Font Awesome 5 Brands", "fa-brands-400";
10+
font-weight: 400;
11+
}
12+
13+
.fas {
14+
font-family: "Font Awesome 5 Free", "fa-solid-900";
15+
font-weight: 900;
16+
}
17+
18+
.far {
19+
font-family: "Font Awesome 5 Free", "fa-regular-400";
20+
font-weight: 400;
21+
}

0 commit comments

Comments
 (0)