Skip to content

Commit 2d7a8b9

Browse files
authored
Updates react-scripts to v4, eslint to v7 (#137)
This PR does a couple of things: * update `react-scripts` (the package for create-react-app) to `v4.0.3` - this is a major breaking change, but also helps with #130 * update `eslint` to v7+, to resolve newly-created peer-dependency mismatches * removes some unused CSS I forgot to remove from #148 * changes the about diamond to a `src/assets`-imported image rather than using a `background-image` hack (the nice externality is that it's also more accessible)! Closes #136.
1 parent 6111868 commit 2d7a8b9

File tree

6 files changed

+13296
-7710
lines changed

6 files changed

+13296
-7710
lines changed

package-lock.json

Lines changed: 13289 additions & 7699 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"react-countdown": "^2.2.1",
1616
"react-dom": "^16.13.1",
1717
"react-router-dom": "^5.2.0",
18-
"react-scripts": "^3.4.3"
18+
"react-scripts": "^4.0.3"
1919
},
2020
"scripts": {
2121
"start": "react-scripts start",
@@ -55,7 +55,7 @@
5555
]
5656
},
5757
"devDependencies": {
58-
"eslint": "^6.6.0",
58+
"eslint": "^7.26.0",
5959
"eslint-plugin-import": "^2.22.1",
6060
"eslint-plugin-jest": "^24.3.6"
6161
}
File renamed without changes.

src/components/About/About.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import React from 'react';
2+
import AboutSplashImage from '../../assets/about1.png';
23
import Config from '../../config';
34

45
import Banner from '../Banner/Banner';
@@ -11,7 +12,7 @@ function About() {
1112
<Banner decorative />
1213
<div className="content-section">
1314
<div className="ornament square-ornament">
14-
<div className="square-splash" />
15+
<img className="square-splash" src={AboutSplashImage} alt="a picture of acm students at our annual CS BBQ!" />
1516
<div className="square-small" />
1617
<div className="square-tiny" />
1718
</div>

src/components/About/style.scss

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,6 @@
4040
left: 30px;
4141
top: -65px;
4242
border-radius: 50px;
43-
background-image: url(/images/about1.png);
44-
background-size: cover;
45-
background-color: $acm-cobalt;
4643
}
4744

4845
.square-small {
@@ -108,4 +105,4 @@
108105
text-align: center;
109106
}
110107
}
111-
}
108+
}

src/components/Events/style.scss

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,8 @@
77
width: 35px;
88
border-radius: 2px;
99
margin: 0px 3px;
10-
display: inline-block;
11-
vertical-align: middle;
12-
13-
&#youtube { background-image: url(/images/social_media/youtubeDark.svg); }
10+
display: inline-block;
11+
vertical-align: middle;
1412

1513
&:hover {
1614
transform: scale(1.03);

0 commit comments

Comments
 (0)