Skip to content

Commit

Permalink
Merge branch 'master' into textsize
Browse files Browse the repository at this point in the history
  • Loading branch information
aGuclu authored Nov 16, 2018
2 parents 8b5b7a6 + c761f5b commit 3daa1ee
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 3 deletions.
Binary file added images/gym.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion main.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion main.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion stylesheet.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,13 @@ $sm-text: 1.7em;
body {
height: 100vh;
background-color: $page-bg-color;
background-image: url('images/gym.jpg');
font-family: $main-font;
// background-image: url('trainer.png');
background-position: left;
background-repeat: no-repeat;
background-size: contain;
background-size: cover;
opacity: 0.3;
}

.container {
Expand Down

0 comments on commit 3daa1ee

Please sign in to comment.