From 66642c65c27aa137e75465e4b013b5822abe0745 Mon Sep 17 00:00:00 2001 From: Ash Date: Wed, 21 Feb 2024 15:22:07 +0000 Subject: [PATCH] Dev (#19) * updated legal Signed-off-by: Ash Entwisle * updated legal Signed-off-by: Ash Entwisle * updated links to point to cdn Signed-off-by: Ash Entwisle * cleaned up files Signed-off-by: Ash Entwisle * moved contact to its own page Signed-off-by: Ash Entwisle * misc update Signed-off-by: Ash Entwisle * changed all links to links.hullcss.org/ Signed-off-by: Ash Entwisle * updated link redirects Signed-off-by: Ash Entwisle * updated foooter link Signed-off-by: Ash Entwisle --------- Signed-off-by: Ash Entwisle --- src/components/About.astro | 0 src/components/Header.astro | 29 ---------------- src/components/compound/Exec.astro | 2 +- src/components/compound/Footer.astro | 27 +++++++++------ src/components/compound/Header.astro | 4 +-- src/env.d.ts | 1 + src/pages/contact.astro | 5 +++ src/pages/index.astro | 16 +-------- src/pages/legal.mdx | 10 ------ src/pages/links/[link].astro | 5 +++ src/pages/links/index.astro | 3 ++ src/styles/base.scss | 2 +- src/styles/colours.scss | 50 ++++++++++++++-------------- src/styles/pages/index.scss | 4 +-- src/types/icon.ts | 2 +- 15 files changed, 63 insertions(+), 97 deletions(-) delete mode 100644 src/components/About.astro delete mode 100644 src/components/Header.astro create mode 100644 src/pages/contact.astro create mode 100644 src/pages/links/[link].astro create mode 100644 src/pages/links/index.astro diff --git a/src/components/About.astro b/src/components/About.astro deleted file mode 100644 index e69de29..0000000 diff --git a/src/components/Header.astro b/src/components/Header.astro deleted file mode 100644 index 27bdd36..0000000 --- a/src/components/Header.astro +++ /dev/null @@ -1,29 +0,0 @@ ---- - ---- - -
-
- - HullCSS - HullCSS - -
-
-
- about -
-
- blog -
-
- contact -
-
- discord -
-
- github -
-
-
diff --git a/src/components/compound/Exec.astro b/src/components/compound/Exec.astro index 2fb5d09..203a88a 100644 --- a/src/components/compound/Exec.astro +++ b/src/components/compound/Exec.astro @@ -9,7 +9,7 @@ export interface Exec { const { title, name, pronouns, gh, img } = Astro.props; -const img_url = `/assets/exec/${img}`; +const img_url = `https://hullcss-cdn.pages.dev/assets/exec/${img}`; const url = `https://github.com/${gh}`; --- diff --git a/src/components/compound/Footer.astro b/src/components/compound/Footer.astro index d44e0ed..394b2f9 100644 --- a/src/components/compound/Footer.astro +++ b/src/components/compound/Footer.astro @@ -17,7 +17,7 @@ import Copywright from "./Copywright.astro" href: "/" }, { name: "About", - href: "/about" + href: "/#about" }, { name: "Contact", href: "/contact" @@ -30,8 +30,10 @@ import Copywright from "./Copywright.astro" diff --git a/src/components/compound/Header.astro b/src/components/compound/Header.astro index ae0f92f..9578f3d 100644 --- a/src/components/compound/Header.astro +++ b/src/components/compound/Header.astro @@ -23,8 +23,8 @@ const props = Astro.props;
- - + +
\ No newline at end of file diff --git a/src/env.d.ts b/src/env.d.ts index f964fe0..acef35f 100644 --- a/src/env.d.ts +++ b/src/env.d.ts @@ -1 +1,2 @@ +/// /// diff --git a/src/pages/contact.astro b/src/pages/contact.astro new file mode 100644 index 0000000..de55987 --- /dev/null +++ b/src/pages/contact.astro @@ -0,0 +1,5 @@ +--- +import Todo from "../layouts/Todo.astro"; +--- + + diff --git a/src/pages/index.astro b/src/pages/index.astro index 9991369..2e26e98 100644 --- a/src/pages/index.astro +++ b/src/pages/index.astro @@ -2,9 +2,6 @@ import Boilerplate from "../layouts/Boilerplate.astro"; import Exec from "../components/compound/Exec.astro"; -import EmailForm from "../components/compound/EmailForm.astro"; - -import Center from "../components/base/Center.astro"; import TextTyper from "../components/dynamic/TextTyper.svelte"; @@ -43,7 +40,7 @@ const keywords = [ name="Zoe" pronouns="she/her" gh="zoeelen" - img="zoe.png" + img="zoe.webp" > Hi! I'm Zoe, a 2nd year Computer Science student and HullCSS's 23/24 committee President. My main interest academically is Artificial Intelligence, particularly NLP. @@ -108,17 +105,6 @@ const keywords = [

Recent Events:

- -
-

Contact Us

- -

- Wether you are a member, a student, or a company, we would love to hear from you. - You can reach us via email hullcss@hull.ac.uk - our instagram or our discord. - -

-
diff --git a/src/pages/legal.mdx b/src/pages/legal.mdx index bb3d43d..ca07c90 100644 --- a/src/pages/legal.mdx +++ b/src/pages/legal.mdx @@ -40,16 +40,6 @@ and you should independently verify any of the information on our site before re We accept no liability and offer no warranties in relation to this site and the content on it, to the fullest extent such liability can be excluded by law. -## Intellectual Property - -### Media - -All content on this site (images, blog posts and all other forms of media), unless otherwise stated, is owned by HullCSS and protected under [CC By-NC-SA 4.0](https://creativecommons.org/licenses/by-nc-sa/4.0/). - -### Source Code - -The source code for this site is licensed under the [GNU Affero General Public License v3.0](https://www.gnu.org/licenses/agpl-3.0.html). - ## Brand ### Logo diff --git a/src/pages/links/[link].astro b/src/pages/links/[link].astro new file mode 100644 index 0000000..34784e2 --- /dev/null +++ b/src/pages/links/[link].astro @@ -0,0 +1,5 @@ +--- +const { link } = Astro.params; + +return Astro.redirect(`https://links.hullcss.org/${link}`) +--- \ No newline at end of file diff --git a/src/pages/links/index.astro b/src/pages/links/index.astro new file mode 100644 index 0000000..9751eaa --- /dev/null +++ b/src/pages/links/index.astro @@ -0,0 +1,3 @@ +--- +return Astro.redirect("https://links.hullcss.org") +--- \ No newline at end of file diff --git a/src/styles/base.scss b/src/styles/base.scss index 857c380..3f5a4e6 100644 --- a/src/styles/base.scss +++ b/src/styles/base.scss @@ -65,7 +65,7 @@ a { text-decoration-style: solid; transition: text-decoration-style 0.1s; - color: $col-light-5; + color: $col-light-4; transition: color 0.1s; } diff --git a/src/styles/colours.scss b/src/styles/colours.scss index 0ab2ba9..1cfe58b 100644 --- a/src/styles/colours.scss +++ b/src/styles/colours.scss @@ -9,34 +9,34 @@ $col-mono-7: hsl(220, 13%, 18%); $col-mono-8: hsl(222, 15%, 13%); // Lighter Colours -$col-light-1: hsl( 0, 41%, 64%); -$col-light-2: hsl( 33, 34%, 63%); -$col-light-3: hsl( 52, 38%, 67%); -$col-light-4: hsl(120, 20%, 66%); -$col-light-5: hsl(204, 49%, 68%); -$col-light-6: hsl(222, 67%, 70%); -$col-light-7: hsl(238, 43%, 66%); -$col-light-8: hsl(270, 42%, 64%); +$col-light-1: hsl(0, 80%, 80%); +$col-light-2: hsl(13, 77%, 76%); +$col-light-3: hsl(34, 65%, 73%); +$col-light-4: hsl(96, 21%, 72%); +$col-light-5: hsl(187, 41%, 65%); +$col-light-6: hsl(207, 50%, 68%); +$col-light-7: hsl(233, 45%, 71%); +$col-light-8: hsl(286, 48%, 72%); // Normal Colours -$col-normal-1: hsl( 0, 40%, 43%); -$col-normal-2: hsl( 33, 38%, 46%); -$col-normal-3: hsl( 52, 50%, 47%); -$col-normal-4: hsl(120, 36%, 46%); -$col-normal-5: hsl(204, 100%, 45%); -$col-normal-6: hsl(221, 34%, 39%); -$col-normal-7: hsl(231, 44%, 34%); -$col-normal-8: hsl(270, 41%, 34%); +$col-normal-1: hsl(0, 79%, 64%); +$col-normal-2: hsl(13, 69%, 64%); +$col-normal-3: hsl(34, 72%, 64%); +$col-normal-4: hsl(96, 40%, 65%); +$col-normal-5: hsl(187, 50%, 47%); +$col-normal-6: hsl(187, 50%, 47%); +$col-normal-7: hsl(233, 60%, 67%); +$col-normal-8: hsl(286, 57%, 65%); // Darker Colours -$col-dark-1: hsl( 0, 53%, 30%); -$col-dark-2: hsl( 33, 56%, 30%); -$col-dark-3: hsl( 52, 37%, 33%); -$col-dark-4: hsl(120, 37%, 35%); -$col-dark-5: hsl(204, 60%, 32%); -$col-dark-6: hsl(222, 49%, 31%); -$col-dark-7: hsl(230, 36%, 24%); -$col-dark-8: hsl(270, 36%, 26%); +$col-dark-1: hsl(0, 87%, 59%); +$col-dark-2: hsl(13, 83%, 58%); +$col-dark-3: hsl(34, 82%, 59%); +$col-dark-4: hsl(96, 38%, 49%); +$col-dark-5: hsl(187, 63%, 38%); +$col-dark-6: hsl(207, 87%, 48%); +$col-dark-7: hsl(233, 74%, 59%); +$col-dark-8: hsl(286, 67%, 58%); // pre-defined colours for UI, DARK MODE @@ -46,7 +46,7 @@ $col-fg-muted: $col-mono-2; $col-fg-subtle: $col-mono-2; $col-fg-onemph: $col-mono-1; -$col-fg-accent: $col-light-4; +$col-fg-accent: $col-normal-4; $col-fg-success: $col-normal-4; $col-fg-attention: $col-normal-2; $col-fg-danger: $col-normal-1; diff --git a/src/styles/pages/index.scss b/src/styles/pages/index.scss index 4be21ba..f16a1c4 100644 --- a/src/styles/pages/index.scss +++ b/src/styles/pages/index.scss @@ -12,8 +12,8 @@ main { font-weight: 700; } .about { - padding-top: 200px; - padding-bottom: 200px; + padding-top: 125px; + padding-bottom: 150px; padding-left: 5%; padding-right: 5%; diff --git a/src/types/icon.ts b/src/types/icon.ts index f33ea0b..372c653 100644 --- a/src/types/icon.ts +++ b/src/types/icon.ts @@ -1,5 +1,5 @@ /** - * Represents an icon used in LazyLink. + * Represents an icon */ export interface IIcon { /**