diff --git a/Assets/Img/Shop.png b/Assets/Img/Shop.png new file mode 100644 index 0000000..24a11b7 Binary files /dev/null and b/Assets/Img/Shop.png differ diff --git a/Pages/Bits/Navbar.php b/Pages/Bits/Navbar.php index a26ed7d..50206a7 100644 --- a/Pages/Bits/Navbar.php +++ b/Pages/Bits/Navbar.php @@ -4,6 +4,7 @@ $NavbarPages = [ "Home" => "/", "Sarahtonin" => "/Pages/Sarahtonin.html", "Garden" => "/Pages/Garden.html", + "Shop" => "/Pages/Shop.html", "Profile" => "/Pages/Profile.html" ]; diff --git a/Pages/Garden.php b/Pages/Garden.php index 300d25e..46551fb 100644 --- a/Pages/Garden.php +++ b/Pages/Garden.php @@ -3,16 +3,6 @@ $PageTitle = "Garden"; $PageSection = "Garden"; -$SubNavbarItems = [ - "Garden" => "/Pages/Garden.html", - "Shop" => "/Pages/Shop.html", - "Plots" => "#Plots", - "Seeds" => "#Seeds", - "Player" => "#Player", - "Leaderboard" => "#Leaderboard" -]; - -$SubNavbarCurrent = "Garden"; ?> @@ -23,7 +13,6 @@ $SubNavbarCurrent = "Garden"; -

Garden

@@ -142,7 +131,6 @@ $SubNavbarCurrent = "Garden";
- diff --git a/Pages/Home.php b/Pages/Home.php index 8e9a1ca..53a51a4 100644 --- a/Pages/Home.php +++ b/Pages/Home.php @@ -2,13 +2,6 @@ $PageTitle = "Home"; -$SubNavbarItems = [ - "Welcome" => "#Welcome", - "About me" => "#AboutMe", - "Credits" => "#Credits" -]; - -$SubNavbarCurrent = "Welcome"; ?> @@ -19,7 +12,6 @@ $SubNavbarCurrent = "Welcome"; -

Welcome

@@ -71,7 +63,6 @@ $SubNavbarCurrent = "Welcome";
- diff --git a/Pages/Profile.php b/Pages/Profile.php index 0b12c5d..6a2cd61 100644 --- a/Pages/Profile.php +++ b/Pages/Profile.php @@ -2,14 +2,6 @@ $PageTitle = "Profile"; -$SubNavbarItems = [ - "Player" => "#Player", - "Statistics" => "#Statistics", - "Account" => "#Account", - "Import" => "#Import" -]; - -$SubNavbarCurrent = "Player"; ?> @@ -20,7 +12,6 @@ $SubNavbarCurrent = "Player"; -

Profile

@@ -299,7 +290,6 @@ $SubNavbarCurrent = "Player";
- diff --git a/Pages/Sarahtonin.php b/Pages/Sarahtonin.php index 25dedec..e409ff1 100644 --- a/Pages/Sarahtonin.php +++ b/Pages/Sarahtonin.php @@ -2,15 +2,6 @@ $PageTitle = "Sarahtonin"; -$SubNavbarItems = [ - "About" => "#About", - "Skills" => "#Skills", - "Who I am" => "#WhoIAm", - "Socials" => "#Socials", - "Misc info" => "#MiscInfo" -]; - -$SubNavbarCurrent = "About"; ?> @@ -21,7 +12,6 @@ $SubNavbarCurrent = "About"; -

About me

@@ -91,7 +81,6 @@ $SubNavbarCurrent = "About";
- diff --git a/Pages/Shop.php b/Pages/Shop.php index 3c109f1..16eeda2 100644 --- a/Pages/Shop.php +++ b/Pages/Shop.php @@ -1,15 +1,8 @@ "/Pages/Garden.html", - "Shop" => "/Pages/Shop.html", - "Seeds" => "#Seeds" -]; - -$SubNavbarCurrent = "Shop"; ?> @@ -20,7 +13,6 @@ $SubNavbarCurrent = "Shop"; -

Garden shop

@@ -65,7 +57,6 @@ $SubNavbarCurrent = "Shop";

- diff --git a/Styles/Style.css b/Styles/Style.css index 1604272..854121f 100644 --- a/Styles/Style.css +++ b/Styles/Style.css @@ -49,7 +49,7 @@ body { padding: 2rem; display: grid; - grid-template-columns: minmax(0, 800px) auto auto; + grid-template-columns: minmax(0, 800px) auto; justify-content: center; align-items: start; gap: 1rem; @@ -270,73 +270,6 @@ select { image-rendering: auto; } -.SubNavbar { - grid-column: 3; - grid-row: 1; - - display: flex; - flex-direction: column; - gap: 0.5rem; - - padding: 0.5rem; - - position: sticky; - top: 2rem; - align-self: start; - - background-color: var(--Base); - border: 4px solid var(--Mauve); -} - -.SubNavbarLink { - display: block; - - padding: 0.65rem 0.8rem; - - color: var(--Text); - background-color: var(--Mantle); - - text-decoration: none; - white-space: nowrap; - - border: 3px solid var(--Surface2); - - box-shadow: - 3px 3px 0 - var(--Crust); -} - -.SubNavbarLink:hover { - color: var(--Sky); - background-color: var(--Surface0); - - border-color: var(--Sky); - - transform: translate( - 1px, - 1px - ); - - box-shadow: - 2px 2px 0 - var(--Crust); -} - -.SubNavbarLink:focus-visible { - outline: - 3px solid - var(--Yellow); - - outline-offset: 3px; -} - -.SubNavbarLink[aria-current] { - color: var(--Green); - background-color: var(--Surface1); - - border-color: var(--Green); -} - .GardenStatus { margin-bottom: 1.5rem; padding: 0.75rem 1rem; @@ -999,27 +932,6 @@ select { border: 3px solid var(--Surface2); } -.SubNavbarPrefix { - display: inline-block; - - min-width: 1rem; - margin-right: 0.25rem; - - color: var(--Overlay2); -} - -.SubNavbarLink:hover -.SubNavbarPrefix { - color: var(--Sky); -} - -.SubNavbarLink[aria-current="location"] -.SubNavbarPrefix, -.SubNavbarLink[aria-current="page"] -.SubNavbarPrefix { - color: var(--Green); -} - @media (max-width: 700px) { body { grid-template-columns: minmax(0, 1fr); @@ -1045,26 +957,12 @@ select { height: 3.5rem; } - .SubNavbar { - grid-column: 1; - grid-row: 2; - - flex-direction: row; - width: 100%; - - position: static; - overflow-x: auto; - } - - .SubNavbarLink { - flex: 0 0 auto; - } - .MainContainer { grid-column: 1; - grid-row: 3; + grid-row: 2; } + .GardenLayout { grid-template-columns: 1fr; }