From 7c847ccae5caae8c71783cea4b9fa156f28c36cc Mon Sep 17 00:00:00 2001 From: Jakob Steiner Date: Wed, 28 Feb 2024 15:12:24 +0100 Subject: [PATCH] chore: add prettier Signed-off-by: Jakob Steiner --- index.scss | 3 +-- package-lock.json | 16 ++++++++++++++++ package.json | 7 ++++--- scss/_mixins.scss | 2 +- scss/_variables.scss | 2 +- scss/components/_anminations.scss | 2 +- scss/components/_card-elevated.scss | 7 +++++-- scss/components/_cta.scss | 2 +- scss/components/_list.scss | 4 ++-- scss/components/_scroll-container.scss | 2 +- scss/components/_utilities.scss | 15 +++++++++++++-- 11 files changed, 46 insertions(+), 16 deletions(-) diff --git a/index.scss b/index.scss index cb392c1..22005c0 100644 --- a/index.scss +++ b/index.scss @@ -12,7 +12,7 @@ // 4. Include any default map overrides here $custom-colors: ( - "accent": $accent + "accent": $accent, ); $theme-colors: map-merge($theme-colors, $custom-colors); @@ -70,7 +70,6 @@ $theme-colors: map-merge($theme-colors, $custom-colors); @import "scss/components/scroll-container"; @import "scss/components/utilities"; - // 9. Import fonts @import "@fontsource/inter/latin-300.css"; @import "@fontsource/inter/latin-400.css"; diff --git a/package-lock.json b/package-lock.json index 0bb217d..4f4c60b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,6 +15,7 @@ "devDependencies": { "bootstrap-icons": "1.11.3", "esbuild": "0.19.10", + "prettier": "3.2.5", "release-it": "17.0.0", "sass": "1.69.7" } @@ -4320,6 +4321,21 @@ "url": "https://github.com/sponsors/jonschlinkert" } }, + "node_modules/prettier": { + "version": "3.2.5", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.5.tgz", + "integrity": "sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==", + "dev": true, + "bin": { + "prettier": "bin/prettier.cjs" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/prettier/prettier?sponsor=1" + } + }, "node_modules/promise.allsettled": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/promise.allsettled/-/promise.allsettled-1.0.7.tgz", diff --git a/package.json b/package.json index bcdf614..9a845ca 100644 --- a/package.json +++ b/package.json @@ -28,10 +28,11 @@ "bootstrap": "5.3.2" }, "devDependencies": { - "release-it": "17.0.0", + "bootstrap-icons": "1.11.3", "esbuild": "0.19.10", - "sass": "1.69.7", - "bootstrap-icons": "1.11.3" + "prettier": "3.2.5", + "release-it": "17.0.0", + "sass": "1.69.7" }, "volta": { "node": "20.10.0" diff --git a/scss/_mixins.scss b/scss/_mixins.scss index aa8a3cf..f273859 100644 --- a/scss/_mixins.scss +++ b/scss/_mixins.scss @@ -1,4 +1,4 @@ // Drop shadow to be used on cards and similar elements @mixin card-shadow() { box-shadow: 0 0 4px rgba(0, 0, 0, 0.1); -} \ No newline at end of file +} diff --git a/scss/_variables.scss b/scss/_variables.scss index 669600a..1862884 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -62,7 +62,7 @@ $navbar-dark-active-color: $gk-fg-dark; $btn-font-weight: 700; $btn-padding-x: 1.5rem; -$btn-padding-y: .75rem; +$btn-padding-y: 0.75rem; $btn-padding-x-sm: 1.5rem; $btn-padding-y-sm: 0.375rem; diff --git a/scss/components/_anminations.scss b/scss/components/_anminations.scss index 27d0c71..34bacc4 100644 --- a/scss/components/_anminations.scss +++ b/scss/components/_anminations.scss @@ -4,4 +4,4 @@ .flipped-x { transform: rotateX(180deg); -} \ No newline at end of file +} diff --git a/scss/components/_card-elevated.scss b/scss/components/_card-elevated.scss index 215ec02..12b9ca6 100644 --- a/scss/components/_card-elevated.scss +++ b/scss/components/_card-elevated.scss @@ -1,6 +1,9 @@ #card-elevated-base { @extend .rounded-2; - transition: box-shadow 200ms ease-in-out, transform 200ms ease-in-out, background-color 200ms ease-in-out; + transition: + box-shadow 200ms ease-in-out, + transform 200ms ease-in-out, + background-color 200ms ease-in-out; } .card-elevated { @@ -29,4 +32,4 @@ a.card-elevated { text-decoration: none; -} \ No newline at end of file +} diff --git a/scss/components/_cta.scss b/scss/components/_cta.scss index 0cebb5a..0ca67aa 100644 --- a/scss/components/_cta.scss +++ b/scss/components/_cta.scss @@ -8,4 +8,4 @@ .cta-#{$size} { @extend .btn-#{$size}; } -} \ No newline at end of file +} diff --git a/scss/components/_list.scss b/scss/components/_list.scss index 5a061ef..c5d050d 100644 --- a/scss/components/_list.scss +++ b/scss/components/_list.scss @@ -1,11 +1,11 @@ ul:not(.dropdown-menu, .navbar-nav, .list-unstyled, .list-inline, .nav) { - list-style: url('data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTIiIGhlaWdodD0iMTIiIHZpZXdCb3g9IjAgMCAxMiAxMiIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPGcgY2xpcC1wYXRoPSJ1cmwoI2NsaXAwXzFfMikiPgo8Y2lyY2xlIGN4PSI2IiBjeT0iNiIgcj0iNiIgZmlsbD0iIzAwQjVFQiIgZmlsbC1vcGFjaXR5PSIwLjE1Ii8+CjxjaXJjbGUgY3g9IjYiIGN5PSI2IiByPSIzIiBmaWxsPSIjMDBCNUVCIi8+CjwvZz4KPGRlZnM+CjxjbGlwUGF0aCBpZD0iY2xpcDBfMV8yIj4KPHJlY3Qgd2lkdGg9IjEyIiBoZWlnaHQ9IjEyIiBmaWxsPSJ3aGl0ZSIvPgo8L2NsaXBQYXRoPgo8L2RlZnM+Cjwvc3ZnPgo='); + list-style: url("data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTIiIGhlaWdodD0iMTIiIHZpZXdCb3g9IjAgMCAxMiAxMiIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPGcgY2xpcC1wYXRoPSJ1cmwoI2NsaXAwXzFfMikiPgo8Y2lyY2xlIGN4PSI2IiBjeT0iNiIgcj0iNiIgZmlsbD0iIzAwQjVFQiIgZmlsbC1vcGFjaXR5PSIwLjE1Ii8+CjxjaXJjbGUgY3g9IjYiIGN5PSI2IiByPSIzIiBmaWxsPSIjMDBCNUVCIi8+CjwvZz4KPGRlZnM+CjxjbGlwUGF0aCBpZD0iY2xpcDBfMV8yIj4KPHJlY3Qgd2lkdGg9IjEyIiBoZWlnaHQ9IjEyIiBmaWxsPSJ3aGl0ZSIvPgo8L2NsaXBQYXRoPgo8L2RlZnM+Cjwvc3ZnPgo="); &, ol { padding-inline-start: 32px; - &>li { + & > li { padding-inline-start: 8px; } } diff --git a/scss/components/_scroll-container.scss b/scss/components/_scroll-container.scss index d41a804..4316107 100644 --- a/scss/components/_scroll-container.scss +++ b/scss/components/_scroll-container.scss @@ -6,4 +6,4 @@ .row-scroll { flex-wrap: nowrap !important; } -} \ No newline at end of file +} diff --git a/scss/components/_utilities.scss b/scss/components/_utilities.scss index 7781f24..abb3997 100644 --- a/scss/components/_utilities.scss +++ b/scss/components/_utilities.scss @@ -9,12 +9,23 @@ .text-justified { text-align: justify; - h1, h2, h3, h4, h5, h6, li { + h1, + h2, + h3, + h4, + h5, + h6, + li { text-align: initial; } } -h1, h2, h3, h4, h5, h6 { +h1, +h2, +h3, +h4, +h5, +h6 { a { padding-inline-start: 0.6rem; display: none;