From 721a6c38488ed4df98be3a7c42f8fead3e8599f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= Date: Mon, 10 Apr 2023 19:37:49 +0200 Subject: [PATCH] feat(ci): format LESS files using official prettier fix #2611 (comment) prettier PR: prettier/prettier#14208 --- .github/workflows/ci.yml | 2 +- src/themes/amazon/elements/button.variables | 6 +++++- .../bootstrap3/elements/button.variables | 6 +++++- src/themes/chubby/elements/header.variables | 7 ++++++- .../default/collections/message.variables | 12 +++--------- src/themes/default/elements/button.variables | 4 +--- src/themes/default/globals/site.variables | 18 +++++++++++++++++- src/themes/default/views/card.variables | 16 ++++------------ src/themes/github/elements/button.variables | 6 +++++- src/themes/twitter/elements/button.variables | 6 +++++- 10 files changed, 52 insertions(+), 31 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9491120abb..f3270c72c2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: run: npm run lint - name: Assert LESS files formatting using Prettier run: > - yarn add -D github:fomantic/prettier#2.8.3-patched + yarn add -D github:prettier/prettier#c6e026ea28 && npx prettier --loglevel warn '!dist' '!test/coverage' '!src/semantic.less' '**/*.{css,less,overrides,variables}' --write && git restore package.json yarn.lock && git add . -N && git diff --color --exit-code diff --git a/src/themes/amazon/elements/button.variables b/src/themes/amazon/elements/button.variables index 39c89ca94f..cb881dd31a 100644 --- a/src/themes/amazon/elements/button.variables +++ b/src/themes/amazon/elements/button.variables @@ -3,7 +3,11 @@ -------------------- */ /* Button Variables */ -@pageFont: Helvetica Neue, Helvetica, Arial, sans-serif; +@pageFont: + Helvetica Neue, + Helvetica, + Arial, + sans-serif; @textTransform: none; @textColor: #111; @fontWeight: normal; diff --git a/src/themes/bootstrap3/elements/button.variables b/src/themes/bootstrap3/elements/button.variables index 629db9aef2..a48eca02f8 100644 --- a/src/themes/bootstrap3/elements/button.variables +++ b/src/themes/bootstrap3/elements/button.variables @@ -3,7 +3,11 @@ -------------------- */ /* Button Variables */ -@pageFont: Helvetica Neue, Helvetica, Arial, sans-serif; +@pageFont: + Helvetica Neue, + Helvetica, + Arial, + sans-serif; @textTransform: none; @fontWeight: @normal; @textColor: rgba(51, 51, 51, 1); diff --git a/src/themes/chubby/elements/header.variables b/src/themes/chubby/elements/header.variables index 6d327ee0b5..0b91849b39 100644 --- a/src/themes/chubby/elements/header.variables +++ b/src/themes/chubby/elements/header.variables @@ -2,7 +2,12 @@ Header -------------------- */ -@headerFont: "Source Sans Pro", Helvetica Neue, Helvetica, Arial, sans-serif; +@headerFont: + "Source Sans Pro", + Helvetica Neue, + Helvetica, + Arial, + sans-serif; @fontWeight: bold; @textTransform: none; diff --git a/src/themes/default/collections/message.variables b/src/themes/default/collections/message.variables index 7262926ed9..21a9e9dade 100644 --- a/src/themes/default/collections/message.variables +++ b/src/themes/default/collections/message.variables @@ -19,9 +19,7 @@ @borderWidth: 1px; @borderShadow: 0 0 0 @borderWidth @strongBorderColor inset; @shadowShadow: 0 0 0 0 rgba(0, 0, 0, 0); -@boxShadow: - @borderShadow, - @shadowShadow; +@boxShadow: @borderShadow, @shadowShadow; @transition: opacity @defaultDuration @defaultEasing, @@ -71,14 +69,10 @@ @attachedXOffset: -1px; @attachedYOffset: -1px; @attachedBoxShadow: 0 0 0 @borderWidth @borderColor inset; -@attachedBottomBoxShadow: - @attachedBoxShadow, - @subtleShadow; +@attachedBottomBoxShadow: @attachedBoxShadow, @subtleShadow; /* Floating */ -@floatingBoxShadow: - @borderShadow, - @floatingShadow; +@floatingBoxShadow: @borderShadow, @floatingShadow; /* Colors */ @redBoxShadow: diff --git a/src/themes/default/elements/button.variables b/src/themes/default/elements/button.variables index cfac2e48de..8d347bb437 100644 --- a/src/themes/default/elements/button.variables +++ b/src/themes/default/elements/button.variables @@ -38,9 +38,7 @@ @borderBoxShadowColor: transparent; @borderBoxShadowWidth: 1px; @borderBoxShadow: 0 0 0 @borderBoxShadowWidth @borderBoxShadowColor inset; -@boxShadow: - @borderBoxShadow, - @shadowBoxShadow; +@boxShadow: @borderBoxShadow, @shadowBoxShadow; /* Icon */ @iconHeight: auto; diff --git a/src/themes/default/globals/site.variables b/src/themes/default/globals/site.variables index a7f45e7b1c..037727238d 100755 --- a/src/themes/default/globals/site.variables +++ b/src/themes/default/globals/site.variables @@ -14,7 +14,23 @@ @fontFileNameSupplement: "Lato"; // based on https://github.com/twbs/bootstrap/blob/v5.1.3/scss/_variables.scss#L577 list -@fallbackFonts: system-ui, -apple-system, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Helvetica Neue", Arial, "Noto Sans", "Liberation Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; +@fallbackFonts: + system-ui, + -apple-system, + "Segoe UI", + Roboto, + Oxygen, + Ubuntu, + Cantarell, + "Helvetica Neue", + Arial, + "Noto Sans", + "Liberation Sans", + sans-serif, + "Apple Color Emoji", + "Segoe UI Emoji", + "Segoe UI Symbol", + "Noto Color Emoji"; @headerFont: @fontName, @fallbackFonts; @pageFont: @fontName, @fallbackFonts; diff --git a/src/themes/default/views/card.variables b/src/themes/default/views/card.variables index 82855e8376..0eb8354e74 100644 --- a/src/themes/default/views/card.variables +++ b/src/themes/default/views/card.variables @@ -21,9 +21,7 @@ @width: 290px; @borderWidth: 1px; @borderShadow: 0 0 0 @borderWidth @solidBorderColor; -@boxShadow: - @shadowBoxShadow, - @borderShadow; +@boxShadow: @shadowBoxShadow, @borderShadow; @border: none; @zIndex: ""; @transition: @@ -164,9 +162,7 @@ @linkHoverTransform: translateY(-@linkHoverRaiseDistance); @shadowHoverBoxShadow: 0 @shadowDistance @linkHoverRaiseDistance 0 @solidSelectedBorderColor; -@linkHoverBoxShadow: - @shadowHoverBoxShadow, - @borderShadow; +@linkHoverBoxShadow: @shadowHoverBoxShadow, @borderShadow; /* Horizontal */ @horizontalMinWidth: 270px; @@ -174,12 +170,8 @@ @horizontalImageWidth: 150px; /* Raised */ -@raisedShadow: - @borderShadow, - @floatingShadow; -@raisedShadowHover: - @borderShadow, - @floatingShadowHover; +@raisedShadow: @borderShadow, @floatingShadow; +@raisedShadowHover: @borderShadow, @floatingShadowHover; /* Basic Raised */ @basicRaisedShadow: @floatingShadow; diff --git a/src/themes/github/elements/button.variables b/src/themes/github/elements/button.variables index 4d9fca30f0..8115caae4d 100644 --- a/src/themes/github/elements/button.variables +++ b/src/themes/github/elements/button.variables @@ -3,7 +3,11 @@ -------------------- */ /* Button Variables */ -@pageFont: Helvetica Neue, Helvetica, Arial, sans-serif; +@pageFont: + Helvetica Neue, + Helvetica, + Arial, + sans-serif; @textTransform: none; @fontWeight: bold; @textColor: #333; diff --git a/src/themes/twitter/elements/button.variables b/src/themes/twitter/elements/button.variables index 52f26d295c..73a45d1f1b 100644 --- a/src/themes/twitter/elements/button.variables +++ b/src/themes/twitter/elements/button.variables @@ -2,7 +2,11 @@ Global Variables -------------------- */ -@pageFont: Helvetica Neue, Helvetica, Arial, sans-serif; +@pageFont: + Helvetica Neue, + Helvetica, + Arial, + sans-serif; @textColor: #66757f; @blue: #55acee;