Skip to content

Commit 54ace52

Browse files
committed
Merge branch 'master' into suspense
2 parents 941a34d + 6acb230 commit 54ace52

5 files changed

Lines changed: 15 additions & 8 deletions

File tree

app/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react';
22
import ReactDOM from 'react-dom';
3-
import './stylesheets/index.css';
3+
import './stylesheets/index.scss';
44
import App from './App';
55

66
ReactDOM.render(<App />, document.getElementById('app'));

app/stylesheets/constants.scss

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
$brandgold: #fce356;
2+
$sidebarblue: #24262f;
3+
4+
@mixin centerWithFlex($justify: center) {
5+
display: flex;
6+
align-items: center;
7+
justify-content: $justify;
8+
}
Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
@import url('https://fonts.googleapis.com/css?family=Baloo+Bhaijaan&display=swap');
22
@import url('https://fonts.googleapis.com/css2?family=Josefin+Sans&family=Nunito:wght@200&family=Quicksand:wght@300&display=swap');
3+
@import './constants.scss';
34

45
* {
56
margin: 0;
67
padding: 0;
78
box-sizing: border-box;
89
}
910

10-
html {
11+
body {
1112
background-color: rgb(248, 249, 253);
1213
background: #24262f;
1314
font-size: 16px;
@@ -29,7 +30,3 @@ button {
2930
button:hover {
3031
background-color: #24262f;
3132
}
32-
33-
/* img {
34-
margin-bottom: -75px;
35-
} */

package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,10 @@
9191
"image-webpack-loader": "^6.0.0",
9292
"jest": "^26.1.0",
9393
"jest-config": "^26.1.0",
94+
"node-sass": "^4.14.1",
9495
"nodemon": "^1.19.4",
9596
"prettier": "^2.0.5",
97+
"sass-loader": "^9.0.2",
9698
"source-map-loader": "^1.0.0",
9799
"spectron": "^8.0.0",
98100
"style-loader": "^1.2.1",

webpack.config.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ module.exports = {
2727
exclude: /node_modules/,
2828
},
2929
{
30-
test: /\.(css)$/,
31-
use: ['style-loader', 'css-loader'],
30+
test: /\.s?css$/,
31+
use: ['style-loader', 'css-loader', 'sass-loader'],
3232
exclude: /node_modules/,
3333
},
3434
{

0 commit comments

Comments
 (0)