From 994278f77d887e5b844246dfb2f7c4b7516b42c8 Mon Sep 17 00:00:00 2001 From: Juan Di Toro Date: Mon, 14 Aug 2023 12:41:07 +0200 Subject: [PATCH 1/3] refactor: home page is fully tailwind --- src/components/Home/PoweredBy/PoweredBy.astro | 39 ++++++++---- src/components/Home/PoweredBy/PoweredBy.scss | 54 ----------------- src/components/Home/Socials/Socials.astro | 60 ++++++++++++------- src/components/Home/Socials/Socials.scss | 50 ---------------- src/styles/global.scss | 17 ------ src/styles/vars.scss | 1 - 6 files changed, 66 insertions(+), 155 deletions(-) delete mode 100644 src/components/Home/PoweredBy/PoweredBy.scss delete mode 100644 src/components/Home/Socials/Socials.scss diff --git a/src/components/Home/PoweredBy/PoweredBy.astro b/src/components/Home/PoweredBy/PoweredBy.astro index 0e78750..e0c4cc8 100644 --- a/src/components/Home/PoweredBy/PoweredBy.astro +++ b/src/components/Home/PoweredBy/PoweredBy.astro @@ -1,21 +1,38 @@ --- -import './PoweredBy.scss'; - -import svgSia from '/src/assets/icons/sia.svg?raw'; -import svgHns from '/src/assets/icons/hns.svg?raw'; -import svgOsi from '/src/assets/icons/osi.svg?raw'; +import svgSia from "/src/assets/icons/sia.svg?raw"; +import svgHns from "/src/assets/icons/hns.svg?raw"; +import svgOsi from "/src/assets/icons/osi.svg?raw"; --- -
-

Powered By

-
-
- -
diff --git a/src/components/Home/PoweredBy/PoweredBy.scss b/src/components/Home/PoweredBy/PoweredBy.scss deleted file mode 100644 index a55b1b6..0000000 --- a/src/components/Home/PoweredBy/PoweredBy.scss +++ /dev/null @@ -1,54 +0,0 @@ -@import "/src/styles/mixins.scss"; -@import "/src/styles/vars.scss"; - -#powered-by { - display: flex; - align-items: center; - justify-content: center; - gap: 4em; - margin: 12em 7.5%; - - @media screen and (max-width: 47.99999rem) { - flex-direction: column; - gap: 2.5em; - } - - div { - display: flex; - align-items: center; - gap: 2.5em; - } - - h2 { - @include fluid-font-size(1.5625rem); - font-weight: 700; - line-height: 100%; - text-transform: uppercase; - color: $color-aquamarine; - - @media screen and (min-width: 48rem) { - margin-top: 0.75em; - } - } - - a { - padding: 0.5em; - color: $color-alto; - - &:hover { - color: $color-white; - } - } - - .sia-logo svg { - @include fluid-width(5.5rem); - } - - .hns-logo svg { - @include fluid-width(4.5rem); - } - - .osi-logo svg { - @include fluid-width(4.5rem); - } -} diff --git a/src/components/Home/Socials/Socials.astro b/src/components/Home/Socials/Socials.astro index 389fa77..825437b 100644 --- a/src/components/Home/Socials/Socials.astro +++ b/src/components/Home/Socials/Socials.astro @@ -1,26 +1,42 @@ --- -import './Socials.scss'; - -import svgGit from '/src/assets/icons/git.svg?raw'; -import svgGithub from '/src/assets/icons/github.svg?raw'; -import svgDiscord from '/src/assets/icons/discord.svg?raw'; -import svgTwitter from '/src/assets/icons/twitter.svg?raw'; +import svgGit from "/src/assets/icons/git.svg?raw"; +import svgGithub from "/src/assets/icons/github.svg?raw"; +import svgDiscord from "/src/assets/icons/discord.svg?raw"; +import svgTwitter from "/src/assets/icons/twitter.svg?raw"; --- -
-

Get in touch

- +
+

+ Get in touch +

+
+ + + + + + + + + + + + +
diff --git a/src/components/Home/Socials/Socials.scss b/src/components/Home/Socials/Socials.scss deleted file mode 100644 index c0223eb..0000000 --- a/src/components/Home/Socials/Socials.scss +++ /dev/null @@ -1,50 +0,0 @@ -@import "/src/styles/mixins.scss"; -@import "/src/styles/vars.scss"; - -#socials { - display: flex; - flex-direction: column; - align-items: center; - justify-content: center; - gap: 3em; - margin: 12em 7.5% 8em; - - div { - display: flex; - align-items: center; - gap: 2.5em; - } - - h2 { - @include fluid-font-size(1.5625rem); - font-weight: 700; - line-height: 100%; - text-transform: uppercase; - color: $color-aquamarine; - } - - a { - padding: 0.5em; - color: $color-alto; - - &:hover { - color: $color-white; - } - } - - .github-logo svg { - @include fluid-width(3.5rem); - } - - .git-logo svg { - @include fluid-width(3.5rem); - } - - .discord-logo svg { - @include fluid-width(3.5rem); - } - - .twitter-logo svg { - @include fluid-width(3.5rem); - } -} diff --git a/src/styles/global.scss b/src/styles/global.scss index 860e044..7b753cb 100644 --- a/src/styles/global.scss +++ b/src/styles/global.scss @@ -25,14 +25,6 @@ src: url("/fonts/JetBrainsMono-Bold.woff2") format('woff2'); } -@font-face { - font-family: 'IBM Plex Sans Devanagari'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: url("/fonts/ibm-plex-sans-devanagari.woff2") format('woff2'); -} - @tailwind base; @tailwind components; @tailwind utilities; @@ -66,15 +58,6 @@ body { } } -main { - @include fluid-font-size(0.625rem); - flex-grow: 1; -} - -a, button { - transition: color $transition-duration; -} - .tilted-bg { position: relative; diff --git a/src/styles/vars.scss b/src/styles/vars.scss index 40f7fd8..f5d4741 100644 --- a/src/styles/vars.scss +++ b/src/styles/vars.scss @@ -6,7 +6,6 @@ $color-aquamarine: #7afcbb; $color-cloud: #c7c7c7; $color-alto: #d9d9d9; -$font-family-ibm-plex-sans-devanagari: "IBM Plex Sans Devanagari", sans-serif; $font-family-jaldi: "Jaldi", sans-serif; $font-family-jetbrains-mono: "JetBrains Mono", monospace; From ccc873d547de3e9cd8ba1067d95d5ab5cfd8a9f4 Mon Sep 17 00:00:00 2001 From: Juan Di Toro Date: Mon, 14 Aug 2023 12:42:35 +0200 Subject: [PATCH 2/3] fix: bring back ibm font --- src/components/Home/Socials/Socials.scss | 50 ++++++++++++++++++++++++ src/styles/global.scss | 8 ++++ src/styles/vars.scss | 1 + 3 files changed, 59 insertions(+) create mode 100644 src/components/Home/Socials/Socials.scss diff --git a/src/components/Home/Socials/Socials.scss b/src/components/Home/Socials/Socials.scss new file mode 100644 index 0000000..c0223eb --- /dev/null +++ b/src/components/Home/Socials/Socials.scss @@ -0,0 +1,50 @@ +@import "/src/styles/mixins.scss"; +@import "/src/styles/vars.scss"; + +#socials { + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + gap: 3em; + margin: 12em 7.5% 8em; + + div { + display: flex; + align-items: center; + gap: 2.5em; + } + + h2 { + @include fluid-font-size(1.5625rem); + font-weight: 700; + line-height: 100%; + text-transform: uppercase; + color: $color-aquamarine; + } + + a { + padding: 0.5em; + color: $color-alto; + + &:hover { + color: $color-white; + } + } + + .github-logo svg { + @include fluid-width(3.5rem); + } + + .git-logo svg { + @include fluid-width(3.5rem); + } + + .discord-logo svg { + @include fluid-width(3.5rem); + } + + .twitter-logo svg { + @include fluid-width(3.5rem); + } +} diff --git a/src/styles/global.scss b/src/styles/global.scss index 7b753cb..84f08ef 100644 --- a/src/styles/global.scss +++ b/src/styles/global.scss @@ -25,6 +25,14 @@ src: url("/fonts/JetBrainsMono-Bold.woff2") format('woff2'); } +@font-face { + font-family: 'IBM Plex Sans Devanagari'; + font-style: normal; + font-weight: 400; + font-display: swap; + src: url("/fonts/ibm-plex-sans-devanagari.woff2") format('woff2'); +} + @tailwind base; @tailwind components; @tailwind utilities; diff --git a/src/styles/vars.scss b/src/styles/vars.scss index f5d4741..40f7fd8 100644 --- a/src/styles/vars.scss +++ b/src/styles/vars.scss @@ -6,6 +6,7 @@ $color-aquamarine: #7afcbb; $color-cloud: #c7c7c7; $color-alto: #d9d9d9; +$font-family-ibm-plex-sans-devanagari: "IBM Plex Sans Devanagari", sans-serif; $font-family-jaldi: "Jaldi", sans-serif; $font-family-jetbrains-mono: "JetBrains Mono", monospace; From 1ab2ae421f9684fd58877988a8ec4b4144fa1d4f Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Mon, 14 Aug 2023 10:43:19 +0000 Subject: [PATCH 3/3] chore(release): 0.2.2-develop.3 [skip ci] ## [0.2.2-develop.3](https://git.lumeweb.com/LumeWeb/lumeweb.com/compare/v0.2.2-develop.2...v0.2.2-develop.3) (2023-08-14) ### Bug Fixes * bring back ibm font ([ccc873d](https://git.lumeweb.com/LumeWeb/lumeweb.com/commit/ccc873d547de3e9cd8ba1067d95d5ab5cfd8a9f4)) --- CHANGELOG.md | 7 +++++++ npm-shrinkwrap.json | 4 ++-- package.json | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eeec861..73584f6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [0.2.2-develop.3](https://git.lumeweb.com/LumeWeb/lumeweb.com/compare/v0.2.2-develop.2...v0.2.2-develop.3) (2023-08-14) + + +### Bug Fixes + +* bring back ibm font ([ccc873d](https://git.lumeweb.com/LumeWeb/lumeweb.com/commit/ccc873d547de3e9cd8ba1067d95d5ab5cfd8a9f4)) + ## [0.2.2-develop.2](https://git.lumeweb.com/LumeWeb/lumeweb.com/compare/v0.2.2-develop.1...v0.2.2-develop.2) (2023-08-14) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 29a79aa..7294d3e 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1,12 +1,12 @@ { "name": "@lumeweb/lumeweb.com", - "version": "0.2.2-develop.2", + "version": "0.2.2-develop.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@lumeweb/lumeweb.com", - "version": "0.2.2-develop.2", + "version": "0.2.2-develop.3", "dependencies": { "@astrojs/react": "^2.1.1", "@astrojs/tailwind": "^3.1.1", diff --git a/package.json b/package.json index 9a7279c..e12ed25 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@lumeweb/lumeweb.com", "type": "module", - "version": "0.2.2-develop.2", + "version": "0.2.2-develop.3", "private": true, "repository": { "type": "git",