Merge remote-tracking branch 'origin/main'

# Conflicts: # package-lock.json
OpenDDD · Mar 12, 2024 · f013b49 · f013b49
2 parents 800b560 + 5fca067
commit f013b49
Show file tree

Hide file tree

Showing 13 changed files with 29 additions and 24 deletions.
diff --git a/components/Agenda/Agenda.styled.tsx b/components/Agenda/Agenda.styled.tsx
@@ -74,7 +74,7 @@ export const StyledAgendaRowList = styled('ul')(({ theme }) => ({
 
   li: {
     padding: calcRem(theme.metrics.md),
-    backgroundColor: theme.colors.dddblue,
+    backgroundColor: theme.colors.dddpurple,
     color: theme.colors.white,
     fontSize: calcRem(20),
     fontWeight: theme.weights.bold,

diff --git a/components/Hero/Hero.styled.tsx b/components/Hero/Hero.styled.tsx
@@ -23,7 +23,7 @@ export const HeroContentWrapper = styled('div')(({ theme }) => ({
   '::before': {
     width: '100%',
     height: '100%',
-    backgroundColor: theme.colors.dddblue,
+    backgroundColor: theme.colors.dddpurple,
     position: 'absolute',
     opacity: 0.8,
     content: '""',

diff --git a/components/Voting/Content.styled.tsx b/components/Voting/Content.styled.tsx
@@ -11,7 +11,7 @@ export const StyledHeader = styled('div')(({ theme }) => ({
   marginBlockStart: calcRem(-theme.metrics.xl),
   marginBlockEnd: calcRem(60),
   gap: '1rem',
-  backgroundColor: theme.colors.dddblue,
+  backgroundColor: theme.colors.dddpurple,
 }))
 
 export const StyledColumnLayout = styled('div')(({ theme }) => ({
@@ -146,7 +146,7 @@ export const MoreInfoButton = styled('a')(({ theme }) => ({
 
   '&:hover, &:focus': {
     backgroundColor: theme.colors.white,
-    color: theme.colors.dddblue,
+    color: theme.colors.dddpurple,
   },
 }))
 

diff --git a/components/Voting/EloVote.styled.tsx b/components/Voting/EloVote.styled.tsx
@@ -109,7 +109,7 @@ export const StyledVoteButton = styled(Button)<StyledVoteButtonProps>(({ theme,
   },
 
   '&:focus': {
-    boxShadow: `0 0 0 ${calcRem(theme.metrics.xs)} ${theme.colors.dddblue}`,
+    boxShadow: `0 0 0 ${calcRem(theme.metrics.xs)} ${theme.colors.dddpurple}`,
   },
 }))
 
@@ -148,7 +148,7 @@ export const StyledLayoutLabel = styled('label')(({ theme }) => ({
   input: srOnly,
 
   span: {
-    color: theme.colors.dddblue,
+    color: theme.colors.dddpurple,
     textDecoration: 'underline',
   },
 

diff --git a/components/global/Button/Button.styled.ts b/components/global/Button/Button.styled.ts
@@ -18,35 +18,35 @@ export const StyledLinkButton = styled('button', {
   textDecoration: 'underline',
   background: 'transparent',
   border: 'none',
-  color: theme.colors.dddblue,
+  color: theme.colors.dddpurple,
   cursor: 'pointer',
 
   '&:hoverm &:focus': {
-    color: theme.colors.dddbluedark,
+    color: theme.colors.dddpurpledark,
   },
 }))
 
 function getButtonStylesForKind(kind: ButtonKinds, theme: DDDTheme): CSSObject {
   switch (kind) {
     case 'primary':
       return {
-        backgroundColor: theme.colors.dddblue,
+        backgroundColor: theme.colors.dddpurple,
         color: theme.colors.white,
         fill: 'currentColor',
 
         '&:hover, &:focus': {
-          backgroundColor: theme.colors.dddbluedark,
+          backgroundColor: theme.colors.dddpurpledark,
           color: theme.colors.white,
         },
 
         '&:focus': {
-          boxShadow: `0 0 0 ${calcRem(theme.metrics.xs)} ${theme.colors.dddblue}`,
+          boxShadow: `0 0 0 ${calcRem(theme.metrics.xs)} ${theme.colors.dddpurple}`,
         },
       }
     default:
       return {
         backgroundColor: theme.colors.grey300,
-        color: theme.colors.dddblue,
+        color: theme.colors.dddpurple,
         '&:hover, &:focus': {
           backgroundColor: theme.colors.grey400,
         },

diff --git a/components/global/Footer/Footer.styled.ts b/components/global/Footer/Footer.styled.ts
@@ -16,7 +16,7 @@ export const StyledFooter = styled('footer')(({ theme }) => ({
     gridColumn: 2,
   },
 
-  backgroundColor: theme.colors.dddblue,
+  backgroundColor: theme.colors.dddpurple,
 }))
 StyledFooter.displayName = 'StyledFooter'
 
@@ -50,7 +50,7 @@ export const StyledSocialLink = styled(SafeLink)(({ theme }) => ({
 
   '&:hover, &:focus :nth-of-type(odd)': {
     svg: {
-      fill: Math.floor(Math.random() * 2) === 1 ? theme.colors.dddpink : theme.colors.dddorange,
+      fill: Math.floor(Math.random() * 2) === 1 ? theme.colors.dddbrightorange : theme.colors.dddgreenaqua,
     },
   },
 }))
@@ -71,14 +71,14 @@ export const StyledFooterContainer = styled('div')(({ theme }) => ({
     gridColumn: '2 / span 2',
     gridRow: 2,
     padding: theme.metrics.lg,
-    backgroundColor: theme.colors.dddbluedark,
+    backgroundColor: theme.colors.dddpurpledark,
     textAlign: 'left',
   },
 
   '&::before': {
     gridColumn: '1 / span 1',
     gridRow: 2,
-    backgroundColor: theme.colors.dddbluedark,
+    backgroundColor: theme.colors.dddpurpledark,
     content: "' '",
   },
 }))
@@ -91,7 +91,7 @@ export const StyledTopAnchor = styled('a')(({ theme }) => ({
   justifyContent: 'center',
   alignItems: 'center',
   padding: theme.metrics.lg,
-  backgroundColor: theme.colors.dddbluedark,
+  backgroundColor: theme.colors.dddpurpledark,
   color: theme.colors.white,
   textTransform: 'uppercase',
   textDecoration: 'none',

diff --git a/components/global/Header/components/HeaderSocials.styled.tsx b/components/global/Header/components/HeaderSocials.styled.tsx
@@ -20,16 +20,16 @@ const getSocialColorFromDDDMelbColors = () => {
   const randomValue = Math.floor(Math.random() * 3)
   switch (randomValue) {
     case 0: {
-      return theme.colors.dddblue
+      return theme.colors.dddbrightorange
     }
     case 1: {
-      return theme.colors.dddpink
+      return theme.colors.dddpurple
     }
     case 2: {
-      return theme.colors.dddorange
+      return theme.colors.dddgreenaqua
     }
     default: {
-      return theme.colors.dddblue
+      return theme.colors.dddpurple
     }
   }
 }

diff --git a/components/global/Icons/DDDLogo.tsx b/components/global/Icons/DDDLogo.tsx
@@ -16,7 +16,7 @@ export const DDDLogo = () => {
       width="296"
       height="35"
       alt={`${conference.Name} logo`}
-      src="/static/images/header-logo-melb-ddd-temp24.png"
+      src="/static/images/logo-dddmelbourne-2024.png"
     />
   )
 }
diff --git a/components/global/Nav/Nav.styled.tsx b/components/global/Nav/Nav.styled.tsx
@@ -53,7 +53,7 @@ export const StyledNavLink = styled('a')<StyledNavLinkProps>(({ theme, active })
   },
 
   '&:hover': {
-    backgroundColor: active ? theme.colors.grey800 : theme.colors.dddblue,
+    backgroundColor: active ? theme.colors.grey800 : theme.colors.dddpurple,
     color: theme.colors.white,
   },
 

diff --git a/components/utils/styles/global.ts b/components/utils/styles/global.ts
@@ -23,7 +23,7 @@ export const globalCSS = css`
 
   a:focus,
   a:hover {
-    color: ${theme.colors.dddblue};
+    color: ${theme.colors.dddpurple};
   }
 
   @media (prefers-reduced-motion: reduce) {

diff --git a/components/utils/styles/theme.ts b/components/utils/styles/theme.ts
@@ -13,6 +13,11 @@ export const theme = {
     dddblue: '#4450A2',
     dddbluedark: '#6A79C6',
     dddorange: '#F8A23B',
+
+    dddbrightorange: '#FF7432',
+    dddpurple: '#AC96ED',
+    dddpurpledark: '#4B2AAD',
+    dddgreenaqua: '#5DF1C2',
     ///////////////////////////
     primary: '#008554',
     primary150: '#003924',

diff --git a/public/static/favicon.ico b/public/static/favicon.ico
diff --git a/public/static/images/logo-dddmelbourne-2024.png b/public/static/images/logo-dddmelbourne-2024.png