From 65d35c831d104f9d536bdea4658e3a4ce4a0b487 Mon Sep 17 00:00:00 2001 From: walsker Date: Mon, 4 Nov 2019 19:53:29 -0500 Subject: [PATCH 01/11] Add sponsor logos to assets Export the sponsor logos in arrays representing the different tiers of sponsors. This allows for easy additions in the future. --- src/assets/sponsors/1password.svg | 1812 +++++++++++++++++++++++ src/assets/sponsors/balsamiq.svg | 18 + src/assets/sponsors/ciena.svg | 27 + src/assets/sponsors/ea.svg | 11 + src/assets/sponsors/fdm-group.svg | 1 + src/assets/sponsors/fullscript.svg | 82 + src/assets/sponsors/index.js | 31 + src/assets/sponsors/lighthouse-labs.svg | 70 + src/assets/sponsors/march-networks.svg | 70 + src/assets/sponsors/rbc.svg | 1 + src/assets/sponsors/wolfram.svg | 46 + 11 files changed, 2169 insertions(+) create mode 100644 src/assets/sponsors/1password.svg create mode 100644 src/assets/sponsors/balsamiq.svg create mode 100644 src/assets/sponsors/ciena.svg create mode 100644 src/assets/sponsors/ea.svg create mode 100755 src/assets/sponsors/fdm-group.svg create mode 100644 src/assets/sponsors/fullscript.svg create mode 100644 src/assets/sponsors/index.js create mode 100644 src/assets/sponsors/lighthouse-labs.svg create mode 100755 src/assets/sponsors/march-networks.svg create mode 100755 src/assets/sponsors/rbc.svg create mode 100644 src/assets/sponsors/wolfram.svg diff --git a/src/assets/sponsors/1password.svg b/src/assets/sponsors/1password.svg new file mode 100644 index 0000000..9b097b9 --- /dev/null +++ b/src/assets/sponsors/1password.svg @@ -0,0 +1,1812 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/sponsors/balsamiq.svg b/src/assets/sponsors/balsamiq.svg new file mode 100644 index 0000000..3d771f7 --- /dev/null +++ b/src/assets/sponsors/balsamiq.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/sponsors/ciena.svg b/src/assets/sponsors/ciena.svg new file mode 100644 index 0000000..d67cc6c --- /dev/null +++ b/src/assets/sponsors/ciena.svg @@ -0,0 +1,27 @@ + + + + + + diff --git a/src/assets/sponsors/ea.svg b/src/assets/sponsors/ea.svg new file mode 100644 index 0000000..d6a1b9a --- /dev/null +++ b/src/assets/sponsors/ea.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/sponsors/fdm-group.svg b/src/assets/sponsors/fdm-group.svg new file mode 100755 index 0000000..695ad42 --- /dev/null +++ b/src/assets/sponsors/fdm-group.svg @@ -0,0 +1 @@ +FDM Logo - BLACK \ No newline at end of file diff --git a/src/assets/sponsors/fullscript.svg b/src/assets/sponsors/fullscript.svg new file mode 100644 index 0000000..7a104d9 --- /dev/null +++ b/src/assets/sponsors/fullscript.svg @@ -0,0 +1,82 @@ + + + + +Group 3 +Created with Sketch. + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/sponsors/index.js b/src/assets/sponsors/index.js new file mode 100644 index 0000000..7f7577e --- /dev/null +++ b/src/assets/sponsors/index.js @@ -0,0 +1,31 @@ +import {ReactComponent as OnePassword} from './1password.svg'; +import {ReactComponent as Balsamiq} from './balsamiq.svg'; +import {ReactComponent as Ciena} from './ciena.svg'; +import {ReactComponent as Ea} from './ea.svg'; +import {ReactComponent as FdmGroup} from './fdm-group.svg'; +import {ReactComponent as Fullscript} from './fullscript.svg'; +import {ReactComponent as LighthouseLabs} from './lighthouse-labs.svg'; +import {ReactComponent as MarchNetworks} from './march-networks.svg'; +import {ReactComponent as Rbc} from './rbc.svg'; +import {ReactComponent as Wolfram} from './wolfram.svg'; + +export default { + giga: [ + Rbc + ], + mega: [ + Ciena, + Fullscript, + LighthouseLabs, + MarchNetworks + ], + kilo: [ + Balsamiq, + FdmGroup + ], + inKind: [ + OnePassword, + Ea, + Wolfram + ] +}; \ No newline at end of file diff --git a/src/assets/sponsors/lighthouse-labs.svg b/src/assets/sponsors/lighthouse-labs.svg new file mode 100644 index 0000000..8587148 --- /dev/null +++ b/src/assets/sponsors/lighthouse-labs.svg @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/sponsors/march-networks.svg b/src/assets/sponsors/march-networks.svg new file mode 100755 index 0000000..d45bb6e --- /dev/null +++ b/src/assets/sponsors/march-networks.svg @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/sponsors/rbc.svg b/src/assets/sponsors/rbc.svg new file mode 100755 index 0000000..239b078 --- /dev/null +++ b/src/assets/sponsors/rbc.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/sponsors/wolfram.svg b/src/assets/sponsors/wolfram.svg new file mode 100644 index 0000000..9427eae --- /dev/null +++ b/src/assets/sponsors/wolfram.svg @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + From d07d7a9684eee3969a26b6caa4cc35216f7283ee Mon Sep 17 00:00:00 2001 From: walsker Date: Tue, 5 Nov 2019 22:13:03 -0500 Subject: [PATCH 02/11] Add sponsors to website This commit took a ton of tweaking in SVG code to get right. I decided that I should export the ReactComponents individually... exporting them in arrays stops me from identifying each one easily. --- src/assets/sponsors/balsamiq.svg | 2 +- src/assets/sponsors/ciena.svg | 4 +- src/assets/sponsors/ea.svg | 2 +- src/assets/sponsors/fdm-group.svg | 2 +- src/assets/sponsors/fullscript.svg | 98 +++++++++++------------ src/assets/sponsors/index.js | 32 +++----- src/assets/sponsors/lighthouse-labs.svg | 3 +- src/assets/sponsors/march-networks.svg | 56 ++++++------- src/assets/sponsors/rbc.svg | 9 ++- src/assets/sponsors/wolfram.svg | 26 +++--- src/index.css | 4 + src/pages/home/index.js | 55 +++++++++++-- src/pages/home/index.module.css | 101 +++++++++++++++++++++--- 13 files changed, 256 insertions(+), 138 deletions(-) diff --git a/src/assets/sponsors/balsamiq.svg b/src/assets/sponsors/balsamiq.svg index 3d771f7..955e688 100644 --- a/src/assets/sponsors/balsamiq.svg +++ b/src/assets/sponsors/balsamiq.svg @@ -1,7 +1,7 @@ - + diff --git a/src/assets/sponsors/ciena.svg b/src/assets/sponsors/ciena.svg index d67cc6c..27a450a 100644 --- a/src/assets/sponsors/ciena.svg +++ b/src/assets/sponsors/ciena.svg @@ -3,9 +3,9 @@ - - + diff --git a/src/assets/sponsors/fdm-group.svg b/src/assets/sponsors/fdm-group.svg index 695ad42..8ade836 100755 --- a/src/assets/sponsors/fdm-group.svg +++ b/src/assets/sponsors/fdm-group.svg @@ -1 +1 @@ -FDM Logo - BLACK \ No newline at end of file +FDM Logo - BLACK \ No newline at end of file diff --git a/src/assets/sponsors/fullscript.svg b/src/assets/sponsors/fullscript.svg index 7a104d9..b6c90b4 100644 --- a/src/assets/sponsors/fullscript.svg +++ b/src/assets/sponsors/fullscript.svg @@ -1,36 +1,36 @@ + viewBox="0 0 313 60.7" style="enable-background:new 0 0 313 60.7;" xml:space="preserve"> Group 3 Created with Sketch. - - - - - - + + + + + - + - - + + - - + + - + - + + c0.5,0,1.1,0,1.7-0.1c0.6-0.1,1.1-0.2,1.6-0.3c0.5-0.2,0.9-0.4,1.2-0.6C141.2,15.4,141.3,15.1,141.3,14.7"/> diff --git a/src/assets/sponsors/index.js b/src/assets/sponsors/index.js index 7f7577e..d23e28b 100644 --- a/src/assets/sponsors/index.js +++ b/src/assets/sponsors/index.js @@ -9,23 +9,15 @@ import {ReactComponent as MarchNetworks} from './march-networks.svg'; import {ReactComponent as Rbc} from './rbc.svg'; import {ReactComponent as Wolfram} from './wolfram.svg'; -export default { - giga: [ - Rbc - ], - mega: [ - Ciena, - Fullscript, - LighthouseLabs, - MarchNetworks - ], - kilo: [ - Balsamiq, - FdmGroup - ], - inKind: [ - OnePassword, - Ea, - Wolfram - ] -}; \ No newline at end of file +export { + OnePassword, + Balsamiq, + Ciena, + Ea, + FdmGroup, + Fullscript, + LighthouseLabs, + MarchNetworks, + Rbc, + Wolfram +} \ No newline at end of file diff --git a/src/assets/sponsors/lighthouse-labs.svg b/src/assets/sponsors/lighthouse-labs.svg index 8587148..090e3f3 100644 --- a/src/assets/sponsors/lighthouse-labs.svg +++ b/src/assets/sponsors/lighthouse-labs.svg @@ -1,8 +1,7 @@ - + diff --git a/src/assets/sponsors/march-networks.svg b/src/assets/sponsors/march-networks.svg index d45bb6e..b617404 100755 --- a/src/assets/sponsors/march-networks.svg +++ b/src/assets/sponsors/march-networks.svg @@ -2,69 +2,69 @@ - - - - - + + + + + - + - + - + - + - + - - + + - + - + - + - - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/src/assets/sponsors/rbc.svg b/src/assets/sponsors/rbc.svg index 239b078..1777f4a 100755 --- a/src/assets/sponsors/rbc.svg +++ b/src/assets/sponsors/rbc.svg @@ -1 +1,8 @@ - \ No newline at end of file + + + + + + + \ No newline at end of file diff --git a/src/assets/sponsors/wolfram.svg b/src/assets/sponsors/wolfram.svg index 9427eae..0c8094f 100644 --- a/src/assets/sponsors/wolfram.svg +++ b/src/assets/sponsors/wolfram.svg @@ -3,31 +3,31 @@ - - - - - + - - - - - diff --git a/src/index.css b/src/index.css index 04aa88f..472d14d 100644 --- a/src/index.css +++ b/src/index.css @@ -52,6 +52,10 @@ input:focus { outline: none; } +h2 { + font-family: 'Reem Kufi', sans-serif; +} + #root { background-color: var(--backgroundColour); background-image: var(--background); diff --git a/src/pages/home/index.js b/src/pages/home/index.js index 86a8638..cabebb1 100644 --- a/src/pages/home/index.js +++ b/src/pages/home/index.js @@ -10,6 +10,18 @@ import {ReactComponent as Logo} from 'assets/logo-animated.svg' import logoMLH from 'assets/partners/mlh.svg'; import logoSCE from 'assets/partners/sce.png'; import logoSCS from 'assets/partners/scs.png'; +import { + OnePassword, + Balsamiq, + Ciena, + Ea, + FdmGroup, + Fullscript, + LighthouseLabs, + MarchNetworks, + Rbc, + Wolfram +} from 'assets/sponsors'; import styles from './index.module.css'; function Landing() { @@ -28,18 +40,47 @@ function Landing() { function Sponsors() { const Partner = ({id, url, src, alt}) => ( - - {alt}/ + + {alt}/ + + ); + + const sponsorLogo = (id, url, Logo) => ( + + ); return (
-

Our Proud Partners

-
- - - +
+

Sponsors

+
+ {sponsorLogo(styles.rbc, 'https://rbc.com', Rbc)} +
+
+ {sponsorLogo(styles.ciena, 'https://ciena.ca', Ciena)} + {sponsorLogo(styles.fullscript, 'https://fullscript.com', Fullscript)} +
+
+ {sponsorLogo(styles.lighthouseLabs, 'https://lighthouselabs.ca', LighthouseLabs)} + {sponsorLogo(styles.marchNetworks, 'https://marchnetworks.com', MarchNetworks)} +
+
+ {sponsorLogo(styles.balsamiq, 'https://balsamiq.com', Balsamiq)} + {sponsorLogo(styles.fdmGroup, 'https://fdmgroup.com', FdmGroup)} +
+
+ {sponsorLogo(styles.onePassword, 'https://1password.com', OnePassword)} + {sponsorLogo(styles.ea, 'https://ea.com', Ea)} + {sponsorLogo(styles.wolfram, 'https://wolfram.com', Wolfram)} +
+

Partners

+
+ + + +
{/*

Questions? Send us an email at info@cuhacking.com.

*/}
diff --git a/src/pages/home/index.module.css b/src/pages/home/index.module.css index d468fbc..b6f6d8e 100644 --- a/src/pages/home/index.module.css +++ b/src/pages/home/index.module.css @@ -75,27 +75,91 @@ } /* Sponsors slide */ -#SCSLogo, #SCELogo{ - width: 250px; -} - -#MLHLogo { - width: 150px; -} - -.sponsors { +#sponsorBkg { display: flex; flex-direction: column; align-items: center; border: 3px solid var(--secondaryColour); border-radius: 15px; background-color: rgba(255, 255, 255, 1); - margin-bottom: 10px; + color: #000000; + margin-bottom: 60px; + width: 90%; +} + +.logoSection, #partners { + display: flex; + flex-direction: row; + justify-content: center; + align-items: center; + width: 95%; + margin-bottom: 30px; +} + +/* Giga */ +#rbc { + display: flex; + height: 200px; +} + +/* Mega */ +#ciena, +#fullscript, +#lighthouseLabs, +#marchNetworks { + width: 40%; + margin: 0 20px; +} + +#ciena { + margin-top: -30px; +} + +/* Kilo */ +#balsamiq, +#fdmGroup { + width: 20%; + margin: 0 15px; +} + +#balsamiq { + margin-bottom: -10px; } +#fdmGroup { + margin-top: -30px; +} + +/* In Kind */ +#onePassword, +#ea, +#wolfram { + width: 10%; + margin: 0 15px; +} + +#onePassword { + width: 12%; +} +#ea { + width: 8%; +} + +/* Partners */ .partnerLogo { + display: flex; + justify-content: center; + align-items: center; max-height: 150px; - padding: 20px; + padding: 20px; +} + +#SCSLogo, #SCELogo, #MLHLogo { + width: 50%; +} + +#partners { + flex-direction: column; } @media only screen and (min-width: 700px) { @@ -121,8 +185,19 @@ } /* Sponsors slide */ - .sponsors { - flex-direction: row; + #sponsorBkg { margin-bottom: 100px; } + + #rbc { + height: 325px; + } + + #SCSLogo, #SCELogo, #MLHLogo { + width: 100%; + } + + #partners { + flex-direction: row; + } } From 91292a201c2b12528ecf99afee8e45b7170dfd9c Mon Sep 17 00:00:00 2001 From: walsker Date: Tue, 5 Nov 2019 22:31:24 -0500 Subject: [PATCH 03/11] Update meta description tag Unrelated commit, thought we should update the meta description tag --- public/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/index.html b/public/index.html index 905f663..4a20724 100644 --- a/public/index.html +++ b/public/index.html @@ -9,7 +9,7 @@ cuHacking 2020 - + From 1c289bef1cff4c6ac08379e254cfb5f2c1012200 Mon Sep 17 00:00:00 2001 From: walsker Date: Tue, 5 Nov 2019 22:50:56 -0500 Subject: [PATCH 04/11] Add sponsorship prompt to website --- src/pages/home/index.js | 2 +- src/pages/home/index.module.css | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/pages/home/index.js b/src/pages/home/index.js index cabebb1..d5d684b 100644 --- a/src/pages/home/index.js +++ b/src/pages/home/index.js @@ -82,7 +82,7 @@ function Sponsors() {
- {/*

Questions? Send us an email at info@cuhacking.com.

*/} +

Thinking about sponsoring? Reach out to sponsorship@cuhacking.com to learn more.

); } diff --git a/src/pages/home/index.module.css b/src/pages/home/index.module.css index b6f6d8e..a9378c9 100644 --- a/src/pages/home/index.module.css +++ b/src/pages/home/index.module.css @@ -61,10 +61,6 @@ margin-bottom: 50px; } -.mailToLink { - color: var(--lightPrimaryColour); -} - .slide { display: flex; flex-direction: column; @@ -162,6 +158,11 @@ flex-direction: column; } +.mailToLink { + color: var(--lightPrimaryColour); + font-weight: bold; +} + @media only screen and (min-width: 700px) { /* Landing slide */ .landingTop { From 4fb5dfcd8e4697953ad4d76726dd1932c56cba8f Mon Sep 17 00:00:00 2001 From: walsker Date: Tue, 5 Nov 2019 22:57:55 -0500 Subject: [PATCH 05/11] Apply suggested changes --- src/pages/home/index.module.css | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/pages/home/index.module.css b/src/pages/home/index.module.css index a9378c9..00f96e2 100644 --- a/src/pages/home/index.module.css +++ b/src/pages/home/index.module.css @@ -100,11 +100,15 @@ /* Mega */ #ciena, -#fullscript, +#fullscript{ + width: 40%; + margin: 0 40px; +} + #lighthouseLabs, #marchNetworks { width: 40%; - margin: 0 20px; + margin: 0 30px 10px; } #ciena { @@ -115,7 +119,7 @@ #balsamiq, #fdmGroup { width: 20%; - margin: 0 15px; + margin: 0 25px 10px; } #balsamiq { @@ -123,7 +127,7 @@ } #fdmGroup { - margin-top: -30px; + margin-top: -20px; } /* In Kind */ @@ -131,7 +135,7 @@ #ea, #wolfram { width: 10%; - margin: 0 15px; + margin: 0 25px; } #onePassword { From 28eaca8c7f43a0748ebea059e1d99223a97cd182 Mon Sep 17 00:00:00 2001 From: walsker Date: Tue, 5 Nov 2019 23:19:00 -0500 Subject: [PATCH 06/11] Adjust logo sizes for mobile devices --- src/pages/home/index.module.css | 70 ++++++++++++++++++++++++++------- 1 file changed, 55 insertions(+), 15 deletions(-) diff --git a/src/pages/home/index.module.css b/src/pages/home/index.module.css index 00f96e2..2576eee 100644 --- a/src/pages/home/index.module.css +++ b/src/pages/home/index.module.css @@ -96,53 +96,47 @@ #rbc { display: flex; height: 200px; + margin-bottom: 10px; } /* Mega */ #ciena, #fullscript{ width: 40%; - margin: 0 40px; + margin: 0 10px; } #lighthouseLabs, #marchNetworks { width: 40%; - margin: 0 30px 10px; + margin: 0 10px; } #ciena { - margin-top: -30px; + margin-top: -10px; } /* Kilo */ #balsamiq, #fdmGroup { - width: 20%; - margin: 0 25px 10px; + width: 30%; + margin: 0 5px 10px; } #balsamiq { margin-bottom: -10px; } -#fdmGroup { - margin-top: -20px; -} - /* In Kind */ #onePassword, #ea, #wolfram { - width: 10%; - margin: 0 25px; + width: 20%; + margin: 0 20px; } -#onePassword { - width: 12%; -} #ea { - width: 8%; + width: 15%; } /* Partners */ @@ -198,6 +192,52 @@ height: 325px; } + /* Mega */ + #ciena, + #fullscript{ + margin: 0 40px; + } + + #ciena { + margin-top: -30px; + } + + #lighthouseLabs, + #marchNetworks { + margin: 0 30px 10px; + } + + /* Kilo */ + #balsamiq, + #fdmGroup { + width: 20%; + margin: 0 25px 10px; + } + + #balsamiq { + margin-bottom: -10px; + } + + #fdmGroup { + margin-top: -20px; + } + + /* In Kind */ + #onePassword, + #ea, + #wolfram { + width: 10%; + margin: 0 25px; + } + + #onePassword { + width: 12%; + } + #ea { + width: 8%; + } + + /* Partners */ #SCSLogo, #SCELogo, #MLHLogo { width: 100%; } From 0eb0640f8174d29f96e279943bbd08a9d77bbf1e Mon Sep 17 00:00:00 2001 From: walsker Date: Tue, 5 Nov 2019 23:24:16 -0500 Subject: [PATCH 07/11] Fix bug where RBC logo wouldn't appear on Chrome browsers --- src/assets/sponsors/rbc.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/assets/sponsors/rbc.svg b/src/assets/sponsors/rbc.svg index 1777f4a..a22edff 100755 --- a/src/assets/sponsors/rbc.svg +++ b/src/assets/sponsors/rbc.svg @@ -1,4 +1,4 @@ - From e99b0056fca00bb218e6550b2d748954d44fdd69 Mon Sep 17 00:00:00 2001 From: walsker Date: Tue, 5 Nov 2019 23:29:25 -0500 Subject: [PATCH 08/11] Shift MLH banner further to the right on mobile devices I thought I would throw in this change while I was optimizing styles for mobile devices. --- src/components/mlhBanner.module.css | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/components/mlhBanner.module.css b/src/components/mlhBanner.module.css index 404e98b..020cf73 100644 --- a/src/components/mlhBanner.module.css +++ b/src/components/mlhBanner.module.css @@ -3,7 +3,7 @@ max-width: 90px; min-width:60px; position:fixed; - right:60px; + right:20px; top:0; width:10%; z-index:10000; @@ -12,3 +12,9 @@ #banner { width: 100%; } + +@media only screen and (min-width: 700px) { + #container { + right:60px; + } +} \ No newline at end of file From dda971782b2fa622fd54067f5690d1f8c8d34d5a Mon Sep 17 00:00:00 2001 From: walsker Date: Wed, 6 Nov 2019 09:20:36 -0500 Subject: [PATCH 09/11] Fix bug on Safari where raven in animated logo did not render I figure it was because some of the IDs being referenced in this SVG were also the same IDs as other SVGs (SVGID_#_), so I had to rename them. I also removed any underscores from any ID, those seem to break SVGs as well. --- src/assets/logo-animated.svg | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/assets/logo-animated.svg b/src/assets/logo-animated.svg index ce530e4..99422d4 100644 --- a/src/assets/logo-animated.svg +++ b/src/assets/logo-animated.svg @@ -59,18 +59,18 @@ - + - + - + - - + + - + - - - + + - + - - - From 23883676981f9c58fef20590f2fc04559cd86987 Mon Sep 17 00:00:00 2001 From: walsker Date: Wed, 6 Nov 2019 11:13:06 -0500 Subject: [PATCH 10/11] Minify all SVGs All the tweaking I had to do was a result of using SVGs that weren't intended for integration with the web; all sorts of IDs were conflicting. To fix this, I pulled all the SVGs (expect the animated one) and minified them on export, telling illustrator to use unique IDs everywhere. We need to make sure that any future SVGs used on the website, if not using custom css (animations), are minified. --- src/assets/bkg-dark.svg | 702 +-------- src/assets/bkg.svg | 746 +--------- src/assets/dateStamp-dark.svg | 104 +- src/assets/dateStamp.svg | 104 +- src/assets/shortLogo-dark.svg | 23 +- src/assets/shortLogo.svg | 23 +- src/assets/sponsors/1password.svg | 1813 +---------------------- src/assets/sponsors/balsamiq.svg | 19 +- src/assets/sponsors/ciena.svg | 28 +- src/assets/sponsors/ea.svg | 12 +- src/assets/sponsors/fdm-group.svg | 2 +- src/assets/sponsors/fullscript.svg | 83 +- src/assets/sponsors/lighthouse-labs.svg | 70 +- src/assets/sponsors/march-networks.svg | 71 +- src/assets/sponsors/rbc.svg | 9 +- src/assets/sponsors/wolfram.svg | 47 +- src/pages/home/index.module.css | 4 +- 17 files changed, 18 insertions(+), 3842 deletions(-) diff --git a/src/assets/bkg-dark.svg b/src/assets/bkg-dark.svg index 8230cfb..d23d7ef 100644 --- a/src/assets/bkg-dark.svg +++ b/src/assets/bkg-dark.svg @@ -1,701 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -What colour works - -What colour works - -What colour works - - - - - - - - -What colour works - -What colour works - -What colour works - +bkg-dark \ No newline at end of file diff --git a/src/assets/bkg.svg b/src/assets/bkg.svg index 5579c90..d48822d 100644 --- a/src/assets/bkg.svg +++ b/src/assets/bkg.svg @@ -1,745 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +bkg \ No newline at end of file diff --git a/src/assets/dateStamp-dark.svg b/src/assets/dateStamp-dark.svg index 37e4517..81103e3 100644 --- a/src/assets/dateStamp-dark.svg +++ b/src/assets/dateStamp-dark.svg @@ -1,103 +1 @@ - - - - - - - - - - - - - - - +dateStamp-dark \ No newline at end of file diff --git a/src/assets/dateStamp.svg b/src/assets/dateStamp.svg index 47eb305..bdef32a 100644 --- a/src/assets/dateStamp.svg +++ b/src/assets/dateStamp.svg @@ -1,103 +1 @@ - - - - - - - - - - - - - - - +dateStamp \ No newline at end of file diff --git a/src/assets/shortLogo-dark.svg b/src/assets/shortLogo-dark.svg index 5092d0f..2f8bfc7 100644 --- a/src/assets/shortLogo-dark.svg +++ b/src/assets/shortLogo-dark.svg @@ -1,22 +1 @@ - - - - - - - - - - - - - - - - - - - - - - +shortLogo-dark \ No newline at end of file diff --git a/src/assets/shortLogo.svg b/src/assets/shortLogo.svg index 5775fd6..c22e028 100644 --- a/src/assets/shortLogo.svg +++ b/src/assets/shortLogo.svg @@ -1,22 +1 @@ - - - - - - - - - - - - - - - - - - - - - - +shortLogo \ No newline at end of file diff --git a/src/assets/sponsors/1password.svg b/src/assets/sponsors/1password.svg index 9b097b9..d219462 100644 --- a/src/assets/sponsors/1password.svg +++ b/src/assets/sponsors/1password.svg @@ -1,1812 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +1password \ No newline at end of file diff --git a/src/assets/sponsors/balsamiq.svg b/src/assets/sponsors/balsamiq.svg index 955e688..07caf2d 100644 --- a/src/assets/sponsors/balsamiq.svg +++ b/src/assets/sponsors/balsamiq.svg @@ -1,18 +1 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file +balsamiq \ No newline at end of file diff --git a/src/assets/sponsors/ciena.svg b/src/assets/sponsors/ciena.svg index 27a450a..f5a4830 100644 --- a/src/assets/sponsors/ciena.svg +++ b/src/assets/sponsors/ciena.svg @@ -1,27 +1 @@ - - - - - - +ciena \ No newline at end of file diff --git a/src/assets/sponsors/ea.svg b/src/assets/sponsors/ea.svg index 7da6b84..37f2ccc 100644 --- a/src/assets/sponsors/ea.svg +++ b/src/assets/sponsors/ea.svg @@ -1,11 +1 @@ - - - - - - - - - - - \ No newline at end of file +ea \ No newline at end of file diff --git a/src/assets/sponsors/fdm-group.svg b/src/assets/sponsors/fdm-group.svg index 8ade836..f91c2e7 100755 --- a/src/assets/sponsors/fdm-group.svg +++ b/src/assets/sponsors/fdm-group.svg @@ -1 +1 @@ -FDM Logo - BLACK \ No newline at end of file +fdm-group \ No newline at end of file diff --git a/src/assets/sponsors/fullscript.svg b/src/assets/sponsors/fullscript.svg index b6c90b4..a5cc1f1 100644 --- a/src/assets/sponsors/fullscript.svg +++ b/src/assets/sponsors/fullscript.svg @@ -1,82 +1 @@ - - - - -Group 3 -Created with Sketch. - - - - - - - - - - - - - - - - - - - - +fullscript \ No newline at end of file diff --git a/src/assets/sponsors/lighthouse-labs.svg b/src/assets/sponsors/lighthouse-labs.svg index 090e3f3..76e2c8f 100644 --- a/src/assets/sponsors/lighthouse-labs.svg +++ b/src/assets/sponsors/lighthouse-labs.svg @@ -1,69 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +lighthouse-labs \ No newline at end of file diff --git a/src/assets/sponsors/march-networks.svg b/src/assets/sponsors/march-networks.svg index b617404..8b0695e 100755 --- a/src/assets/sponsors/march-networks.svg +++ b/src/assets/sponsors/march-networks.svg @@ -1,70 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file +march-networks \ No newline at end of file diff --git a/src/assets/sponsors/rbc.svg b/src/assets/sponsors/rbc.svg index a22edff..b85c022 100755 --- a/src/assets/sponsors/rbc.svg +++ b/src/assets/sponsors/rbc.svg @@ -1,8 +1 @@ - - - - - - - \ No newline at end of file +rbc \ No newline at end of file diff --git a/src/assets/sponsors/wolfram.svg b/src/assets/sponsors/wolfram.svg index 0c8094f..a3b61c0 100644 --- a/src/assets/sponsors/wolfram.svg +++ b/src/assets/sponsors/wolfram.svg @@ -1,46 +1 @@ - - - - - - - - - - - - - - - - - +wolfram \ No newline at end of file diff --git a/src/pages/home/index.module.css b/src/pages/home/index.module.css index 2576eee..fdf81f3 100644 --- a/src/pages/home/index.module.css +++ b/src/pages/home/index.module.css @@ -42,7 +42,7 @@ } .landingDate { - width: 100%; + width: 90%; height: 200px; min-width: 40%; margin-right: -50px; @@ -174,7 +174,7 @@ } .landingDate { - max-width: 60%; + max-width: 45%; background-position: right; } From 1c4e2d4fcc71dd08bf81cb55051e1905566f0eca Mon Sep 17 00:00:00 2001 From: walsker Date: Thu, 7 Nov 2019 12:21:07 -0500 Subject: [PATCH 11/11] Version bump --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f309bca..37abb94 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cuhacking-website", - "version": "1.0.2", + "version": "1.1.0", "private": true, "homepage": "https://cuhacking.com", "dependencies": {