Skip to content

Commit 9451399

Browse files
jorgecodjorgecod
authored
Merge pull request #46 from ioet/43-css-to-scss
43 Changes css files to scss
2 parents 3c0dc65 + 331db5f commit 9451399

34 files changed

+156
-152
lines changed

‎angular.json‎

Lines changed: 132 additions & 124 deletions
Original file line numberDiff line numberDiff line change
@@ -1,130 +1,138 @@
11
{
2-
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
3-
"version": 1,
4-
"newProjectRoot": "projects",
5-
"projects": {
6-
"time-tracker": {
7-
"projectType": "application",
8-
"schematics": {},
9-
"root": "",
10-
"sourceRoot": "src",
11-
"prefix": "app",
12-
"architect": {
13-
"build": {
14-
"builder": "@angular-devkit/build-angular:browser",
15-
"options": {
16-
"outputPath": "dist/time-tracker",
17-
"index": "src/index.html",
18-
"main": "src/main.ts",
19-
"polyfills": "src/polyfills.ts",
20-
"tsConfig": "tsconfig.app.json",
21-
"aot": true,
22-
"assets": [
23-
"src/favicon.ico",
24-
"src/assets"
25-
],
26-
"styles": [
27-
"./node_modules/bootstrap/dist/css/bootstrap.min.css",
28-
"src/styles.css"
29-
],
30-
"scripts": [
31-
"./node_modules/jquery/dist/jquery.min.js",
32-
"./node_modules/bootstrap/dist/js/bootstrap.min.js"
33-
]
34-
},
35-
"configurations": {
36-
"production": {
37-
"fileReplacements": [{
38-
"replace": "src/environments/environment.ts",
39-
"with": "src/environments/environment.prod.ts"
40-
}],
41-
"optimization": true,
42-
"outputHashing": "all",
43-
"sourceMap": false,
44-
"extractCss": true,
45-
"namedChunks": false,
46-
"extractLicenses": true,
47-
"vendorChunk": false,
48-
"buildOptimizer": true,
49-
"budgets": [{
50-
"type": "initial",
51-
"maximumWarning": "2mb",
52-
"maximumError": "5mb"
53-
},
54-
{
55-
"type": "anyComponentStyle",
56-
"maximumWarning": "6kb",
57-
"maximumError": "10kb"
58-
}
59-
]
60-
}
61-
}
62-
},
63-
"serve": {
64-
"builder": "@angular-devkit/build-angular:dev-server",
65-
"options": {
66-
"browserTarget": "time-tracker:build"
67-
},
68-
"configurations": {
69-
"production": {
70-
"browserTarget": "time-tracker:build:production"
71-
}
72-
}
73-
},
74-
"extract-i18n": {
75-
"builder": "@angular-devkit/build-angular:extract-i18n",
76-
"options": {
77-
"browserTarget": "time-tracker:build"
78-
}
79-
},
80-
"test": {
81-
"builder": "@angular-devkit/build-angular:karma",
82-
"options": {
83-
"main": "src/test.ts",
84-
"polyfills": "src/polyfills.ts",
85-
"tsConfig": "tsconfig.spec.json",
86-
"karmaConfig": "karma.conf.js",
87-
"codeCoverage": true,
88-
"assets": [
89-
"src/favicon.ico",
90-
"src/assets"
91-
],
92-
"styles": [
93-
"src/styles.css"
94-
],
95-
"scripts": []
96-
}
97-
},
98-
"lint": {
99-
"builder": "@angular-devkit/build-angular:tslint",
100-
"options": {
101-
"tsConfig": [
102-
"tsconfig.app.json",
103-
"tsconfig.spec.json",
104-
"e2e/tsconfig.json"
105-
],
106-
"exclude": [
107-
"**/node_modules/**"
108-
]
109-
}
2+
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
3+
"version": 1,
4+
"newProjectRoot": "projects",
5+
"projects": {
6+
"time-tracker": {
7+
"projectType": "application",
8+
"schematics": {},
9+
"root": "",
10+
"sourceRoot": "src",
11+
"prefix": "app",
12+
"architect": {
13+
"build": {
14+
"builder": "@angular-devkit/build-angular:browser",
15+
"options": {
16+
"outputPath": "dist/time-tracker",
17+
"index": "src/index.html",
18+
"main": "src/main.ts",
19+
"polyfills": "src/polyfills.ts",
20+
"tsConfig": "tsconfig.app.json",
21+
"aot": true,
22+
"assets": [
23+
"src/favicon.ico",
24+
"src/assets"
25+
],
26+
"styles": [
27+
"./node_modules/bootstrap/dist/css/bootstrap.min.css",
28+
"src/styles.scss"
29+
],
30+
"scripts": [
31+
"./node_modules/jquery/dist/jquery.min.js",
32+
"./node_modules/bootstrap/dist/js/bootstrap.min.js"
33+
]
34+
},
35+
"configurations": {
36+
"production": {
37+
"fileReplacements": [
38+
{
39+
"replace": "src/environments/environment.ts",
40+
"with": "src/environments/environment.prod.ts"
41+
}
42+
],
43+
"optimization": true,
44+
"outputHashing": "all",
45+
"sourceMap": false,
46+
"extractCss": true,
47+
"namedChunks": false,
48+
"extractLicenses": true,
49+
"vendorChunk": false,
50+
"buildOptimizer": true,
51+
"budgets": [
52+
{
53+
"type": "initial",
54+
"maximumWarning": "2mb",
55+
"maximumError": "5mb"
11056
},
111-
"e2e": {
112-
"builder": "@angular-devkit/build-angular:protractor",
113-
"options": {
114-
"protractorConfig": "e2e/protractor.conf.js",
115-
"devServerTarget": "time-tracker:serve"
116-
},
117-
"configurations": {
118-
"production": {
119-
"devServerTarget": "time-tracker:serve:production"
120-
}
121-
}
57+
{
58+
"type": "anyComponentStyle",
59+
"maximumWarning": "6kb",
60+
"maximumError": "10kb"
12261
}
62+
]
63+
}
64+
}
65+
},
66+
"serve": {
67+
"builder": "@angular-devkit/build-angular:dev-server",
68+
"options": {
69+
"browserTarget": "time-tracker:build"
70+
},
71+
"configurations": {
72+
"production": {
73+
"browserTarget": "time-tracker:build:production"
12374
}
75+
}
76+
},
77+
"extract-i18n": {
78+
"builder": "@angular-devkit/build-angular:extract-i18n",
79+
"options": {
80+
"browserTarget": "time-tracker:build"
81+
}
82+
},
83+
"test": {
84+
"builder": "@angular-devkit/build-angular:karma",
85+
"options": {
86+
"main": "src/test.ts",
87+
"polyfills": "src/polyfills.ts",
88+
"tsConfig": "tsconfig.spec.json",
89+
"karmaConfig": "karma.conf.js",
90+
"codeCoverage": true,
91+
"assets": [
92+
"src/favicon.ico",
93+
"src/assets"
94+
],
95+
"styles": [
96+
"src/styles.scss"
97+
],
98+
"scripts": []
99+
}
100+
},
101+
"lint": {
102+
"builder": "@angular-devkit/build-angular:tslint",
103+
"options": {
104+
"tsConfig": [
105+
"tsconfig.app.json",
106+
"tsconfig.spec.json",
107+
"e2e/tsconfig.json"
108+
],
109+
"exclude": [
110+
"**/node_modules/**"
111+
]
112+
}
113+
},
114+
"e2e": {
115+
"builder": "@angular-devkit/build-angular:protractor",
116+
"options": {
117+
"protractorConfig": "e2e/protractor.conf.js",
118+
"devServerTarget": "time-tracker:serve"
119+
},
120+
"configurations": {
121+
"production": {
122+
"devServerTarget": "time-tracker:serve:production"
123+
}
124+
}
124125
}
125-
},
126-
"defaultProject": "time-tracker",
127-
"cli": {
128-
"analytics": false
126+
}
127+
}
128+
},
129+
"defaultProject": "time-tracker",
130+
"cli": {
131+
"analytics": false
132+
},
133+
"schematics": {
134+
"@schematics/angular:component": {
135+
"styleext": "scss"
129136
}
130-
}
137+
}
138+
}

‎src/app/app.component.css‎ renamed to ‎src/app/app.component.scss‎

File renamed without changes.

‎src/app/app.component.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { Component } from '@angular/core';
33
@Component({
44
selector: 'app-root',
55
templateUrl: './app.component.html',
6-
styleUrls: ['./app.component.css']
6+
styleUrls: ['./app.component.scss']
77
})
88
export class AppComponent {
99
title = 'time-tracker';

‎src/app/components/options-sidebar/project-management/project-management.component.css‎ renamed to ‎src/app/components/options-sidebar/project-management/project-management.component.scss‎

File renamed without changes.

‎src/app/components/options-sidebar/project-management/project-management.component.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { ProjectService } from '../../../services/project.service';
55
@Component({
66
selector: 'app-project-management',
77
templateUrl: './project-management.component.html',
8-
styleUrls: ['./project-management.component.css']
8+
styleUrls: ['./project-management.component.scss']
99
})
1010
export class ProjectManagementComponent implements OnInit {
1111

‎src/app/components/options-sidebar/reports/reports.component.css‎ renamed to ‎src/app/components/options-sidebar/reports/reports.component.scss‎

File renamed without changes.

‎src/app/components/options-sidebar/reports/reports.component.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { Component, OnInit } from '@angular/core';
33
@Component({
44
selector: 'app-reports',
55
templateUrl: './reports.component.html',
6-
styleUrls: ['./reports.component.css']
6+
styleUrls: ['./reports.component.scss']
77
})
88
export class ReportsComponent implements OnInit {
99

‎src/app/components/options-sidebar/time-clock/time-clock.component.css‎ renamed to ‎src/app/components/options-sidebar/time-clock/time-clock.component.scss‎

File renamed without changes.

‎src/app/components/options-sidebar/time-clock/time-clock.component.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { Component, OnInit } from '@angular/core';
33
@Component({
44
selector: 'app-time-clock',
55
templateUrl: './time-clock.component.html',
6-
styleUrls: ['./time-clock.component.css']
6+
styleUrls: ['./time-clock.component.scss']
77
})
88

99
export class TimeClockComponent implements OnInit {

‎src/app/components/options-sidebar/time-entries/time-entries.component.css‎ renamed to ‎src/app/components/options-sidebar/time-entries/time-entries.component.scss‎

File renamed without changes.

0 commit comments

Comments
 (0)