From 2fab4bf70bec995f80c840d1c68daa64b376aa82 Mon Sep 17 00:00:00 2001 From: k Date: Sat, 2 Aug 2025 13:50:56 +0200 Subject: [PATCH] Refactor styles and imports for consistency and maintainability: - **CSS restructuring**: Moved `styles` folder into `src` for better organization. - **Updated imports**: Adjusted component CSS imports to reflect new paths. - **Component tweaks**: - Increased HoverCard width from `350px` to `400px` for better visual balance. - Adjusted Footer layout: reorganized copyright and added email link. - Modified Drinks circle dimensions (from `6em` to `9em`) for improved design. - **Footer styles**: Changed copyright section's layout with top spacing and border adjustments. --- src/components/Contact.astro | 2 +- src/components/Drinks.astro | 2 +- src/components/EventsGrid.astro | 2 +- src/components/Footer.astro | 16 +++++++--------- src/components/Header.astro | 2 +- src/components/Hero.astro | 2 +- src/components/HoverCard.astro | 7 ++----- src/components/ImageCarousel.astro | 2 +- src/components/Layout.astro | 6 +++--- src/components/Welcome.astro | 2 +- .../styles}/components/ContactForm.css | 0 {styles => src/styles}/components/Drinks.css | 4 ++-- {styles => src/styles}/components/EventsGrid.css | 0 {styles => src/styles}/components/Footer.css | 6 +++--- {styles => src/styles}/components/Header.css | 0 {styles => src/styles}/components/Hero.css | 0 {styles => src/styles}/components/HoverCard.css | 2 +- .../styles}/components/ImageCarousel.css | 0 {styles => src/styles}/components/Layout.css | 0 {styles => src/styles}/components/Welcome.css | 0 {styles => src/styles}/index.css | 0 {styles => src/styles}/variables.css | 0 22 files changed, 25 insertions(+), 30 deletions(-) rename {styles => src/styles}/components/ContactForm.css (100%) rename {styles => src/styles}/components/Drinks.css (99%) rename {styles => src/styles}/components/EventsGrid.css (100%) rename {styles => src/styles}/components/Footer.css (89%) rename {styles => src/styles}/components/Header.css (100%) rename {styles => src/styles}/components/Hero.css (100%) rename {styles => src/styles}/components/HoverCard.css (99%) rename {styles => src/styles}/components/ImageCarousel.css (100%) rename {styles => src/styles}/components/Layout.css (100%) rename {styles => src/styles}/components/Welcome.css (100%) rename {styles => src/styles}/index.css (100%) rename {styles => src/styles}/variables.css (100%) diff --git a/src/components/Contact.astro b/src/components/Contact.astro index 284ab59..06c5db7 100644 --- a/src/components/Contact.astro +++ b/src/components/Contact.astro @@ -1,6 +1,6 @@ --- import Layout from "../components/Layout.astro"; -import "../../styles/components/ContactForm.css"; +import "../styles/components/ContactForm.css"; --- diff --git a/src/components/Drinks.astro b/src/components/Drinks.astro index 4c20808..5d4da0f 100644 --- a/src/components/Drinks.astro +++ b/src/components/Drinks.astro @@ -1,5 +1,5 @@ --- -import "../../styles/components/Drinks.css" +import "../styles/components/Drinks.css" const { id } = Astro.props; --- diff --git a/src/components/EventsGrid.astro b/src/components/EventsGrid.astro index 8070ba8..326c0bd 100644 --- a/src/components/EventsGrid.astro +++ b/src/components/EventsGrid.astro @@ -13,7 +13,7 @@ const { events = [], id }: { events?: Event[]; id?: string } = Astro.props as { events?: Event[]; id?: string; }; -import "../../styles/components/EventsGrid.css"; +import "../styles/components/EventsGrid.css"; ---

Events

diff --git a/src/components/Footer.astro b/src/components/Footer.astro index 6303767..adf8106 100644 --- a/src/components/Footer.astro +++ b/src/components/Footer.astro @@ -1,14 +1,12 @@ --- // src/components/Footer.astro -import "/styles/components/Footer.css" +import "../styles/components/Footer.css" const currentYear = new Date().getFullYear(); ---
diff --git a/src/components/Header.astro b/src/components/Header.astro index 8816c12..fbf88d0 100644 --- a/src/components/Header.astro +++ b/src/components/Header.astro @@ -1,7 +1,7 @@ --- // src/components/Header.astro const { url } = Astro; -import "../../styles/components/Header.css"; +import "../styles/components/Header.css"; ---
diff --git a/src/components/Hero.astro b/src/components/Hero.astro index 5035d46..cc431ec 100644 --- a/src/components/Hero.astro +++ b/src/components/Hero.astro @@ -1,6 +1,6 @@ --- // src/components/Hero.astro -import "../../styles/components/Hero.css" +import "../styles/components/Hero.css" const { id } = Astro.props; --- diff --git a/src/components/HoverCard.astro b/src/components/HoverCard.astro index 467d542..3e8da47 100644 --- a/src/components/HoverCard.astro +++ b/src/components/HoverCard.astro @@ -1,7 +1,7 @@ --- // src/components/HoverCard.astro -import "../../styles/components/HoverCard.css"; -const { title, description, image = "", date } = Astro.props; +import "../styles/components/HoverCard.css"; +const {title, description, image = ""} = Astro.props; ---
@@ -9,9 +9,6 @@ const { title, description, image = "", date } = Astro.props; {title} -

-

{date}

-

diff --git a/src/components/ImageCarousel.astro b/src/components/ImageCarousel.astro index 24312de..e1f994e 100644 --- a/src/components/ImageCarousel.astro +++ b/src/components/ImageCarousel.astro @@ -1,6 +1,6 @@ --- // src/components/ImageCarousel.astro -import "../../styles/components/ImageCarousel.css"; +import "../styles/components/ImageCarousel.css"; interface Image { src: string; diff --git a/src/components/Layout.astro b/src/components/Layout.astro index d7c95dd..9beda9e 100644 --- a/src/components/Layout.astro +++ b/src/components/Layout.astro @@ -2,9 +2,9 @@ // src/components/Layout.astro import Header from "./Header.astro"; import Footer from "./Footer.astro"; -import "../../styles/components/Layout.css" -import "../../styles/variables.css" -import "../../styles/index.css" +import "../styles/components/Layout.css" +import "../styles/variables.css" +import "../styles/index.css" --- diff --git a/src/components/Welcome.astro b/src/components/Welcome.astro index 0c58c41..0c82018 100644 --- a/src/components/Welcome.astro +++ b/src/components/Welcome.astro @@ -1,6 +1,6 @@ --- // src/components/Welcome.astro -import "../../styles/components/Welcome.css" +import "../styles/components/Welcome.css" const { id } = Astro.props; --- diff --git a/styles/components/ContactForm.css b/src/styles/components/ContactForm.css similarity index 100% rename from styles/components/ContactForm.css rename to src/styles/components/ContactForm.css diff --git a/styles/components/Drinks.css b/src/styles/components/Drinks.css similarity index 99% rename from styles/components/Drinks.css rename to src/styles/components/Drinks.css index 40dc813..42ad52e 100644 --- a/styles/components/Drinks.css +++ b/src/styles/components/Drinks.css @@ -81,8 +81,8 @@ } .circle { - height: 6em; - width: 6em; + height: 9em; + width: 9em; border: 2px solid var(--color-accent-beige); border-radius: 50%; margin: 0.5rem; diff --git a/styles/components/EventsGrid.css b/src/styles/components/EventsGrid.css similarity index 100% rename from styles/components/EventsGrid.css rename to src/styles/components/EventsGrid.css diff --git a/styles/components/Footer.css b/src/styles/components/Footer.css similarity index 89% rename from styles/components/Footer.css rename to src/styles/components/Footer.css index 96073ec..e40d77e 100644 --- a/styles/components/Footer.css +++ b/src/styles/components/Footer.css @@ -13,9 +13,9 @@ .copyright { text-align: center; - margin-bottom: 2rem; - padding-bottom: 1rem; - border-bottom: 1px solid rgba(255, 255, 255, 0.1); + margin-top: 2rem; + padding-top: 1rem; + border-top: 1px solid rgba(255, 255, 255, 0.1); } .footer-sections { diff --git a/styles/components/Header.css b/src/styles/components/Header.css similarity index 100% rename from styles/components/Header.css rename to src/styles/components/Header.css diff --git a/styles/components/Hero.css b/src/styles/components/Hero.css similarity index 100% rename from styles/components/Hero.css rename to src/styles/components/Hero.css diff --git a/styles/components/HoverCard.css b/src/styles/components/HoverCard.css similarity index 99% rename from styles/components/HoverCard.css rename to src/styles/components/HoverCard.css index 1979ee2..8497080 100644 --- a/styles/components/HoverCard.css +++ b/src/styles/components/HoverCard.css @@ -1,6 +1,6 @@ .hover-card { position: relative; - width: 350px; + width: 400px; height: 400px; border-radius: var(--border-radius); background-color: var(--color-accent-green); diff --git a/styles/components/ImageCarousel.css b/src/styles/components/ImageCarousel.css similarity index 100% rename from styles/components/ImageCarousel.css rename to src/styles/components/ImageCarousel.css diff --git a/styles/components/Layout.css b/src/styles/components/Layout.css similarity index 100% rename from styles/components/Layout.css rename to src/styles/components/Layout.css diff --git a/styles/components/Welcome.css b/src/styles/components/Welcome.css similarity index 100% rename from styles/components/Welcome.css rename to src/styles/components/Welcome.css diff --git a/styles/index.css b/src/styles/index.css similarity index 100% rename from styles/index.css rename to src/styles/index.css diff --git a/styles/variables.css b/src/styles/variables.css similarity index 100% rename from styles/variables.css rename to src/styles/variables.css