diff --git a/.gitignore b/.gitignore index 75cf931..0a6afb5 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ json_schemas/interfaces/ .idea .iml .npmrc +.DS_STORE \ No newline at end of file diff --git a/src/components/commun/jumbo/jumbo.scss b/src/components/commun/jumbo/jumbo.scss index ad0b482..53be479 100644 --- a/src/components/commun/jumbo/jumbo.scss +++ b/src/components/commun/jumbo/jumbo.scss @@ -4,10 +4,6 @@ font-size: 3rem; background-size: contain; background-repeat: no-repeat; - display: flex; - flex-direction: column; - justify-content: center; - align-items: center; background: transparent; position: relative; // background: var(--primary); diff --git a/src/components/home/home.scss b/src/components/home/home.scss index 2334ed5..c174852 100644 --- a/src/components/home/home.scss +++ b/src/components/home/home.scss @@ -1,11 +1,12 @@ .jumbo { + .logo-jumbo-home { width: 100%; height: 50%; flex-grow: 1; img { - height: 100%; - width: 70%; + height: auto; + width: 100%; margin: auto; display: block; } diff --git a/src/components/home/jumbo.tsx b/src/components/home/jumbo.tsx index 8719fb0..059e487 100644 --- a/src/components/home/jumbo.tsx +++ b/src/components/home/jumbo.tsx @@ -14,18 +14,17 @@ export const HomeJumbo = () => {
logo
- - {t("come-back")} - - - {t("date")} - +
+ + {t("come-back")} + + + {t("date")} + {/* { */} +
+ {/* setModalOpen(false)} className={"modal-apps"}> diff --git a/src/layout/index.tsx b/src/layout/index.tsx index 2ea331d..903a66f 100644 --- a/src/layout/index.tsx +++ b/src/layout/index.tsx @@ -44,7 +44,7 @@ const Layout: React.FC = ({ children }) => { @@ -74,8 +74,8 @@ const Topbar: React.FC<{ className="logo-top-bar" src={logo} alt="Logo Devfest" - height="50" - width="150" + height="64" + width="226" /> diff --git a/src/layout/theme.scss b/src/layout/theme.scss index bd885d5..0eb1573 100644 --- a/src/layout/theme.scss +++ b/src/layout/theme.scss @@ -5,11 +5,11 @@ } body { - --primary: #1a213d; - --primary-dark: #0e1324; + --primary: #000000; + --primary-dark: #000000; --primary-light: #3577bc; - --secondary-light: #e9764f; - --secondary: #d14f34; + --secondary-light: #ba433f; + --secondary: #ff4e53; --tertiary: #fcefb2; --tertiary-dark: #f9e075; @@ -17,54 +17,54 @@ body { &:has(.jumbo), &:has(.hero) { - &:before { - content: ""; - position: absolute; - z-index: -1000; - top: 0; - width: 100%; - height: 100%; - background: linear-gradient( - 310deg, - transparent 75%, - rgba(255, 255, 255, 0.9) 79.5%, - rgba(255, 255, 255, 0.9) 80.5%, - transparent 85% - ); - @media (max-width: 960px) { - background: linear-gradient( - 300deg, - transparent 75%, - rgba(255, 255, 255, 0.9) 79.5%, - rgba(255, 255, 255, 0.9) 80.5%, - transparent 85% - ); - } - } - &:after { - content: ""; - z-index: -1000; - position: absolute; - top: 0; - width: 100%; - height: 100%; - background: linear-gradient( - 50deg, - transparent 75%, - rgba(255, 255, 255, 0.9) 79.5%, - rgba(255, 255, 255, 0.9) 80.5%, - transparent 85% - ); - @media (max-width: 960px) { - background: linear-gradient( - 60deg, - transparent 75%, - rgba(255, 255, 255, 0.9) 79.5%, - rgba(255, 255, 255, 0.9) 80.5%, - transparent 85% - ); - } - } + // &:before { + // content: ""; + // position: absolute; + // z-index: -1000; + // top: 0; + // width: 100%; + // height: 100%; + // background: linear-gradient( + // 310deg, + // transparent 75%, + // rgba(255, 255, 255, 0.9) 79.5%, + // rgba(255, 255, 255, 0.9) 80.5%, + // transparent 85% + // ); + // @media (max-width: 960px) { + // background: linear-gradient( + // 300deg, + // transparent 75%, + // rgba(255, 255, 255, 0.9) 79.5%, + // rgba(255, 255, 255, 0.9) 80.5%, + // transparent 85% + // ); + // } + // } + // &:after { + // content: ""; + // z-index: -1000; + // position: absolute; + // top: 0; + // width: 100%; + // height: 100%; + // background: linear-gradient( + // 50deg, + // transparent 75%, + // rgba(255, 255, 255, 0.9) 79.5%, + // rgba(255, 255, 255, 0.9) 80.5%, + // transparent 85% + // ); + // @media (max-width: 960px) { + // background: linear-gradient( + // 60deg, + // transparent 75%, + // rgba(255, 255, 255, 0.9) 79.5%, + // rgba(255, 255, 255, 0.9) 80.5%, + // transparent 85% + // ); + // } + // } } } @@ -89,30 +89,30 @@ a.md-link { } } -.bande-film-top { - &::before { - background-image: url("/images/bande-film.svg"); - content: ""; - height: 50px; - width: 100%; - background-repeat: repeat-x; - position: relative; - } -} +// .bande-film-top { +// &::before { +// background-image: url("/images/bande-film.svg"); +// content: ""; +// height: 50px; +// width: 100%; +// background-repeat: repeat-x; +// position: relative; +// } +// } -.bande-film-bottom { - &::after { - background-image: url("/images/bande-film.svg"); - content: ""; - height: 50px; - width: 100%; - bottom: -50px; - background-repeat: repeat-x; - position: relative; - } +// .bande-film-bottom { +// &::after { +// background-image: url("/images/bande-film.svg"); +// content: ""; +// height: 50px; +// width: 100%; +// bottom: -50px; +// background-repeat: repeat-x; +// position: relative; +// } - &.jumbo { - height: calc(100vh - 15px); - padding-bottom: 50px; - } -} +// &.jumbo { +// height: calc(100vh - 15px); +// padding-bottom: 50px; +// } +// } diff --git a/src/layout/theme.ts b/src/layout/theme.ts index cdc3db5..da10ad1 100644 --- a/src/layout/theme.ts +++ b/src/layout/theme.ts @@ -1,9 +1,9 @@ import { createTheme } from "@mui/material"; import "./theme.scss"; -const primary = "#1a213d"; +const primary = "#000000"; // const primary = "#d14f34"; -const secondary = "#d14f34"; +const secondary = "#ff4e53"; // const primary = "#c14d32"; // const secondary = "#36666a"; // A custom theme for this app @@ -47,6 +47,14 @@ const theme = createTheme({ }, } }, + MuiAppBar: { + styleOverrides: { + root: { + backgroundColor: "#000000", + borderBottom: "2px solid " + secondary, + } + }, + }, MuiButton: { styleOverrides: { containedSecondary: { diff --git a/static/images/jumbo-image.jpg b/static/images/jumbo-image.jpg new file mode 100644 index 0000000..ac1d691 Binary files /dev/null and b/static/images/jumbo-image.jpg differ diff --git a/static/images/logo-long-bleu.svg b/static/images/logo-long-bleu-old.svg similarity index 100% rename from static/images/logo-long-bleu.svg rename to static/images/logo-long-bleu-old.svg diff --git a/static/images/logo-long.png b/static/images/logo-long.png new file mode 100644 index 0000000..5a2012e Binary files /dev/null and b/static/images/logo-long.png differ diff --git a/static/images/logo_transparent.svg b/static/images/logo_transparent-old.svg similarity index 100% rename from static/images/logo_transparent.svg rename to static/images/logo_transparent-old.svg