diff --git a/front/src/App.svelte b/front/src/App.svelte index ced7813..7879afe 100644 --- a/front/src/App.svelte +++ b/front/src/App.svelte @@ -7,6 +7,7 @@ let oldLocation = undefined; let showNavBar = false; + let fullWidth = false; let scrollY = 0; function routeLoading(event) { @@ -14,6 +15,7 @@ return; // not an actual change } showNavBar = event.detail.userData.showNavBar; + fullWidth = event.detail.userData.fullWidth; oldLocation = event.detail.location; } @@ -28,9 +30,14 @@ {#if showNavBar } - 0} /> + 0} + /> {/if} -
+
diff --git a/front/src/pages/PageMenu.svelte b/front/src/pages/PageMenu.svelte index 2911364..5de5ffb 100644 --- a/front/src/pages/PageMenu.svelte +++ b/front/src/pages/PageMenu.svelte @@ -1,5 +1,7 @@ -

Menu

- -
+ \ No newline at end of file + + .menu-filter-header { + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: center; + } + diff --git a/front/src/routes.js b/front/src/routes.js index 7a37fbf..f5d756c 100644 --- a/front/src/routes.js +++ b/front/src/routes.js @@ -7,36 +7,36 @@ const routes = { asyncComponent: () => import("%/pages/PageIndex.svelte"), loadingComponent: PageLoading, conditions: [], - userData: { showNavBar: true }, + userData: { showNavBar: true, fullWidth: false, }, }), "/menu": wrap({ asyncComponent: () => import("%/pages/PageMenu.svelte"), loadingComponent: PageLoading, conditions: [], - userData: { showNavBar: true }, + userData: { showNavBar: true, fullWidth: true, }, }), "/contact": wrap({ asyncComponent: () => import("%/pages/PageContact.svelte"), loadingComponent: PageLoading, conditions: [], - userData: { showNavBar: true }, + userData: { showNavBar: true, fullWidth: false, }, }), "/about": wrap({ component: PageLoading, loadingComponent: PageLoading, conditions: [], - userData: { showNavBar: true }, + userData: { showNavBar: true, fullWidth: false, }, }), "/cart": wrap({ asyncComponent: () => import("%/pages/PageCart.svelte"), loadingComponent: PageLoading, conditions: [], - userData: { showNavBar: true }, + userData: { showNavBar: true, fullWidth: false, }, }), '*': wrap({ component: Page404, conditions: [], - userData: { showNavBar: false }, + userData: { showNavBar: false, fullWidth: false, }, }) } diff --git a/front/src/styles/_loading_bar.scss b/front/src/styles/_loading_bar.scss index 8a84c7b..c7d57a3 100644 --- a/front/src/styles/_loading_bar.scss +++ b/front/src/styles/_loading_bar.scss @@ -15,7 +15,6 @@ .bar { position: absolute; - background-color: $color-primary; transition: transform .2s linear; left: 0; top: 0; @@ -24,10 +23,12 @@ width: 100%; &.bar-1 { + background-color: $color-dark; animation: growBar1 2.5s infinite, moveBar1 2.5s infinite; } &.bar-2 { + background-color: $color-primary; animation: growBar2 2.5s infinite, moveBar2 2.5s infinite; } } diff --git a/front/src/styles/_reset.scss b/front/src/styles/_reset.scss index 9b9e9d4..1565c2c 100644 --- a/front/src/styles/_reset.scss +++ b/front/src/styles/_reset.scss @@ -13,6 +13,7 @@ body, #app { body { background-color: $color-background; + color: $color-on-background; } main { @@ -29,4 +30,7 @@ main { &.nav-space { margin-top: $sizing-navigation-height; } -} \ No newline at end of file + &.full-width { + max-width: $sizing-full-width; + } +} diff --git a/front/src/styles/main.scss b/front/src/styles/main.scss index 3e38298..c0fd3da 100644 --- a/front/src/styles/main.scss +++ b/front/src/styles/main.scss @@ -6,7 +6,7 @@ $color-on-dark: #e1dcd3; $color-light: #fffbf4; $color-on-light: #33251a; $color-primary: #6A9343; -$color-on-primary: #ccc2ae; +$color-on-primary: #fffbf4; $color-vegan: #75a446; $color-fish: #487fa6; @@ -20,6 +20,7 @@ $border-radius-circle: 99999px; // SIZING $sizing-default-width: 1000px; +$sizing-full-width: 1200px; $sizing-navigation-height: 55px; // PADDING/MARGIN