Skip to content

Commit ce1a36e

Browse files
committed
Global Style implementation
1 parent 87432a7 commit ce1a36e

File tree

7 files changed

+20
-13
lines changed

7 files changed

+20
-13
lines changed

angular.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,7 @@
2929
],
3030
"styles": [
3131
"src/styles.scss",
32-
"src/assets/styles/ecommerce.scss",
33-
"src/assets/styles/mixin.scss",
34-
"src/assets/styles/theme.scss"
32+
"src/ecommerce.scss"
3533
],
3634
"scripts": []
3735
},

package-lock.json

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/app/pages/register/register.component.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
@import "../../../assets/styles/theme.scss";
2-
@import "../../../assets/styles/mixin.scss";
1+
@import "~ecommerce.scss";
32
.registerBox {
43
background: $color-white;
54
box-shadow: 0 2px 4px 0 rgba(0, 0, 0, .08);

src/assets/styles/ecommerce.scss

Lines changed: 0 additions & 6 deletions
This file was deleted.

src/ecommerce.scss

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
/* You can add global styles to this file, and also import other style files */
2+
@import "assets/styles/theme.scss";
3+
@import 'assets/styles/mixin.scss';
4+
@import 'assets/css/main.scss';
5+
@import 'assets/css/login.component.scss';
6+

src/index.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
<meta name="viewport" content="width=device-width, initial-scale=1">
99
<link rel="icon" type="image/x-icon" href="favicon.ico">
10-
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css">
1110
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" />
1211
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
1312
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js"></script>

src/styles.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
@import "./assets/styles/ecommerce.scss";
1+
// @import "~ecommerce.scss";
2+
@import 'node_modules/bootstrap/scss/bootstrap.scss';

0 commit comments

Comments
 (0)