Merge pull request #16 from js2me/develop

images fix
js2me · Jan 31, 2018 · f7f9ca9 · f7f9ca9
2 parents 618820d + cbd0799
commit f7f9ca9
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/.angular-cli.json b/.angular-cli.json
@@ -14,6 +14,10 @@
       "tsconfig": "tsconfig.app.json",
       "testTsconfig": "tsconfig.spec.json",
       "prefix": "",
+      "assets":[
+        "assets",
+        "favicon.ico"
+      ],
       "styles": [
         "sass/styles.scss",
         "sass/buttons.scss",

diff --git a/src/app/shared/components/user-photo/user-photo.component.html b/src/app/shared/components/user-photo/user-photo.component.html
@@ -4,6 +4,6 @@
     <img src="{{imageUrl}}" alt="">
   </ng-template>
   <ng-template #defaultImageBlock>
-    <img src="../../../../assets/default-user-photo.png" alt="">
+    <img src="/assets/default-user-photo.png" alt="">
   </ng-template>
 </div>
diff --git a/src/app/shared/layout/header.component.scss b/src/app/shared/layout/header.component.scss
@@ -29,7 +29,7 @@
     max-height: $header-height;
     content: '';
     background-position: center;
-    background-image: url(../../../assets/background-header.jpg);
+    background-image: url('/assets/background-header.jpg');
     filter: grayscale(50%) contrast(100%);
     transition: filter 650ms ease;
     position: absolute;

diff --git a/src/sass/styles.scss b/src/sass/styles.scss
@@ -12,7 +12,7 @@ body, html {
 body {
   font-family: $default-font-family;
   color: $font-color;
-  background: url('../assets/background.png');
+  background: url('/assets/background.png');
   user-select: none;
   /* overflow: hidden; */
   display: block;
@@ -62,7 +62,7 @@ button.close {
       margin-bottom: 24px;
       span {
         font-size: 26px;
-        background: url(../assets/background-header.jpg);
+        background: url(/assets/background-header.jpg);
         background-position-y: top;
         background-position-x: left;
         color: $second-font-color;