Skip to content

Commit

Permalink
Merge pull request #53 from uclaacm/nhi/update-sm-officers
Browse files Browse the repository at this point in the history
Discord/Instagram Links and Cyber Officers Updated
  • Loading branch information
vohndernet committed May 26, 2020
2 parents 8c9300d + ad81e77 commit 700f9a4
Show file tree
Hide file tree
Showing 8 changed files with 4,306 additions and 1,929 deletions.
6,205 changes: 4,286 additions & 1,919 deletions package-lock.json

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@
"eslint": "^4.7.0",
"eslint-plugin-react": "^7.3.0",
"extract-text-webpack-plugin": "^3.0.0",
"node-sass": "^4.9.3",
"node-sass": "^4.14.1",
"sass-loader": "^6.0.6",
"webpack": "^3.6.0",
"webpack-dev-server": "^2.8.2"
"webpack-dev-server": "^2.11.5"
},
"dependencies": {
"lodash": "^4.17.15",
"lodash-es": "^4.17.15",
"npm": "^6.11.3",
"npm": "^6.14.5",
"react": "^15.6.1",
"react-dom": "^15.6.1",
"react-redux": "^5.0.6",
Expand Down
3 changes: 2 additions & 1 deletion src/components/Footer/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ export default class Footer extends React.Component {
<h3>Find us on social media</h3>
<a href="https://www.facebook.com/uclaacm" target="_BLANK"><div className="sm-icon" id="facebook" /></a>
<a href="https://www.github.com/uclaacm" target="_BLANK"><div className="sm-icon" id="github" /></a>
<a href="https://www.instagram.com/uclaacm/" target="_BLANK"><div className="sm-icon" id="instagram" /></a>
<a href="https://www.instagram.com/acm.ucla/" target="_BLANK"><div className="sm-icon" id="instagram" /></a>
<a href="https://discord.gg/4bcwv7t" target="_BLANK"><div className="sm-icon" id="discord" /></a>
<a href="https://medium.com/techatucla" target="_BLANK"><div className="sm-icon" id="medium" /></a>
</div>
<div className="footer-item">
Expand Down
2 changes: 2 additions & 0 deletions src/components/Footer/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@
&#github { background-image: url(/images/social_media/github.svg); }
&#medium { background-image: url(/images/social_media/medium.svg); }
&#instagram { background-image: url(/images/social_media/instagram.svg); }
&#discord { background-image: url(/images/social_media/discord.svg); }


&:hover {
background-color: $acm-black;
Expand Down
18 changes: 12 additions & 6 deletions src/config/officers.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,18 @@ export default [
email: "[email protected]",
image: "/images/officers/ElenaEscalas.jpg"
},
{
name: "Sanjana Sarda",
title: "President, Cyber",
email: "[email protected]",
image: "/images/officers/SanjanaSarda.jpg"
},
{
name: "Disha Zambani",
title: "Co-President, Cyber",
email: "[email protected]",
image: "/images/officers/DishaZambani.jpg"
},
{
name: "Ellie Cheng",
title: "Co-President, Cyber",
email: "[email protected]",
image: "/images/officers/EllieCheng.jpg"
},
{
name: "Matt Wang",
title: "President, Teach LA",
Expand Down
Binary file added static/images/officers/DishaZambani.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added static/images/officers/EllieCheng.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions static/images/social_media/discord.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 700f9a4

Please sign in to comment.