diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..d7b8f50 Binary files /dev/null and b/.DS_Store differ diff --git a/frontend/public/android-icon-144x144.png b/frontend/public/android-icon-144x144.png index 5fb2e64..76e9df7 100644 Binary files a/frontend/public/android-icon-144x144.png and b/frontend/public/android-icon-144x144.png differ diff --git a/frontend/public/android-icon-192x192.png b/frontend/public/android-icon-192x192.png index d21d16e..eb568b0 100644 Binary files a/frontend/public/android-icon-192x192.png and b/frontend/public/android-icon-192x192.png differ diff --git a/frontend/public/android-icon-36x36.png b/frontend/public/android-icon-36x36.png index b920cdc..302e356 100644 Binary files a/frontend/public/android-icon-36x36.png and b/frontend/public/android-icon-36x36.png differ diff --git a/frontend/public/android-icon-48x48.png b/frontend/public/android-icon-48x48.png index 247d0a7..6715af3 100644 Binary files a/frontend/public/android-icon-48x48.png and b/frontend/public/android-icon-48x48.png differ diff --git a/frontend/public/android-icon-72x72.png b/frontend/public/android-icon-72x72.png index 0292afa..657fc2c 100644 Binary files a/frontend/public/android-icon-72x72.png and b/frontend/public/android-icon-72x72.png differ diff --git a/frontend/public/android-icon-96x96.png b/frontend/public/android-icon-96x96.png index 43ba860..1703314 100644 Binary files a/frontend/public/android-icon-96x96.png and b/frontend/public/android-icon-96x96.png differ diff --git a/frontend/public/apple-icon-114x114.png b/frontend/public/apple-icon-114x114.png index 711cc71..f11167b 100644 Binary files a/frontend/public/apple-icon-114x114.png and b/frontend/public/apple-icon-114x114.png differ diff --git a/frontend/public/apple-icon-120x120.png b/frontend/public/apple-icon-120x120.png index 13a6306..8241944 100644 Binary files a/frontend/public/apple-icon-120x120.png and b/frontend/public/apple-icon-120x120.png differ diff --git a/frontend/public/apple-icon-144x144.png b/frontend/public/apple-icon-144x144.png index 5fb2e64..76e9df7 100644 Binary files a/frontend/public/apple-icon-144x144.png and b/frontend/public/apple-icon-144x144.png differ diff --git a/frontend/public/apple-icon-152x152.png b/frontend/public/apple-icon-152x152.png index bfdb088..cba4ce2 100644 Binary files a/frontend/public/apple-icon-152x152.png and b/frontend/public/apple-icon-152x152.png differ diff --git a/frontend/public/apple-icon-180x180.png b/frontend/public/apple-icon-180x180.png index 79a87ce..3d94bfe 100644 Binary files a/frontend/public/apple-icon-180x180.png and b/frontend/public/apple-icon-180x180.png differ diff --git a/frontend/public/apple-icon-57x57.png b/frontend/public/apple-icon-57x57.png index e6a9574..c1da0c6 100644 Binary files a/frontend/public/apple-icon-57x57.png and b/frontend/public/apple-icon-57x57.png differ diff --git a/frontend/public/apple-icon-60x60.png b/frontend/public/apple-icon-60x60.png index b4e9230..90a2d1f 100644 Binary files a/frontend/public/apple-icon-60x60.png and b/frontend/public/apple-icon-60x60.png differ diff --git a/frontend/public/apple-icon-72x72.png b/frontend/public/apple-icon-72x72.png index 0292afa..657fc2c 100644 Binary files a/frontend/public/apple-icon-72x72.png and b/frontend/public/apple-icon-72x72.png differ diff --git a/frontend/public/apple-icon-76x76.png b/frontend/public/apple-icon-76x76.png index ae77b8e..f5db7c1 100644 Binary files a/frontend/public/apple-icon-76x76.png and b/frontend/public/apple-icon-76x76.png differ diff --git a/frontend/public/apple-icon-precomposed.png b/frontend/public/apple-icon-precomposed.png index f7b817f..df8b73e 100644 Binary files a/frontend/public/apple-icon-precomposed.png and b/frontend/public/apple-icon-precomposed.png differ diff --git a/frontend/public/apple-icon.png b/frontend/public/apple-icon.png index f7b817f..df8b73e 100644 Binary files a/frontend/public/apple-icon.png and b/frontend/public/apple-icon.png differ diff --git a/frontend/public/favicon-16x16.png b/frontend/public/favicon-16x16.png index b873249..2749884 100644 Binary files a/frontend/public/favicon-16x16.png and b/frontend/public/favicon-16x16.png differ diff --git a/frontend/public/favicon-32x32.png b/frontend/public/favicon-32x32.png index 61a1ca9..3015b0c 100644 Binary files a/frontend/public/favicon-32x32.png and b/frontend/public/favicon-32x32.png differ diff --git a/frontend/public/favicon-96x96.png b/frontend/public/favicon-96x96.png index 43ba860..1703314 100644 Binary files a/frontend/public/favicon-96x96.png and b/frontend/public/favicon-96x96.png differ diff --git a/frontend/public/favicon.ico b/frontend/public/favicon.ico index 114704f..4f990cb 100644 Binary files a/frontend/public/favicon.ico and b/frontend/public/favicon.ico differ diff --git a/frontend/public/index.html b/frontend/public/index.html index bd8969c..266949f 100644 --- a/frontend/public/index.html +++ b/frontend/public/index.html @@ -27,16 +27,19 @@ - + - + + + + - Downtown Stimulus + FundOSS diff --git a/frontend/public/ms-icon-144x144.png b/frontend/public/ms-icon-144x144.png index 5fb2e64..76e9df7 100644 Binary files a/frontend/public/ms-icon-144x144.png and b/frontend/public/ms-icon-144x144.png differ diff --git a/frontend/public/ms-icon-150x150.png b/frontend/public/ms-icon-150x150.png index 19b7b98..001f974 100644 Binary files a/frontend/public/ms-icon-150x150.png and b/frontend/public/ms-icon-150x150.png differ diff --git a/frontend/public/ms-icon-310x310.png b/frontend/public/ms-icon-310x310.png index f0b8777..48c2d67 100644 Binary files a/frontend/public/ms-icon-310x310.png and b/frontend/public/ms-icon-310x310.png differ diff --git a/frontend/public/ms-icon-70x70.png b/frontend/public/ms-icon-70x70.png index f393cc5..752010a 100644 Binary files a/frontend/public/ms-icon-70x70.png and b/frontend/public/ms-icon-70x70.png differ diff --git a/frontend/src/App.scss b/frontend/src/App.scss index 4ae157b..0d78a2e 100644 --- a/frontend/src/App.scss +++ b/frontend/src/App.scss @@ -2,14 +2,33 @@ @import url("https://fonts.googleapis.com/css2?family=Rubik:ital,wght@0,300;0,400;0,500;0,700;0,900;1,300;1,400;1,500;1,700;1,900&display=swap"); :root { - --header1Font: "Montserrat", "Roboto Slab", serif; - --header2Font: "Roboto Slab", serif; - --header3Font: "Roboto Slab", serif; - --paragraphFont: "Roboto", sans-serif; + --header1Font: "Poppins", "Roboto", Helvetica, Arial, sans-serif; + --header2Font: "Poppins", "Roboto", Helvetica, Arial, sans-serif; + --header3Font: "Poppins", "Roboto", Helvetica, Arial, sans-serif; + --headerweight-strong: 900; + + --paragraphFont: "Roboto", helvetica, arial, sans-serif; --baseFontSize: 16px; - --primaryColor: #8d62e3; + + --lighterPurple: #F2EAFD; + --lightPurple: #DFCAF9; + --primaryPurple: #9451EB; + --darkPurple: #16036B; + --darkerPurple: #110F4C; + + --lightGreen: #B3F6E6; + --primaryGreen: #02E2AC; + --darkGreen: #004A2A; + + --lightGreen: #C3C7FF; + --primaryBlue: #02E2AC; + --darkGreen: #010289; + + + --primaryColor: #9451EB; --primaryHighlightColor: #ffac4b; --yellowHighlightColor: #fffbf3; + --yellowColor: #ffc700; --yellowBorderColor: #f0dfbe; --greenColor: #57ef3f; @@ -51,7 +70,7 @@ h1 { font-weight: normal; color: var(--header1Color); font-family: var(--header1Font); - font-weight: 900; + font-weight: var(--headerweight-strong); line-height: 3rem; margin-block-start: 0em !important; margin-block-end: 0em !important; @@ -59,7 +78,7 @@ h1 { h2 { font-size: var(--header2Size); - font-weight: normal; + font-weight: var(--headerweight-strong); color: var(--header2Color); font-family: var(--header2Font); line-height: 2.5rem; diff --git a/frontend/src/assets/logo.svg b/frontend/src/assets/logo.svg index 3ed906b..8d1603c 100644 --- a/frontend/src/assets/logo.svg +++ b/frontend/src/assets/logo.svg @@ -1,4 +1,10 @@ - - - + + + + + + + + + diff --git a/frontend/src/assets/logo_osc.svg b/frontend/src/assets/logo_osc.svg index 1cbf35d..7ddc146 100644 --- a/frontend/src/assets/logo_osc.svg +++ b/frontend/src/assets/logo_osc.svg @@ -1,9 +1,26 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/frontend/src/assets/logo_sustain.svg b/frontend/src/assets/logo_sustain.svg new file mode 100644 index 0000000..4e4d1cb --- /dev/null +++ b/frontend/src/assets/logo_sustain.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/frontend/src/assets/logo_synth.svg b/frontend/src/assets/logo_synth.svg new file mode 100644 index 0000000..e94eebb --- /dev/null +++ b/frontend/src/assets/logo_synth.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/frontend/src/assets/splash-bg.svg b/frontend/src/assets/splash-bg.svg new file mode 100644 index 0000000..2af502e --- /dev/null +++ b/frontend/src/assets/splash-bg.svg @@ -0,0 +1,3 @@ + + + diff --git a/frontend/src/components/HomeTopBar/HomeTopBar.scss b/frontend/src/components/HomeTopBar/HomeTopBar.scss index 5e2760c..5859967 100644 --- a/frontend/src/components/HomeTopBar/HomeTopBar.scss +++ b/frontend/src/components/HomeTopBar/HomeTopBar.scss @@ -26,7 +26,7 @@ width: 627px; height: 352px; .headline { - font-family: Montserrat; + // font-family: Montserrat; font-size: 35px; font-style: normal; font-weight: 900; @@ -36,7 +36,7 @@ } .time-period { padding-top: 1rem; - font-family: Montserrat; + // font-family: Montserrat; font-size: 19px; font-style: normal; font-weight: 900; @@ -46,7 +46,7 @@ } .info { padding-top: 1rem; - font-family: Roboto; + // font-family: Roboto; font-size: 15px; font-style: normal; font-weight: 400; @@ -57,7 +57,7 @@ } .sponsor-headline { padding-top: 1rem; - font-family: Roboto; + // font-family: Roboto; font-style: normal; font-weight: normal; font-size: 15px; @@ -130,7 +130,7 @@ .home-sort-value { display: flex; align-items: center; - font-family: Roboto; + // font-family: Roboto; font-style: normal; font-weight: bold; font-size: 12px; diff --git a/frontend/src/components/HomeTopBar/HomeTopBar.tsx b/frontend/src/components/HomeTopBar/HomeTopBar.tsx index 91d4672..4587af2 100644 --- a/frontend/src/components/HomeTopBar/HomeTopBar.tsx +++ b/frontend/src/components/HomeTopBar/HomeTopBar.tsx @@ -35,7 +35,7 @@ function HomeTopBar() {

@@ -51,6 +51,16 @@ function HomeTopBar() { alt="osc" style={{ paddingLeft: "1.5rem" }} /> + osc + osc