diff --git a/src/assets/nwHacksLogin.svg b/src/assets/nwHacksLogin.svg index 2ee706c0..e6b62dbe 100644 --- a/src/assets/nwHacksLogin.svg +++ b/src/assets/nwHacksLogin.svg @@ -1,185 +1,1213 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + - + + - - + + - + - + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/nwhacks_logo.svg b/src/assets/nwhacks_logo.svg index fa9ac176..efb43aa2 100644 --- a/src/assets/nwhacks_logo.svg +++ b/src/assets/nwhacks_logo.svg @@ -1,44 +1,31 @@ - - - - - - - - - + + + + + + + + + + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - - - - - - - - - - - + + + - + \ No newline at end of file diff --git a/src/pages/Login.jsx b/src/pages/Login.jsx index cada98a4..de98aaea 100644 --- a/src/pages/Login.jsx +++ b/src/pages/Login.jsx @@ -122,7 +122,7 @@ const Login = () => { Sign in with Google - { > Sign in with GitHub - + */} {error ? handleAuthError(error.code, error.message) : null} diff --git a/src/theme/ThemeProvider.jsx b/src/theme/ThemeProvider.jsx index c152f8df..e268335b 100644 --- a/src/theme/ThemeProvider.jsx +++ b/src/theme/ThemeProvider.jsx @@ -153,74 +153,106 @@ const nwHacksTheme = { ...base, name: 'nwhacks', colors: { - background: '#3C4BA5', // Background - card: '#0A1361', // BG Accent - border: 'rgba(255, 255, 255, 0.3)', - secondaryBackgroundTransparent: '#F0EEF299', - secondaryBackgroundTransparentHover: '#9D9FAD', - secondaryBackground: '#5667CF', // Side bar background + background: '#EDDECC', + backgroundSecondary: '#E2D0BA', + backgroundTertiary: 'linear-gradient(180deg, #F9C745 0%, #FF880F 100%)', + text: '#3A2F21', + textSecondary: '#01033D', + highlight: '#30C55A', + warning: '#D04E51', + error: '#E03131', + scrollbar: '#FFFFFF', + required: '#D04E51', + link: '#F3BC1C', + linkHover: '#75AEE2', + lines: '#45171A', // ask design for a variable (for gamification) + bar: '#00A4E0', // ask design for a variable (for gamification) + barBackground: '#371315', // ask design for a variable (for gamification) + + // sidebar sidebar: { - background: '#5667CF', - hover: '#0A1361', - selected: '#3C4BA5', - primary: '#FFF', - secondary: '#9D9FAD', - link: '#9D9FAD', - statusText: '#9D9FAD', - }, - error: '#ff0033', - success: '#629F5D', - toastText: '#fff', // Color for text in toast messages (Toast.js) - foreground: '#F0EEF2', - primary: '#FFBF76', - default: '#FFFFFF', - warning: '#F18383', - secondaryWarning: '#E03131', - highlight: 'rgba(255, 255, 255, 0.5)', - text: '#FFF', - link: '#fff', - linkHover: '#31E0E0', //TODO - primaryGradient: 'linear-gradient(180deg, #150C27 0%, #150C27 100%)', //'linear-gradient(180deg, #FED9CD 0%, #CDCAEC 100%)', // button - primaryGradientHover: 'linear-gradient(263.82deg, #E9C3CB 38.58%, #A4A9F1 78.17%)', //'linear-gradient(180deg, #76F4D6 0%, #18CDCD 100%, #44D0D0 100%)', // button hover - tertiaryHover: '#1EEDC8', // button hover - selects: { - hover: '#5667CF', - focus: 'rgba(197, 172, 229, 0.4)', - border: '#0B1361', // Text input form - placeholder: '#CFD6FF', // Placeholder text in form - text: '#fff', + background: 'linear-gradient(191.3deg, #77CFDC -57.93%, #23A2CE 78.18%)', + backgroundSecondary: '#EDDECC', + textSectionHeader: '#F9C745', + textSelected: '#FFFFFF', + textDefault: '#EBEBEB', + backgroundSelected: '#1A94BC', + textHover: '#FFFFFF', + backgroundHover: '#A8138C', }, + + // buttons button: { - // Application form buttons - text: '#191C4F', // For primary button - background: 'linear-gradient(265.48deg, #959AFB 3.67%, #9AD4DE 78.93%)', // Primary button - border: '#9AD4DE', - hoverbg: ' linear-gradient(265.48deg, #D9DBFF 3.67%, #CCF2F9 78.93%)', - hoverborder: '#A4A9F1', - outlineText: '#FFF', // Secondary button - outlineHover: '#FFFFFF', // secondary - outlineBackground: '#A4A9F1', //secondary button - outlineBackgroundHover: 'linear-gradient(265.48deg, #D9DBFF 3.67%, #CCF2F9 78.93%)', - outlineBorder: '#CFD6FF', - grey500: '#BDBAC3', - grey700: '#55525B', + primary: { + text: '#3A2F21', + background: { + default: 'linear-gradient(90deg, #F1BC3E 26.5%, #ECB32A 100%)', + hover: 'linear-gradient(90deg, #F7D175 0%, #FBC951 100%);', + clicked: 'linear-gradient(90deg, #F3BC3A 0%, #DDA419 100%)', + }, + }, + secondary: { + text: '#45171A', + background: { + default: '#F3C241', + hover: '#FFD569', // missing + clicked: '#E4B63F', // mising + }, + }, + warning: { + text: '#FFFFFF', + background: { + default: '#E03131', + hover: '#B52828', + clicked: '#C92C2C', + }, + }, + backgroundDisabled: '#C9C2BF', }, + + // schedule schedule: { - background: 'linear-gradient(0deg, #244556 100%, #33515E 80%, #244556 20%)', - event: 'white', - text: '#F0EEF2', //greyscale - timestamp: '#DCB551', + background: + 'linear-gradient(180deg, rgba(0, 163, 224, 0.6) 0%, rgba(255, 248, 229, 0.6) 99.98%)', + mainEventTag: '#3268A5', + workshopTag: '#DE0148', + activityTag: '#A9158D', + lines: '#FFFFFF', + }, + + // form elements + input: { + border: '#45171A', + hover: '#A9158D', + disabled: '#B0B0B066', + }, + select: { + border: '#453017', + background: { + default: 'transparent', + hover: '#75AEE2', + }, + }, + dropdown: { + background: { + selected: '#D4BEA4', + hover: '#E2D0BA', + }, }, - hover: '#D9FFF9', - scrollbar: '#5F8CA2', - banner: 'rgba(0,0,0,0)', + + // auth login: { - googleBg: '#fff', - googleText: '#000', - googleBgHover: '#fff', - githubBg: '#051439', - githubText: '#fff', - githubBgHover: '#051439', + googleAuthBackground: '#FFFFFF', + googleAuthBackgroundHover: '##FB8EAD', + googleAuthText: '#2A3C4A', + githubAuthText: '#FFFFFF', + githubAuthBackground: '#577079', + githubAuthBackgroundHover: '#3A9BBE', + }, + + // misc + faq: { + toggle: '#45171A', }, }, } @@ -229,84 +261,112 @@ const cmdfTheme = { ...base, name: 'cmd-f', colors: { - background: '#5968A6', - card: '#323858', // BG Accent - cardText: '#ffffff', - border: 'rgba(0, 0, 0, 0.3)', - cardSecondary: '#C8BFB6', - secondaryBackground: '#323858', - // secondaryBackgroundTransparent: '#EBC02910', - secondaryBackgroundTransparent: '#F1E9DF', + background: '#C8E5F0', + backgroundSecondary: '#93BEE5', + backgroundTertiary: 'linear-gradient(180deg, #F9C745 0%, #FF880F 100%)', + text: '#45171A', + textSecondary: '#01033D', + highlight: '#45171A', + warning: '#D04E51', + error: '#E03131', + scrollbar: '#FFFFFF', + required: '#D04E51', + link: '#FBBC05', + linkHover: '#75AEE2', + lines: '#45171A', + bar: '#00A4E0', + barBackground: '#371315', + + // sidebar sidebar: { - background: '#323858', - secondary: '#FFFFFF', - link: '#CAD1F7', - hover: '#5968A6', - primary: '#48FFF4', + background: 'linear-gradient(191.3deg, #CF0A1F -57.93%, #5B0B4C 78.18%)', + backgroundSecondary: 'transparent', + textSectionHeader: '#F9C745', + textSelected: '#FFFFFF', + textDefault: '#EBEBEB', + backgroundSelected: '#A8138C', + textHover: '#FFFFFF', + backgroundHover: '#910F79', + }, + + // buttons + button: { + primary: { + text: '#45171A', + background: { + default: 'linear-gradient(90deg, #F9C745 0%, #F7891A 100%)', + hover: 'linear-gradient(90deg, #FFE090 0%, #FFA549 100%)', + clicked: 'linear-gradient(90deg, #E6B63A 0%, #EE851A 100%)', + }, + }, + secondary: { + text: '#45171A', + background: { + default: '#F9C745', + hover: '#FFD569', + clicked: '#E4B63F', + }, + }, + warning: { + text: '#FFFFFF', + background: { + default: '#E03131', + hover: '#b52828', + clicked: '#c92c2c', + }, + }, + backgroundDisabled: '#BDBAC3', }, - foreground: '#FFFFFF', - error: '#ff0033', - success: '#629F5D', - toastText: '#fff', // Color for text in toast messages (Toast.js) - warning: '#FF8989', - secondaryWarning: '#EF6C6C', - primary: '#48FFF4', - secondary: '#CAD1F7', - primaryGradient: '#82B185', - primaryGradientHover: '#CAD1F7', - default: '#FFFFFF', - highlight: '#192825', - text: '#FFFFFF', - link: '#3D995F', - linkHover: '#CAD1F7', - tertiaryHover: '#CAD1F7', // button hover - // Styling for schedule page + + // schedule schedule: { - background: 'linear-gradient(0deg, #404871 100%, #58618C 80%, #949ABA 20%)', - event: 'white', - text: '#F0EEF2', //greyscale - timestamp: '#48FFF4', + background: + 'linear-gradient(180deg, rgba(0, 163, 224, 0.6) 0%, rgba(255, 248, 229, 0.6) 99.98%)', + mainEventTag: '#3268A5', + workshopTag: '#DE0148', + activityTag: '#A9158D', + lines: '#FFFFFF', }, - selects: { - border: '#CAD1F7', - text: '#FFFFFF', - hover: '#48FFF4', - disabled: 'rgba(0, 0, 0, 0.4)', - selected: '#48FFF4', - placeholder: 'rgba(0, 0, 0, 0.4)', + + // form elements + input: { + border: '#45171A', + hover: '#A9158D', + disabled: '#B0B0B0', }, - button: { - // Application form buttons - text: '#0A1361', // For primary button - background: '#5968A6', // Primary button - border: '#9AD4DE', - hoverbg: '#CAD1F7', - hoverborder: '#A4A9F1', - outlineText: '#FFFFFF', // Secondary button - outlineBackground: '#5968A6', - outlineBackgroundHover: '#48FFF4', - outlineBorder: '#CFD6FF', - grey500: '#BDBAC3', - grey700: '#55525B', + select: { + border: '#45171A', + background: { + default: 'transparent', + hover: '#75AEE2', + }, }, - hover: '#A0B9C0', - scrollbar: '#5F8CA2', - banner: 'transparent', + dropdown: { + background: { + selected: '#75AEE2', + hover: '#669fd4', + }, + }, + + // auth login: { - background: '#C0A68B', - text: '#fff', - googleBg: '#fff', - googleText: '#000', - googleBgHover: 'rgba(255, 255, 255, 0.8)', - githubBg: '#577079', - githubText: '#fff', - githubBgHover: 'rgba(87, 112, 121, 0.8)', + googleAuthBackground: '#FFFFFF', + googleAuthBackgroundHover: '#edebeb', + googleAuthText: '#2A3C4A', + githubAuthText: '#FFFFFF', + githubAuthBackground: '#2A3C4A', + githubAuthBackgroundHover: '#21313d', + }, + + // misc + faq: { + toggle: '#45171A', }, }, } // change when we do the rest of the reskins -const THEMES = { 'hackcamp': hackcampTheme, 'nwhacks': hackcampTheme, 'cmd-f': hackcampTheme } +const THEMES = { 'hackcamp': hackcampTheme, 'nwhacks': nwHacksTheme, 'cmd-f': cmdfTheme } const ThemeProvider = ({ children }) => { const { activeHackathon } = useHackathon()