diff --git a/src/components/ButtonSecondary.astro b/src/components/ButtonSecondary.astro new file mode 100644 index 0000000..84e1a12 --- /dev/null +++ b/src/components/ButtonSecondary.astro @@ -0,0 +1,22 @@ +--- +const {href}: { href: string } = Astro.props +--- + + + + + \ No newline at end of file diff --git a/src/components/Container.astro b/src/components/Container.astro deleted file mode 100644 index 2ecc53f..0000000 --- a/src/components/Container.astro +++ /dev/null @@ -1,14 +0,0 @@ ---- - ---- -
- -
- - \ No newline at end of file diff --git a/src/components/GlobalStyle.astro b/src/components/GlobalStyle.astro index 2151a9a..a72b927 100644 --- a/src/components/GlobalStyle.astro +++ b/src/components/GlobalStyle.astro @@ -35,6 +35,7 @@ import Theme from "./Theme.astro"; font-family : "DistantGalaxy", sans-serif; line-height : 1.2; min-height : 100vh; + color: var(--mcolor-on-surface); } p, div { @@ -56,4 +57,15 @@ import Theme from "./Theme.astro"; body, h2, h1 { margin : 0; } + + ul { + padding : 0; + } + + li { + list-style : none; + } + a{ + display: block; + } \ No newline at end of file diff --git a/src/components/Nav.astro b/src/components/Nav.astro index c790ad8..1743e88 100644 --- a/src/components/Nav.astro +++ b/src/components/Nav.astro @@ -1,13 +1,27 @@ --- - +import ButtonSecondary from "./ButtonSecondary.astro"; --- \ No newline at end of file diff --git a/src/components/Theme.astro b/src/components/Theme.astro index 8d9e45e..a3093c3 100644 --- a/src/components/Theme.astro +++ b/src/components/Theme.astro @@ -5,14 +5,14 @@ const colors = { "onPrimary": "#FFFFFF", "primaryContainer": "#E2E993", "onPrimaryContainer": "#1B1D00", - "secondary": "#5E6044", + "secondary": "#5F6044", "onSecondary": "#FFFFFF", "secondaryContainer": "#E4E5C1", "onSecondaryContainer": "#1B1D07", - "tertiary": "#815512", + "tertiary": "#86521A", "onTertiary": "#FFFFFF", - "tertiaryContainer": "#FFDDB6", - "onTertiaryContainer": "#2A1800", + "tertiaryContainer": "#FFDCBF", + "onTertiaryContainer": "#2D1600", "error": "#BA1A1A", "onError": "#FFFFFF", "errorContainer": "#FFDAD6", @@ -29,78 +29,78 @@ const colors = { "scrim": "#000000", "inverseSurface": "#313128", "inverseOnSurface": "#F3F1E4", - "inversePrimary": "#C5CC7A", + "inversePrimary": "#C6CC7A", "primaryFixed": "#E2E993", "onPrimaryFixed": "#1B1D00", - "primaryFixedDim": "#C5CC7A", - "onPrimaryFixedVariant": "#454B03", + "primaryFixedDim": "#C6CC7A", + "onPrimaryFixedVariant": "#454A03", "secondaryFixed": "#E4E5C1", "onSecondaryFixed": "#1B1D07", "secondaryFixedDim": "#C8C9A6", "onSecondaryFixedVariant": "#47492E", - "tertiaryFixed": "#FFDDB6", - "onTertiaryFixed": "#2A1800", - "tertiaryFixedDim": "#F6BC70", - "onTertiaryFixedVariant": "#643F00", + "tertiaryFixed": "#FFDCBF", + "onTertiaryFixed": "#2D1600", + "tertiaryFixedDim": "#FEB876", + "onTertiaryFixedVariant": "#6A3B02", "surfaceDim": "#DCDACE", "surfaceBright": "#FCFAEC", "surfaceContainerLowest": "#FFFFFF", "surfaceContainerLow": "#F6F4E7", - "surfaceContainer": "#F0EEE1", + "surfaceContainer": "#F1EEE1", "surfaceContainerHigh": "#EBE8DB", "surfaceContainerHighest": "#E5E3D6" } as const; --- \ No newline at end of file