Skip to content

Commit

Permalink
fixed splash image
Browse files Browse the repository at this point in the history
  • Loading branch information
megatera committed Jan 30, 2022
1 parent ca5a50b commit dfcbfb4
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 15 deletions.
Binary file added client/assets/background.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed client/assets/background.png
Binary file not shown.
6 changes: 3 additions & 3 deletions client/components/ResultsContainer.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ const ResultsContainer = (props) => {

if (!props.searchResults.length) {
return (
<div id="splash">
<h1>Fun with frollic</h1>
</div>
<section id="splash">
<h1>fun with frollic</h1>
</section>
)
}

Expand Down
22 changes: 13 additions & 9 deletions client/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,20 @@ $black: #2A343A;
html, body {
width: 100%;
height: 100%;
margin: 0px;
margin: 0;
overflow-x: hidden;
max-height:100vh;
color: $black;
font-family: sans-serif;
background-color: $white;
}

h1 {
color: $white;
background-color: $gold;
font-size: 28px;
background-color: $black;
font-size: 48px;
text-align: center;
padding: 75px 50px;
}

p {
Expand Down Expand Up @@ -75,7 +77,7 @@ aside {

input[type=text]{
width: 80%;
padding: 10px 20px;
padding: 10px 10px;
margin: 5px 0 20px;
}

Expand All @@ -89,6 +91,7 @@ input[type=checkbox]{
width: 30px;
height: 30px;
vertical-align: middle;
margin-right: 10px;
}

.checkbox {
Expand All @@ -105,14 +108,14 @@ input[type=checkbox]{
background-color: $gold;
color: $black;
font-weight: bold;
letter-spacing: .05rem;
font-size: 16px;
border: 1px solid $gold;
border-radius: 5px;
width: 200px;
height: 45px;
z-index: auto;
box-shadow: none;
margin: 30px 0;
margin: 30px 0 0;
}

#results-container {
Expand All @@ -125,11 +128,12 @@ input[type=checkbox]{

#splash {
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
background-color: $gold;
background-image: url("./assets/background.png");
background-repeat: repeat;
background: url("./assets/background.gif") $gold repeat center;
height: 100%;
padding: 40px;
}

article {
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@
"redux-devtools-extension": "^2.13.9",
"redux-thunk": "^2.4.1",
"scss-loader": "^0.0.1",
"style-loader": "^3.3.1"
"style-loader": "^3.3.1",
"url-loader": "^4.1.1"
},
"devDependencies": {
"@babel/core": "^7.16.12",
Expand Down
4 changes: 2 additions & 2 deletions webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ module.exports = {
},
{
test: /.(css|scss)$/,
use: ['style-loader', 'css-loader', 'sass-loader']
use: ['style-loader', 'css-loader', 'sass-loader'],
},
{
test: /\.(png|jp(e*)g|svg|gif)$/,
use: ['file-loader'],
type: 'asset/resource',
}
]
},
Expand Down

0 comments on commit dfcbfb4

Please sign in to comment.