Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

images fix #16

Merged
merged 1 commit into from
Jan 31, 2018
Merged

images fix #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .angular-cli.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@
"tsconfig": "tsconfig.app.json",
"testTsconfig": "tsconfig.spec.json",
"prefix": "",
"assets":[
"assets",
"favicon.ico"
],
"styles": [
"sass/styles.scss",
"sass/buttons.scss",
Expand Down
2 changes: 1 addition & 1 deletion src/app/shared/components/user-photo/user-photo.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 1 addition & 1 deletion src/app/shared/layout/header.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/sass/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down