From 507523aaabfcd618111f3a11aaf35e29049f6103 Mon Sep 17 00:00:00 2001 From: Foster Hangdaan Date: Fri, 4 Aug 2023 18:16:39 -0400 Subject: [PATCH] Use icons from static file server The TSX icon components have been deleted since they will no longer be used. --- _components/footer.tsx | 28 +++++++++++++++++-------- _components/icons/ChartAreaFilled.tsx | 9 -------- _components/icons/ChartBar.tsx | 11 ---------- _components/icons/Diamonds.tsx | 8 ------- _components/icons/FileCV.tsx | 11 ---------- _components/icons/Forgejo.tsx | 10 --------- _components/icons/GPS.tsx | 9 -------- _components/icons/Heart.tsx | 8 ------- _components/icons/HeartHandshake.tsx | 11 ---------- _components/icons/Home.tsx | 10 --------- _components/icons/Key.tsx | 9 -------- _components/icons/Mail.tsx | 9 -------- _components/icons/Mastodon.tsx | 10 --------- _components/icons/README.org | 3 --- _components/icons/School.tsx | 9 -------- _components/icons/User.tsx | 9 -------- _components/navbar.tsx | 30 +++++++++++++++++++++++---- _components/separator.tsx | 10 +++++++-- _includes/styles/base.scss | 5 +++++ 19 files changed, 58 insertions(+), 151 deletions(-) delete mode 100644 _components/icons/ChartAreaFilled.tsx delete mode 100644 _components/icons/ChartBar.tsx delete mode 100644 _components/icons/Diamonds.tsx delete mode 100644 _components/icons/FileCV.tsx delete mode 100644 _components/icons/Forgejo.tsx delete mode 100644 _components/icons/GPS.tsx delete mode 100644 _components/icons/Heart.tsx delete mode 100644 _components/icons/HeartHandshake.tsx delete mode 100644 _components/icons/Home.tsx delete mode 100644 _components/icons/Key.tsx delete mode 100644 _components/icons/Mail.tsx delete mode 100644 _components/icons/Mastodon.tsx delete mode 100644 _components/icons/README.org delete mode 100644 _components/icons/School.tsx delete mode 100644 _components/icons/User.tsx diff --git a/_components/footer.tsx b/_components/footer.tsx index b9d95f8..9e600b5 100644 --- a/_components/footer.tsx +++ b/_components/footer.tsx @@ -1,26 +1,36 @@ export default function({ comp }) { - const { - Forgejo: ForgejoIcon, - Mastodon: MastodonIcon, - Mail: MailIcon, - } = comp.icons; + const iconStyle = { + filter: "var(--filter-fg)", + }; return ( ); } diff --git a/_components/icons/ChartAreaFilled.tsx b/_components/icons/ChartAreaFilled.tsx deleted file mode 100644 index 83c2744..0000000 --- a/_components/icons/ChartAreaFilled.tsx +++ /dev/null @@ -1,9 +0,0 @@ -export default function() { - return ( - - - - - - ); -} diff --git a/_components/icons/ChartBar.tsx b/_components/icons/ChartBar.tsx deleted file mode 100644 index b0c1d91..0000000 --- a/_components/icons/ChartBar.tsx +++ /dev/null @@ -1,11 +0,0 @@ -export default function() { - return ( - - - - - - - - ); -} diff --git a/_components/icons/Diamonds.tsx b/_components/icons/Diamonds.tsx deleted file mode 100644 index 3cd2433..0000000 --- a/_components/icons/Diamonds.tsx +++ /dev/null @@ -1,8 +0,0 @@ -export default function() { - return ( - - - - - ); -} diff --git a/_components/icons/FileCV.tsx b/_components/icons/FileCV.tsx deleted file mode 100644 index b347a91..0000000 --- a/_components/icons/FileCV.tsx +++ /dev/null @@ -1,11 +0,0 @@ -export default function() { - return ( - - - - - - - - ); -} diff --git a/_components/icons/Forgejo.tsx b/_components/icons/Forgejo.tsx deleted file mode 100644 index c780932..0000000 --- a/_components/icons/Forgejo.tsx +++ /dev/null @@ -1,10 +0,0 @@ -// Icon from Simple Icons - -export default function() { - return ( - - Forgejo - - - ); -} diff --git a/_components/icons/GPS.tsx b/_components/icons/GPS.tsx deleted file mode 100644 index b50ca7f..0000000 --- a/_components/icons/GPS.tsx +++ /dev/null @@ -1,9 +0,0 @@ -export default function() { - return ( - - - - - - ); -} diff --git a/_components/icons/Heart.tsx b/_components/icons/Heart.tsx deleted file mode 100644 index 8a7d94a..0000000 --- a/_components/icons/Heart.tsx +++ /dev/null @@ -1,8 +0,0 @@ -export default function() { - return ( - - - - - ); -} diff --git a/_components/icons/HeartHandshake.tsx b/_components/icons/HeartHandshake.tsx deleted file mode 100644 index 6b5fb08..0000000 --- a/_components/icons/HeartHandshake.tsx +++ /dev/null @@ -1,11 +0,0 @@ -export default function() { - return ( - - - - - - - - ); -} diff --git a/_components/icons/Home.tsx b/_components/icons/Home.tsx deleted file mode 100644 index 45de834..0000000 --- a/_components/icons/Home.tsx +++ /dev/null @@ -1,10 +0,0 @@ -export default function() { - return ( - - - - - - - ); -} diff --git a/_components/icons/Key.tsx b/_components/icons/Key.tsx deleted file mode 100644 index 91b0d38..0000000 --- a/_components/icons/Key.tsx +++ /dev/null @@ -1,9 +0,0 @@ -export default function() { - return ( - - - - - - ); -} diff --git a/_components/icons/Mail.tsx b/_components/icons/Mail.tsx deleted file mode 100644 index 59ea555..0000000 --- a/_components/icons/Mail.tsx +++ /dev/null @@ -1,9 +0,0 @@ -export default function() { - return ( - - - - - - ) -} diff --git a/_components/icons/Mastodon.tsx b/_components/icons/Mastodon.tsx deleted file mode 100644 index e6684cd..0000000 --- a/_components/icons/Mastodon.tsx +++ /dev/null @@ -1,10 +0,0 @@ -// Icon from Simple Icons - -export default function() { - return ( - - Mastodon - - - ); -} diff --git a/_components/icons/README.org b/_components/icons/README.org deleted file mode 100644 index 95c543b..0000000 --- a/_components/icons/README.org +++ /dev/null @@ -1,3 +0,0 @@ -#+title: Icons - -Icons as TSX components. Icons are obtained from Tabler Icons and Simple Icons. diff --git a/_components/icons/School.tsx b/_components/icons/School.tsx deleted file mode 100644 index 3837e33..0000000 --- a/_components/icons/School.tsx +++ /dev/null @@ -1,9 +0,0 @@ -export default function() { - return ( - - - - - - ); -} diff --git a/_components/icons/User.tsx b/_components/icons/User.tsx deleted file mode 100644 index ea4ecdc..0000000 --- a/_components/icons/User.tsx +++ /dev/null @@ -1,9 +0,0 @@ -export default function() { - return ( - - - - - - ) -} diff --git a/_components/navbar.tsx b/_components/navbar.tsx index 247156d..d3186b6 100644 --- a/_components/navbar.tsx +++ b/_components/navbar.tsx @@ -1,15 +1,37 @@ -export default function({ comp }) { +export default function() { + const iconStyle = { + filter: "var(--filter-blue)", + }; + return ( diff --git a/_components/separator.tsx b/_components/separator.tsx index 8ae0d64..d798326 100644 --- a/_components/separator.tsx +++ b/_components/separator.tsx @@ -1,8 +1,14 @@ -export default function ({ comp }) { +export default function () { return (
- { comp.icons.Diamonds() } + + +
); diff --git a/_includes/styles/base.scss b/_includes/styles/base.scss index e60239e..a793779 100644 --- a/_includes/styles/base.scss +++ b/_includes/styles/base.scss @@ -185,3 +185,8 @@ table { } } } + +img.icon { + width: 1em; + height: 1em; +}