From 8b23c7900f95f1aba87dfb02e21fdfd727246372 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= Date: Sun, 18 Dec 2022 21:20:55 +0100 Subject: [PATCH 01/15] Add prettier opinionated formatter --- ...prettier-14007-no-unstable-semicolon.patch | 16 +++++++++++++ ...ier-14008-no-space-after-unary-minus.patch | 23 +++++++++++++++++++ ...lower-if-inside-variable-declaration.patch | 18 +++++++++++++++ .github/fix-prettier-value-with-comma.patch | 18 +++++++++++++++ .github/workflows/ci.yml | 14 +++++++++-- .prettierrc.js | 12 ++++++++++ .stylelintrc.js | 7 ++++++ 7 files changed, 106 insertions(+), 2 deletions(-) create mode 100644 .github/fix-prettier-14007-no-unstable-semicolon.patch create mode 100644 .github/fix-prettier-14008-no-space-after-unary-minus.patch create mode 100644 .github/fix-prettier-14034-no-property-name-lower-if-inside-variable-declaration.patch create mode 100644 .github/fix-prettier-value-with-comma.patch create mode 100644 .prettierrc.js diff --git a/.github/fix-prettier-14007-no-unstable-semicolon.patch b/.github/fix-prettier-14007-no-unstable-semicolon.patch new file mode 100644 index 0000000000..6a1b7a9fee --- /dev/null +++ b/.github/fix-prettier-14007-no-unstable-semicolon.patch @@ -0,0 +1,16 @@ +diff --git a/src/language-css/printer-postcss.js b/src/language-css/printer-postcss.js +index 4ba444c8d..eaa5e38ff 100644 +--- a/src/language-css/printer-postcss.js ++++ b/src/language-css/printer-postcss.js +@@ -101,7 +101,10 @@ function genericPrint(path, options, print) { + return [node.raw, hardline]; + case "css-root": { + const nodes = printNodeSequence(path, options, print); +- const after = node.raws.after.trim(); ++ let after = node.raws.after.trim(); ++ if (after.startsWith(";")) { ++ after = after.slice(1).trim(); ++ } + + return [ + nodes, diff --git a/.github/fix-prettier-14008-no-space-after-unary-minus.patch b/.github/fix-prettier-14008-no-space-after-unary-minus.patch new file mode 100644 index 0000000000..e14a913c6f --- /dev/null +++ b/.github/fix-prettier-14008-no-space-after-unary-minus.patch @@ -0,0 +1,23 @@ +diff --git a/src/language-css/printer-postcss.js b/src/language-css/printer-postcss.js +index 4ba444c8d..a15f7981f 100644 +--- a/src/language-css/printer-postcss.js ++++ b/src/language-css/printer-postcss.js +@@ -744,6 +744,18 @@ function genericPrint(path, options, print) { + continue; + } + ++ // No space before unary minus followed by an opening parenthesis `-(` ++ if ( ++ (options.parser === "scss" || options.parser === "less") && ++ isMathOperator && ++ iNode.value === "-" && ++ isParenGroupNode(iNextNode) && ++ locEnd(iNode) === locStart(iNextNode.open) && ++ iNextNode.open.value === "(" ++ ) { ++ continue; ++ } ++ + // Add `hardline` after inline comment (i.e. `// comment\n foo: bar;`) + if (isInlineValueCommentNode(iNode)) { + if (parentNode.type === "value-paren_group") { diff --git a/.github/fix-prettier-14034-no-property-name-lower-if-inside-variable-declaration.patch b/.github/fix-prettier-14034-no-property-name-lower-if-inside-variable-declaration.patch new file mode 100644 index 0000000000..bbae6947a3 --- /dev/null +++ b/.github/fix-prettier-14034-no-property-name-lower-if-inside-variable-declaration.patch @@ -0,0 +1,18 @@ +diff --git a/src/language-css/printer-postcss.js b/src/language-css/printer-postcss.js +index 4ba444c8d..431cdc7a6 100644 +--- a/src/language-css/printer-postcss.js ++++ b/src/language-css/printer-postcss.js +@@ -155,7 +155,12 @@ function genericPrint(path, options, print) { + + return [ + node.raws.before.replace(/[\s;]/g, ""), +- insideICSSRuleNode(path) ? node.prop : maybeToLowerCase(node.prop), ++ (parentNode.type === "css-atrule" && ++ typeof parentNode.raws.params === "string" && ++ parentNode.raws.params.startsWith(":")) || ++ insideICSSRuleNode(path) ++ ? node.prop ++ : maybeToLowerCase(node.prop), + trimmedBetween.startsWith("//") ? " " : "", + trimmedBetween, + node.extend ? "" : " ", diff --git a/.github/fix-prettier-value-with-comma.patch b/.github/fix-prettier-value-with-comma.patch new file mode 100644 index 0000000000..7308612e43 --- /dev/null +++ b/.github/fix-prettier-value-with-comma.patch @@ -0,0 +1,18 @@ +diff --git a/src/language-css/printer-postcss.js b/src/language-css/printer-postcss.js +index 4ba444c8d..4f7738bfa 100644 +--- a/src/language-css/printer-postcss.js ++++ b/src/language-css/printer-postcss.js +@@ -886,11 +886,11 @@ function genericPrint(path, options, print) { + + if (!node.open) { + const printed = path.map(print, "groups"); +- const res = []; ++ const res = [hardline]; + + for (let i = 0; i < printed.length; i++) { + if (i !== 0) { +- res.push([",", line]); ++ res.push([",", hardline]); + } + res.push(printed[i]); + } diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 31ac9766e9..6be4d79280 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,9 +11,19 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 - name: Install dependencies - run: yarn && yarn add -D eslint-config-airbnb-base eslint-plugin-unicorn eslint-plugin-jest@^26.9.0 @typescript-eslint/eslint-plugin @typescript-eslint/parser typescript + run: > + yarn + && yarn add -D eslint-config-airbnb-base eslint-plugin-unicorn eslint-plugin-jest@^26.9.0 @typescript-eslint/eslint-plugin @typescript-eslint/parser typescript github:prettier/prettier#2.8.1 + && (cd node_modules/prettier && git apply -v ../../.github/fix-prettier-14007-no-unstable-semicolon.patch) + && (cd node_modules/prettier && git apply -v ../../.github/fix-prettier-14008-no-space-after-unary-minus.patch) + && (cd node_modules/prettier && git apply -v ../../.github/fix-prettier-14034-no-property-name-lower-if-inside-variable-declaration.patch) + && (cd node_modules/prettier && git apply -v ../../.github/fix-prettier-value-with-comma.patch) - name: Lint JS and LESS files - run: npm run lint + run: > + npm run lint + && 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 --exit-code test: name: Test build process on node ${{ matrix.node-version }} runs-on: ubuntu-latest diff --git a/.prettierrc.js b/.prettierrc.js new file mode 100644 index 0000000000..2bc56c6098 --- /dev/null +++ b/.prettierrc.js @@ -0,0 +1,12 @@ +module.exports = { + tabWidth: 4, + overrides: [ + { + files: ['*.less', '*.overrides', '*.variables'], + options: { + parser: 'less', + printWidth: Infinity, + }, + }, + ], +}; diff --git a/.stylelintrc.js b/.stylelintrc.js index 0e91533970..06f22e7c5e 100644 --- a/.stylelintrc.js +++ b/.stylelintrc.js @@ -36,6 +36,13 @@ module.exports = { 'string-quotes': 'double', 'value-keyword-case': null, + // fix compatibility with Prettier + 'declaration-bang-space-before': null, + 'declaration-block-semicolon-space-before': null, + 'declaration-colon-newline-after': null, + 'declaration-empty-line-before': null, // TODO + 'selector-combinator-space-before': null, + // TODO rules to be removed/fixed in v2.10.0 as fixes are not compatible with IE11 'alpha-value-notation': 'number', // https://caniuse.com/mdn-css_properties_opacity_percentages From 75707baae9891e99bc009ef992b28c4c786874b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= Date: Tue, 20 Dec 2022 19:32:49 +0100 Subject: [PATCH 02/15] fix semicolon placement using regex \n\s*(?=;) --- src/definitions/modules/rating.less | 6 +- src/definitions/views/card.less | 12 +- src/themes/amazon/elements/button.variables | 12 +- .../bootstrap3/elements/button.variables | 9 +- src/themes/classic/elements/button.variables | 18 +-- src/themes/classic/views/card.overrides | 6 +- src/themes/colored/modules/checkbox.variables | 3 +- src/themes/default/collections/form.variables | 3 +- src/themes/default/collections/menu.variables | 6 +- .../default/collections/message.variables | 114 ++++++------------ .../default/collections/table.variables | 6 +- src/themes/default/elements/button.variables | 18 +-- src/themes/default/elements/icon.variables | 6 +- src/themes/default/elements/input.variables | 3 +- src/themes/default/elements/list.variables | 9 +- src/themes/default/elements/segment.variables | 9 +- src/themes/default/elements/step.variables | 3 +- src/themes/default/globals/site.variables | 99 +++++---------- .../default/modules/accordion.variables | 12 +- src/themes/default/modules/checkbox.variables | 12 +- src/themes/default/modules/dimmer.variables | 3 +- src/themes/default/modules/dropdown.variables | 3 +- src/themes/default/modules/embed.variables | 6 +- src/themes/default/modules/modal.variables | 9 +- src/themes/default/modules/progress.variables | 3 +- src/themes/default/modules/rating.variables | 3 +- src/themes/default/modules/search.variables | 9 +- src/themes/default/modules/shape.variables | 3 +- src/themes/default/views/card.variables | 24 ++-- src/themes/github/collections/form.variables | 3 +- src/themes/github/collections/menu.variables | 3 +- .../github/collections/message.variables | 6 +- src/themes/github/elements/button.variables | 12 +- src/themes/github/elements/input.variables | 3 +- src/themes/github/modules/dropdown.variables | 3 +- src/themes/material/elements/button.variables | 6 +- src/themes/raised/elements/button.variables | 3 +- src/themes/round/elements/button.variables | 3 +- 38 files changed, 157 insertions(+), 314 deletions(-) diff --git a/src/definitions/modules/rating.less b/src/definitions/modules/rating.less index cbb2c50af6..909e335dc1 100755 --- a/src/definitions/modules/rating.less +++ b/src/definitions/modules/rating.less @@ -107,8 +107,7 @@ 0 -@shadowWidth 0 @c, -@shadowWidth 0 0 @c, 0 @shadowWidth 0 @c, - @shadowWidth 0 0 @c - ; + @shadowWidth 0 0 @c; } .ui.@{color}.rating .icon.selected, .ui.@{color}.rating .icon.selected.active, @@ -119,8 +118,7 @@ 0 -@shadowWidth 0 @h, -@shadowWidth 0 0 @h, 0 @shadowWidth 0 @h, - @shadowWidth 0 0 @h - ; + @shadowWidth 0 0 @h; -webkit-text-stroke: unset; background-clip: unset; diff --git a/src/definitions/views/card.less b/src/definitions/views/card.less index 406b8a980d..1f6cd0881c 100755 --- a/src/definitions/views/card.less +++ b/src/definitions/views/card.less @@ -675,8 +675,7 @@ box-shadow: @borderShadow, 0 @coloredShadowDistance 0 0 @c, - @shadowBoxShadow - ; + @shadowBoxShadow; } & when (@variationCardLink) { .ui.cards a.@{color}.card:hover, @@ -688,8 +687,7 @@ box-shadow: @borderShadow, 0 @coloredShadowDistance 0 0 @h, - @shadowHoverBoxShadow - ; + @shadowHoverBoxShadow; } } & when (@variationCardBasic) { @@ -727,8 +725,7 @@ box-shadow: 0 @shadowDistance 3px 0 @solidWhiteBorderColor, 0 @coloredShadowDistance 0 0 @l, - 0 0 0 @borderWidth @solidWhiteBorderColor - ; + 0 0 0 @borderWidth @solidWhiteBorderColor; } & when (@variationCardLink) { .ui.inverted.cards a.@{color}.card:hover, @@ -740,8 +737,7 @@ box-shadow: 0 @shadowDistance 3px 0 @solidWhiteBorderColor, 0 @coloredShadowDistance 0 0 @lh, - 0 0 0 @borderWidth @solidWhiteBorderColor - ; + 0 0 0 @borderWidth @solidWhiteBorderColor; } } & when (@variationCardBasic) { diff --git a/src/themes/amazon/elements/button.variables b/src/themes/amazon/elements/button.variables index d400075833..8f8953263b 100644 --- a/src/themes/amazon/elements/button.variables +++ b/src/themes/amazon/elements/button.variables @@ -11,8 +11,7 @@ opacity @defaultDuration @defaultEasing, background-color @defaultDuration @defaultEasing, color @defaultDuration @defaultEasing, - background @defaultDuration @defaultEasing -; + background @defaultDuration @defaultEasing; @hoverBackgroundColor: #e0e0e0; @@ -24,18 +23,15 @@ @backgroundImage: linear-gradient(rgba(255, 255, 255, 0), rgba(0, 0, 0, 0.1)); @boxShadow: 0 1px 0 1px rgba(255, 255, 255, 0.3) inset, - 0 0 0 1px #adb2bb inset -; + 0 0 0 1px #adb2bb inset; @coloredBackgroundImage: linear-gradient(rgba(255, 255, 255, 0.2), rgba(0, 0, 0, 0.2)); @coloredBoxShadow: - 0 1px 0 0 rgba(255, 255, 255, 0.2) inset -; + 0 1px 0 0 rgba(255, 255, 255, 0.2) inset; @downBoxShadow: 0 0 0 1px #adb2bb inset, - 0 1px 3px rgba(0, 0, 0, 0.2) inset -; + 0 1px 3px rgba(0, 0, 0, 0.2) inset; @labeledIconBackgroundColor: #313a43; @labeledIconColor: #fff; diff --git a/src/themes/bootstrap3/elements/button.variables b/src/themes/bootstrap3/elements/button.variables index efe067ddc7..57c3207631 100644 --- a/src/themes/bootstrap3/elements/button.variables +++ b/src/themes/bootstrap3/elements/button.variables @@ -38,8 +38,7 @@ @basicHoverBackground: transparent; @basicDownBoxShadow: 0 0 0 1px #adadad inset, - 0 3px 5px rgba(0, 0, 0, 0.125) inset -; + 0 3px 5px rgba(0, 0, 0, 0.125) inset; @groupButtonOffset: 0 0 0 -1px; @verticalGroupOffset: 0 0 -1px 0; @@ -48,14 +47,12 @@ @hoverBackgroundColor: #e6e6e6; @hoverBoxShadow: - 0 0 0 1px #adadad inset -; + 0 0 0 1px #adadad inset; @downBackgroundColor: #e6e6e6; @downBoxShadow: 0 0 0 1px #adadad inset, - 0 3px 5px rgba(0, 0, 0, 0.125) inset -; + 0 3px 5px rgba(0, 0, 0, 0.125) inset; @activeBackgroundColor: #e6e6e6; diff --git a/src/themes/classic/elements/button.variables b/src/themes/classic/elements/button.variables index 969baee244..9e4f7b1fb6 100644 --- a/src/themes/classic/elements/button.variables +++ b/src/themes/classic/elements/button.variables @@ -14,8 +14,7 @@ @backgroundImage: linear-gradient(rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.09)); @boxShadow: 0 0 0 1px @borderColor inset, - @shadowBoxShadow -; + @shadowBoxShadow; /* Padding */ @verticalPadding: 0.8em; @@ -28,8 +27,7 @@ @groupBoxShadow: none; @groupButtonBoxShadow: 0 0 0 1px @borderColor inset, - @shadowBoxShadow -; + @shadowBoxShadow; @verticalBoxShadow: 0 0 0 1px @borderColor inset; @groupButtonOffset: 0 0 0 -1px; @verticalGroupOffset: 0 0 -1px 0; @@ -50,8 +48,7 @@ @focusBackgroundImage: none; @focusBoxShadow: 0 0 1px rgba(81, 167, 232, 0.8) inset, - 0 0 3px 2px rgba(81, 167, 232, 0.8) -; + 0 0 3px 2px rgba(81, 167, 232, 0.8); @focusColor: @hoveredTextColor; @iconFocusOpacity: 0.85; @@ -60,8 +57,7 @@ @downBackgroundImage: ""; @downBoxShadow: 0 0 0 1px rgba(0, 0, 0, 0.1) inset, - 0 1px 4px 0 rgba(0, 0, 0, 0.1) inset !important -; + 0 1px 4px 0 rgba(0, 0, 0, 0.1) inset !important; @downColor: @pressedTextColor; /* Active */ @@ -70,16 +66,14 @@ @activeColor: @selectedTextColor; @activeBoxShadow: 0 0 0 1px rgba(0, 0, 0, 0.1) inset, - 0 1px 4px 0 rgba(0, 0, 0, 0.1) inset !important -; + 0 1px 4px 0 rgba(0, 0, 0, 0.1) inset !important; /* Active + Hovered */ @activeHoverBackgroundColor: #dadada; @activeHoverBackgroundImage: none; @activeHoverBoxShadow: 0 0 0 1px rgba(0, 0, 0, 0.1) inset, - 0 1px 4px 0 rgba(0, 0, 0, 0.1) inset !important -; + 0 1px 4px 0 rgba(0, 0, 0, 0.1) inset !important; @activeHoverColor: @selectedTextColor; /* Loading */ diff --git a/src/themes/classic/views/card.overrides b/src/themes/classic/views/card.overrides index b6cede32b7..393bac231b 100644 --- a/src/themes/classic/views/card.overrides +++ b/src/themes/classic/views/card.overrides @@ -17,8 +17,7 @@ @width: 300px; @boxShadow: 0 0 0 1px @borderColor, - 0 3px 0 0 @borderColor -; + 0 3px 0 0 @borderColor; @border: none; @zIndex: ""; @@ -87,8 +86,7 @@ @hoverBorder: none; @hoverBoxShadow: 0 0 0 1px @selectedBorderColor, - 0 3px 0 0 @selectedBorderColor -; + 0 3px 0 0 @selectedBorderColor; /* ------------------- Variations diff --git a/src/themes/colored/modules/checkbox.variables b/src/themes/colored/modules/checkbox.variables index 5fb6c6b49f..b39950b386 100644 --- a/src/themes/colored/modules/checkbox.variables +++ b/src/themes/colored/modules/checkbox.variables @@ -25,5 +25,4 @@ /* Handle */ @handleBackground: @white @subtleGradient; @handleBoxShadow: - 0 0 0 1px @selectedBorderColor inset -; + 0 0 0 1px @selectedBorderColor inset; diff --git a/src/themes/default/collections/form.variables b/src/themes/default/collections/form.variables index f8d7074b5f..70907c8765 100644 --- a/src/themes/default/collections/form.variables +++ b/src/themes/default/collections/form.variables @@ -37,8 +37,7 @@ @inputColor: @textColor; @inputTransition: color @defaultDuration @defaultEasing, - border-color @defaultDuration @defaultEasing -; + border-color @defaultDuration @defaultEasing; @inputBoxShadow: 0 0 0 0 transparent inset; /* Select */ diff --git a/src/themes/default/collections/menu.variables b/src/themes/default/collections/menu.variables index 4464865ce2..b5e36f051c 100644 --- a/src/themes/default/collections/menu.variables +++ b/src/themes/default/collections/menu.variables @@ -27,8 +27,7 @@ @itemTransition: background @defaultDuration @defaultEasing, box-shadow @defaultDuration @defaultEasing, - color @defaultDuration @defaultEasing -; + color @defaultDuration @defaultEasing; @itemFontWeight: @normal; @itemTextColor: @textColor; @@ -431,8 +430,7 @@ @attachedBorder: @borderWidth solid @solidBorderColor; @attachedBottomBoxShadow: @boxShadow, - @attachedBoxShadow -; + @attachedBoxShadow; /* Resize large sizes */ @mini: @11px; diff --git a/src/themes/default/collections/message.variables b/src/themes/default/collections/message.variables index 5dc90899b4..7262926ed9 100644 --- a/src/themes/default/collections/message.variables +++ b/src/themes/default/collections/message.variables @@ -21,15 +21,13 @@ @shadowShadow: 0 0 0 0 rgba(0, 0, 0, 0); @boxShadow: @borderShadow, - @shadowShadow -; + @shadowShadow; @transition: opacity @defaultDuration @defaultEasing, color @defaultDuration @defaultEasing, background @defaultDuration @defaultEasing, - box-shadow @defaultDuration @defaultEasing -; + box-shadow @defaultDuration @defaultEasing; /* Header */ @headerFontSize: @relativeLarge; @@ -75,154 +73,118 @@ @attachedBoxShadow: 0 0 0 @borderWidth @borderColor inset; @attachedBottomBoxShadow: @attachedBoxShadow, - @subtleShadow -; + @subtleShadow; /* Floating */ @floatingBoxShadow: @borderShadow, - @floatingShadow -; + @floatingShadow; /* Colors */ @redBoxShadow: 0 0 0 @borderWidth @redBorderColor inset, - @shadowShadow -; + @shadowShadow; @redBoxFloatingShadow: 0 0 0 @borderWidth @redBorderColor inset, - @floatingShadow -; + @floatingShadow; @orangeBoxShadow: 0 0 0 @borderWidth @orangeBorderColor inset, - @shadowShadow -; + @shadowShadow; @orangeBoxFloatingShadow: 0 0 0 @borderWidth @orangeBorderColor inset, - @floatingShadow -; + @floatingShadow; @yellowBoxShadow: 0 0 0 @borderWidth @yellowBorderColor inset, - @shadowShadow -; + @shadowShadow; @yellowBoxFloatingShadow: 0 0 0 @borderWidth @yellowBorderColor inset, - @floatingShadow -; + @floatingShadow; @oliveBoxShadow: 0 0 0 @borderWidth @oliveBorderColor inset, - @shadowShadow -; + @shadowShadow; @oliveBoxFloatingShadow: 0 0 0 @borderWidth @oliveBorderColor inset, - @floatingShadow -; + @floatingShadow; @greenBoxShadow: 0 0 0 @borderWidth @greenBorderColor inset, - @shadowShadow -; + @shadowShadow; @greenBoxFloatingShadow: 0 0 0 @borderWidth @greenBorderColor inset, - @floatingShadow -; + @floatingShadow; @tealBoxShadow: 0 0 0 @borderWidth @tealBorderColor inset, - @shadowShadow -; + @shadowShadow; @tealBoxFloatingShadow: 0 0 0 @borderWidth @tealBorderColor inset, - @floatingShadow -; + @floatingShadow; @blueBoxShadow: 0 0 0 @borderWidth @blueBorderColor inset, - @shadowShadow -; + @shadowShadow; @blueBoxFloatingShadow: 0 0 0 @borderWidth @blueBorderColor inset, - @floatingShadow -; + @floatingShadow; @violetBoxShadow: 0 0 0 @borderWidth @violetBorderColor inset, - @shadowShadow -; + @shadowShadow; @violetBoxFloatingShadow: 0 0 0 @borderWidth @violetBorderColor inset, - @floatingShadow -; + @floatingShadow; @purpleBoxShadow: 0 0 0 @borderWidth @purpleBorderColor inset, - @shadowShadow -; + @shadowShadow; @purpleBoxFloatingShadow: 0 0 0 @borderWidth @purpleBorderColor inset, - @floatingShadow -; + @floatingShadow; @pinkBoxShadow: 0 0 0 @borderWidth @pinkBorderColor inset, - @shadowShadow -; + @shadowShadow; @pinkBoxFloatingShadow: 0 0 0 @borderWidth @pinkBorderColor inset, - @floatingShadow -; + @floatingShadow; @brownBoxShadow: 0 0 0 @borderWidth @brownBorderColor inset, - @shadowShadow -; + @shadowShadow; @brownBoxFloatingShadow: 0 0 0 @borderWidth @brownBorderColor inset, - @floatingShadow -; + @floatingShadow; /* Warning / Positive / Negative / Info */ @positiveBoxShadow: 0 0 0 @borderWidth @positiveBorderColor inset, - @shadowShadow -; + @shadowShadow; @positiveBoxFloatingShadow: 0 0 0 @borderWidth @positiveBorderColor inset, - @floatingShadow -; + @floatingShadow; @negativeBoxShadow: 0 0 0 @borderWidth @negativeBorderColor inset, - @shadowShadow -; + @shadowShadow; @negativeBoxFloatingShadow: 0 0 0 @borderWidth @negativeBorderColor inset, - @floatingShadow -; + @floatingShadow; @infoBoxShadow: 0 0 0 @borderWidth @infoBorderColor inset, - @shadowShadow -; + @shadowShadow; @infoBoxFloatingShadow: 0 0 0 @borderWidth @infoBorderColor inset, - @floatingShadow -; + @floatingShadow; @warningBoxShadow: 0 0 0 @borderWidth @warningBorderColor inset, - @shadowShadow -; + @shadowShadow; @warningBoxFloatingShadow: 0 0 0 @borderWidth @warningBorderColor inset, - @floatingShadow -; + @floatingShadow; @errorBoxShadow: 0 0 0 @borderWidth @errorBorderColor inset, - @shadowShadow -; + @shadowShadow; @errorBoxFloatingShadow: 0 0 0 @borderWidth @errorBorderColor inset, - @floatingShadow -; + @floatingShadow; @successBoxShadow: 0 0 0 @borderWidth @successBorderColor inset, - @shadowShadow -; + @shadowShadow; @successBoxFloatingShadow: 0 0 0 @borderWidth @successBorderColor inset, - @floatingShadow -; + @floatingShadow; @miniMessageSize: @relativeMini; @tinyMessageSize: @relativeTiny; diff --git a/src/themes/default/collections/table.variables b/src/themes/default/collections/table.variables index 3ce441519b..114f50ca7a 100644 --- a/src/themes/default/collections/table.variables +++ b/src/themes/default/collections/table.variables @@ -14,8 +14,7 @@ @borderRadius: @defaultBorderRadius; @transition: background @defaultDuration @defaultEasing, - color @defaultDuration @defaultEasing -; + color @defaultDuration @defaultEasing; @background: @white; @color: @textColor; @borderWidth: 1px; @@ -169,8 +168,7 @@ @attachedBorder: @borderWidth solid @solidBorderColor; @attachedBottomBoxShadow: @boxShadow, - @attachedBoxShadow -; + @attachedBoxShadow; /* Striped */ @stripedBackground: rgba(0, 0, 50, 0.02); diff --git a/src/themes/default/elements/button.variables b/src/themes/default/elements/button.variables index c258796f1d..1baa92c180 100644 --- a/src/themes/default/elements/button.variables +++ b/src/themes/default/elements/button.variables @@ -40,8 +40,7 @@ @borderBoxShadow: 0 0 0 @borderBoxShadowWidth @borderBoxShadowColor inset; @boxShadow: @borderBoxShadow, - @shadowBoxShadow -; + @shadowBoxShadow; /* Icon */ @iconHeight: auto; @@ -62,8 +61,7 @@ background-color @defaultDuration @defaultEasing, color @defaultDuration @defaultEasing, box-shadow @defaultDuration @defaultEasing, - background @defaultDuration @defaultEasing -; + background @defaultDuration @defaultEasing; /* @willChange: box-shadow, transform, opacity, color, background; @@ -108,8 +106,7 @@ @downPressedShadow: none; @downBoxShadow: @borderBoxShadow, - @downPressedShadow -; + @downPressedShadow; @downColor: @pressedTextColor; /* Active */ @@ -129,8 +126,7 @@ @loadingPointerEvents: auto; @loadingTransition: all 0s linear, - opacity @defaultDuration @defaultEasing -; + opacity @defaultDuration @defaultEasing; /* ------------------- Types @@ -208,8 +204,7 @@ @basicHoverTextColor: @hoveredTextColor; @basicHoverBoxShadow: 0 0 0 @basicBorderSize @selectedBorderColor inset, - 0 0 0 0 @borderColor inset -; + 0 0 0 0 @borderColor inset; /* Basic Focus */ @basicFocusBackground: @basicHoverBackground; @@ -221,8 +216,7 @@ @basicDownTextColor: @pressedTextColor; @basicDownBoxShadow: 0 0 0 @basicBorderSize rgba(0, 0, 0, 0.15) inset, - 0 1px 4px 0 @borderColor inset -; + 0 1px 4px 0 @borderColor inset; /* Basic Active */ @basicActiveBackground: @transparentBlack; diff --git a/src/themes/default/elements/icon.variables b/src/themes/default/elements/icon.variables index a428565bef..c4bc4c6f6c 100644 --- a/src/themes/default/elements/icon.variables +++ b/src/themes/default/elements/icon.variables @@ -2107,14 +2107,12 @@ Icons are order A-Z in their group, Solid, Outline, Thin (Pro only) and Brand -@cornerIconStroke -@cornerIconStroke 0 @white, @cornerIconStroke -@cornerIconStroke 0 @white, -@cornerIconStroke @cornerIconStroke 0 @white, - @cornerIconStroke @cornerIconStroke 0 @white -; + @cornerIconStroke @cornerIconStroke 0 @white; @cornerIconInvertedShadow: -@cornerIconStroke -@cornerIconStroke 0 @black, @cornerIconStroke -@cornerIconStroke 0 @black, -@cornerIconStroke @cornerIconStroke 0 @black, - @cornerIconStroke @cornerIconStroke 0 @black -; + @cornerIconStroke @cornerIconStroke 0 @black; @cornerOffset: 0; @borderedGroupCornerOffset: 1.15em; diff --git a/src/themes/default/elements/input.variables b/src/themes/default/elements/input.variables index 2e5a7105a6..9eaa5e709e 100644 --- a/src/themes/default/elements/input.variables +++ b/src/themes/default/elements/input.variables @@ -24,8 +24,7 @@ @borderRadius: @defaultBorderRadius; @transition: box-shadow @defaultDuration @defaultEasing, - border-color @defaultDuration @defaultEasing -; + border-color @defaultDuration @defaultEasing; /* ------------------- Types diff --git a/src/themes/default/elements/list.variables b/src/themes/default/elements/list.variables index 096a342951..b6bc68dfec 100644 --- a/src/themes/default/elements/list.variables +++ b/src/themes/default/elements/list.variables @@ -107,8 +107,7 @@ @linkListItemDownColor: @pressedTextColor; @linkListItemActiveColor: @selectedTextColor; @linkListTransition: - @defaultDuration color @defaultEasing -; + @defaultDuration color @defaultEasing; /* Inverted Link List */ @invertedLinkListItemColor: @invertedUnselectedTextColor; @@ -124,8 +123,7 @@ @selectionListTransition: @defaultDuration color @defaultEasing, @defaultDuration padding-left @defaultEasing, - @defaultDuration background-color @defaultEasing -; + @defaultDuration background-color @defaultEasing; /* Selection List States */ @selectionListBackground: transparent; @@ -153,8 +151,7 @@ @animatedListTransition: @animatedDuration color @defaultEasing @animatedDelay, @animatedDuration padding-left @defaultEasing @animatedDelay, - @animatedDuration background-color @defaultEasing @animatedDelay -; + @animatedDuration background-color @defaultEasing @animatedDelay; @animatedListIndent: 1em; /* Bulleted */ diff --git a/src/themes/default/elements/segment.variables b/src/themes/default/elements/segment.variables index 4229229e05..143c3198c7 100644 --- a/src/themes/default/elements/segment.variables +++ b/src/themes/default/elements/segment.variables @@ -106,8 +106,7 @@ @attachedBorder: @borderWidth solid @solidBorderColor; @attachedBottomBoxShadow: @boxShadow, - @attachedBoxShadow -; + @attachedBoxShadow; /* Inverted */ @invertedBackground: @black; @@ -137,8 +136,7 @@ linear-gradient( rgba(255, 255, 255, @secondaryInvertedLightness) 0, rgba(255, 255, 255, @secondaryInvertedLightness) 100% - ) -; + ); @secondaryInvertedColor: @invertedMutedTextColor; @tertiaryInvertedLightness: 0.35; @@ -147,6 +145,5 @@ linear-gradient( rgba(255, 255, 255, @tertiaryInvertedLightness) 0, rgba(255, 255, 255, @tertiaryInvertedLightness) 100% - ) -; + ); @tertiaryInvertedColor: @invertedMutedTextColor; diff --git a/src/themes/default/elements/step.variables b/src/themes/default/elements/step.variables index 8820676b33..d8c7e8c400 100644 --- a/src/themes/default/elements/step.variables +++ b/src/themes/default/elements/step.variables @@ -27,8 +27,7 @@ background-color @defaultDuration @defaultEasing, opacity @defaultDuration @defaultEasing, color @defaultDuration @defaultEasing, - box-shadow @defaultDuration @defaultEasing -; + box-shadow @defaultDuration @defaultEasing; @lineHeight: @relativeLarge; @alignItems: center; @justifyContent: center; diff --git a/src/themes/default/globals/site.variables b/src/themes/default/globals/site.variables index f62654d91f..12d054b9d8 100755 --- a/src/themes/default/globals/site.variables +++ b/src/themes/default/globals/site.variables @@ -546,124 +546,94 @@ @primaryBoxShadow: 0 0 0 @borderWidth @primaryBorderColor inset, - @shadowShadow -; + @shadowShadow; @primaryBoxFloatingShadow: 0 0 0 @borderWidth @primaryBorderColor inset, - @floatingShadow -; + @floatingShadow; @secondaryBoxShadow: 0 0 0 @borderWidth @secondaryBorderColor inset, - @shadowShadow -; + @shadowShadow; @secondaryBoxFloatingShadow: 0 0 0 @borderWidth @secondaryBorderColor inset, - @floatingShadow -; + @floatingShadow; @redBoxShadow: 0 0 0 @borderWidth @redBorderColor inset, - @shadowShadow -; + @shadowShadow; @redBoxFloatingShadow: 0 0 0 @borderWidth @redBorderColor inset, - @floatingShadow -; + @floatingShadow; @orangeBoxShadow: 0 0 0 @borderWidth @orangeBorderColor inset, - @shadowShadow -; + @shadowShadow; @orangeBoxFloatingShadow: 0 0 0 @borderWidth @orangeBorderColor inset, - @floatingShadow -; + @floatingShadow; @yellowBoxShadow: 0 0 0 @borderWidth @yellowBorderColor inset, - @shadowShadow -; + @shadowShadow; @yellowBoxFloatingShadow: 0 0 0 @borderWidth @yellowBorderColor inset, - @floatingShadow -; + @floatingShadow; @oliveBoxShadow: 0 0 0 @borderWidth @oliveBorderColor inset, - @shadowShadow -; + @shadowShadow; @oliveBoxFloatingShadow: 0 0 0 @borderWidth @oliveBorderColor inset, - @floatingShadow -; + @floatingShadow; @greenBoxShadow: 0 0 0 @borderWidth @greenBorderColor inset, - @shadowShadow -; + @shadowShadow; @greenBoxFloatingShadow: 0 0 0 @borderWidth @greenBorderColor inset, - @floatingShadow -; + @floatingShadow; @tealBoxShadow: 0 0 0 @borderWidth @tealBorderColor inset, - @shadowShadow -; + @shadowShadow; @tealBoxFloatingShadow: 0 0 0 @borderWidth @tealBorderColor inset, - @floatingShadow -; + @floatingShadow; @blueBoxShadow: 0 0 0 @borderWidth @blueBorderColor inset, - @shadowShadow -; + @shadowShadow; @blueBoxFloatingShadow: 0 0 0 @borderWidth @blueBorderColor inset, - @floatingShadow -; + @floatingShadow; @violetBoxShadow: 0 0 0 @borderWidth @violetBorderColor inset, - @shadowShadow -; + @shadowShadow; @violetBoxFloatingShadow: 0 0 0 @borderWidth @violetBorderColor inset, - @floatingShadow -; + @floatingShadow; @purpleBoxShadow: 0 0 0 @borderWidth @purpleBorderColor inset, - @shadowShadow -; + @shadowShadow; @purpleBoxFloatingShadow: 0 0 0 @borderWidth @purpleBorderColor inset, - @floatingShadow -; + @floatingShadow; @pinkBoxShadow: 0 0 0 @borderWidth @pinkBorderColor inset, - @shadowShadow -; + @shadowShadow; @pinkBoxFloatingShadow: 0 0 0 @borderWidth @pinkBorderColor inset, - @floatingShadow -; + @floatingShadow; @brownBoxShadow: 0 0 0 @borderWidth @brownBorderColor inset, - @shadowShadow -; + @shadowShadow; @brownBoxFloatingShadow: 0 0 0 @borderWidth @brownBorderColor inset, - @floatingShadow -; + @floatingShadow; @greyBoxShadow: 0 0 0 @borderWidth @greyBorderColor inset, - @shadowShadow -; + @shadowShadow; @greyBoxFloatingShadow: 0 0 0 @borderWidth @greyBorderColor inset, - @floatingShadow -; + @floatingShadow; @blackBoxShadow: 0 0 0 @borderWidth @blackBorderColor inset, - @shadowShadow -; + @shadowShadow; @blackBoxFloatingShadow: 0 0 0 @borderWidth @blackBorderColor inset, - @floatingShadow -; + @floatingShadow; /* ------------------- Alpha Colors @@ -687,12 +657,10 @@ /* Differentiating Layers */ @subtleShadow: - 0 1px 2px 0 @borderColor -; + 0 1px 2px 0 @borderColor; @floatingShadow: 0 2px 4px 0 rgba(34, 36, 38, 0.12), - 0 2px 10px 0 rgba(34, 36, 38, 0.15) -; + 0 2px 10px 0 rgba(34, 36, 38, 0.15); /******************************* Power-User @@ -1094,8 +1062,7 @@ /* --- Shadows --- */ @floatingShadowHover: 0 2px 4px 0 rgba(34, 36, 38, 0.15), - 0 2px 10px 0 rgba(34, 36, 38, 0.25) -; + 0 2px 10px 0 rgba(34, 36, 38, 0.25); /* --- Colors --- */ @primaryColorHover: saturate(darken(@primaryColor, 5), 10, relative); diff --git a/src/themes/default/modules/accordion.variables b/src/themes/default/modules/accordion.variables index 3ca90f2b15..e7b0dc911f 100644 --- a/src/themes/default/modules/accordion.variables +++ b/src/themes/default/modules/accordion.variables @@ -22,8 +22,7 @@ @iconPadding: 0; @iconTransition: transform @defaultDuration @defaultEasing, - opacity @defaultDuration @defaultEasing -; + opacity @defaultDuration @defaultEasing; @iconVerticalAlign: baseline; @iconTransform: none; @iconTransformRight: @menuIconTransform; @@ -61,8 +60,7 @@ @styledBorderRadius: @defaultBorderRadius; @styledBoxShadow: @subtleShadow, - 0 0 0 1px @borderColor -; + 0 0 0 1px @borderColor; /* Content */ @styledContentMargin: 0; @@ -81,8 +79,7 @@ @styledTitleBorder: 1px solid @borderColor; @styledTitleTransition: background @defaultDuration @defaultEasing, - color @defaultDuration @defaultEasing -; + color @defaultDuration @defaultEasing; /* Styled Title States */ @styledTitleHoverBackground: transparent; @@ -103,8 +100,7 @@ @invertedStyledTitleBorder: 1px solid @whiteBorderColor; @invertedStyledBoxShadow: @subtleShadow, - 0 0 0 1px @whiteBorderColor -; + 0 0 0 1px @whiteBorderColor; @invertedStyledTitleHoverBackground: transparent; @invertedStyledTitleHoverColor: @invertedTextColor; @invertedStyledActiveTitleBackground: transparent; diff --git a/src/themes/default/modules/checkbox.variables b/src/themes/default/modules/checkbox.variables index 61e5370f6d..ade25f3daf 100644 --- a/src/themes/default/modules/checkbox.variables +++ b/src/themes/default/modules/checkbox.variables @@ -17,8 +17,7 @@ border @defaultDuration @defaultEasing, opacity @defaultDuration @defaultEasing, transform @defaultDuration @defaultEasing, - box-shadow @defaultDuration @defaultEasing -; + box-shadow @defaultDuration @defaultEasing; /* Checkmark */ @checkboxCheckFontSize: 14px; @@ -106,8 +105,7 @@ @handleBackground: @white @subtleGradient; @handleBoxShadow: @subtleShadow, - 0 0 0 1px @borderColor inset -; + 0 0 0 1px @borderColor inset; /* Slider */ @sliderHandleSize: 1.5rem; @@ -156,12 +154,10 @@ @toggleHandleOffset: 0; @toggleHandleTransition: background @toggleTransitionDuration @defaultEasing, - left @toggleTransitionDuration @defaultEasing -; + left @toggleTransitionDuration @defaultEasing; @toggleHandleTransitionRightAligned: background @toggleTransitionDuration @defaultEasing, - right @toggleTransitionDuration @defaultEasing -; + right @toggleTransitionDuration @defaultEasing; @toggleLaneBackground: @transparentBlack; @toggleLaneHeight: @toggleHandleSize; diff --git a/src/themes/default/modules/dimmer.variables b/src/themes/default/modules/dimmer.variables index 6833742b75..9230306816 100644 --- a/src/themes/default/modules/dimmer.variables +++ b/src/themes/default/modules/dimmer.variables @@ -12,8 +12,7 @@ @duration: 0.5s; @transition: - all @duration linear -; + all @duration linear; @zIndex: 1000; @textAlign: center; @verticalAlign: middle; diff --git a/src/themes/default/modules/dropdown.variables b/src/themes/default/modules/dropdown.variables index 8bec1efae3..4eb80072a1 100755 --- a/src/themes/default/modules/dropdown.variables +++ b/src/themes/default/modules/dropdown.variables @@ -8,8 +8,7 @@ @transition: box-shadow @defaultDuration @defaultEasing, - width @defaultDuration @defaultEasing -; + width @defaultDuration @defaultEasing; @borderRadius: @defaultBorderRadius; @raisedShadow: 0 2px 3px 0 @borderColor; diff --git a/src/themes/default/modules/embed.variables b/src/themes/default/modules/embed.variables index f1d132c186..4dd48541bd 100644 --- a/src/themes/default/modules/embed.variables +++ b/src/themes/default/modules/embed.variables @@ -24,12 +24,10 @@ @iconSize: 6rem; @iconTransition: opacity @transitionDuration @transitionEasing, - color @transitionDuration @transitionEasing -; + color @transitionDuration @transitionEasing; @iconColor: @white; @iconShadow: - 0 2px 10px rgba(34, 36, 38, 0.2) -; + 0 2px 10px rgba(34, 36, 38, 0.2); @iconZIndex: 10; /* ------------------- diff --git a/src/themes/default/modules/modal.variables b/src/themes/default/modules/modal.variables index 2adc8cfbda..5236f6865e 100755 --- a/src/themes/default/modules/modal.variables +++ b/src/themes/default/modules/modal.variables @@ -9,8 +9,7 @@ @transformOrigin: 50% 25%; @boxShadow: 1px 3px 3px 0 rgba(0, 0, 0, 0.2), - 1px 3px 15px 2px rgba(0, 0, 0, 0.2) -; + 1px 3px 15px 2px rgba(0, 0, 0, 0.2); /* Close Icon */ @closeOpacity: 0.8; @@ -28,8 +27,7 @@ -1px -1px 2px rgba(0, 0, 0, 0.3), 1px -1px 2px rgba(0, 0, 0, 0.3), -1px 2px 2px rgba(0, 0, 0, 0.3), - 1px 2px 2px rgba(0, 0, 0, 0.3) -; + 1px 2px 2px rgba(0, 0, 0, 0.3); /* Header */ @headerMargin: 0; @@ -261,5 +259,4 @@ -1px -1px 2px rgba(255, 255, 255, 0.3), 1px -1px 2px rgba(255, 255, 255, 0.3), -1px 2px 2px rgba(255, 255, 255, 0.3), - 1px 2px 2px rgba(255, 255, 255, 0.3) -; + 1px 2px 2px rgba(255, 255, 255, 0.3); diff --git a/src/themes/default/modules/progress.variables b/src/themes/default/modules/progress.variables index 06b3fe162c..b65cd16c7a 100644 --- a/src/themes/default/modules/progress.variables +++ b/src/themes/default/modules/progress.variables @@ -26,8 +26,7 @@ @barTransitionDuration: @defaultDuration; @barTransition: width @barTransitionDuration @barTransitionEasing, - background-color @barTransitionDuration @barTransitionEasing -; + background-color @barTransitionDuration @barTransitionEasing; @barInitialWidth: 0; @barMinWidth: 2em; diff --git a/src/themes/default/modules/rating.variables b/src/themes/default/modules/rating.variables index 844ae240f3..0c15babf77 100644 --- a/src/themes/default/modules/rating.variables +++ b/src/themes/default/modules/rating.variables @@ -13,8 +13,7 @@ opacity @defaultDuration @defaultEasing, background @defaultDuration @defaultEasing, text-shadow @defaultDuration @defaultEasing, - color @defaultDuration @defaultEasing -; + color @defaultDuration @defaultEasing; /* ------------------- Types diff --git a/src/themes/default/modules/search.variables b/src/themes/default/modules/search.variables index f5b573a7db..6443f85201 100644 --- a/src/themes/default/modules/search.variables +++ b/src/themes/default/modules/search.variables @@ -16,8 +16,7 @@ background-color @defaultDuration @defaultEasing, color @defaultDuration @defaultEasing, box-shadow @defaultDuration @defaultEasing, - border-color @defaultDuration @defaultEasing -; + border-color @defaultDuration @defaultEasing; @promptBoxShadow: 0 0 0 0 transparent inset; /* Mobile */ @@ -133,8 +132,7 @@ @selectionCloseTop: 0; @selectionCloseTransition: color @defaultDuration @defaultEasing, - opacity @defaultDuration @defaultEasing -; + opacity @defaultDuration @defaultEasing; @selectionCloseRight: 0; @selectionCloseIconOpacity: 0.8; @selectionCloseIconColor: ""; @@ -149,8 +147,7 @@ @categoryDivider: 1px solid @internalBorderColor; @categoryTransition: background @defaultDuration @defaultEasing, - border-color @defaultDuration @defaultEasing -; + border-color @defaultDuration @defaultEasing; @categoryResultsWidth: 28em; diff --git a/src/themes/default/modules/shape.variables b/src/themes/default/modules/shape.variables index 9a19764b2f..5d8f439570 100644 --- a/src/themes/default/modules/shape.variables +++ b/src/themes/default/modules/shape.variables @@ -17,8 +17,7 @@ transform @duration @easing, left @duration @easing, width @duration @easing, - height @duration @easing -; + height @duration @easing; @sideTransition: opacity @duration @easing; @backfaceVisibility: hidden; diff --git a/src/themes/default/views/card.variables b/src/themes/default/views/card.variables index 0bc53ac868..10e09791f2 100644 --- a/src/themes/default/views/card.variables +++ b/src/themes/default/views/card.variables @@ -23,14 +23,12 @@ @borderShadow: 0 0 0 @borderWidth @solidBorderColor; @boxShadow: @shadowBoxShadow, - @borderShadow -; + @borderShadow; @border: none; @zIndex: ""; @transition: box-shadow @defaultDuration @defaultEasing, - transform @defaultDuration @defaultEasing -; + transform @defaultDuration @defaultEasing; /* Card Group */ @horizontalSpacing: 1em; @@ -168,8 +166,7 @@ @shadowHoverBoxShadow: 0 @shadowDistance @linkHoverRaiseDistance 0 @solidSelectedBorderColor; @linkHoverBoxShadow: @shadowHoverBoxShadow, - @borderShadow -; + @borderShadow; /* Horizontal */ @horizontalMinWidth: 270px; @@ -179,20 +176,16 @@ /* Raised */ @raisedShadow: @borderShadow, - @floatingShadow -; + @floatingShadow; @raisedShadowHover: @borderShadow, - @floatingShadowHover -; + @floatingShadowHover; /* Basic Raised */ @basicRaisedShadow: - @floatingShadow -; + @floatingShadow; @basicRaisedShadowHover: - @floatingShadowHover -; + @floatingShadowHover; /* Card Count */ @wideCardSpacing: 1em; @@ -258,5 +251,4 @@ @invertedLinkHoverBackground: @black; @invertedBoxShadow: 0 @shadowDistance 3px 0 @solidWhiteBorderColor, - 0 0 0 @borderWidth @solidWhiteBorderColor -; + 0 0 0 @borderWidth @solidWhiteBorderColor; diff --git a/src/themes/github/collections/form.variables b/src/themes/github/collections/form.variables index bf8c17f445..fce90d9450 100644 --- a/src/themes/github/collections/form.variables +++ b/src/themes/github/collections/form.variables @@ -21,8 +21,7 @@ @inputFocusBackground: #fff; @inputFocusBoxShadow: 0 1px 2px rgba(0, 0, 0, 0.075) inset, - 0 0 5px rgba(81, 167, 232, 0.5) -; + 0 0 5px rgba(81, 167, 232, 0.5); @inputFocusBorderColor: #51a7e8; @inputFocusBorderRadius: @inputBorderRadius; diff --git a/src/themes/github/collections/menu.variables b/src/themes/github/collections/menu.variables index 5cc05bb5e8..21bfde45bf 100644 --- a/src/themes/github/collections/menu.variables +++ b/src/themes/github/collections/menu.variables @@ -55,6 +55,5 @@ @invertedBackground: @black linear-gradient(rgba(255, 255, 255, 0.05), rgba(0, 0, 0, 0)); @invertedBoxShadow: 0 1px 2px 0 rgba(0, 0, 0, 0.15), - 0 0 0 1px rgba(255, 255, 255, 0.15) -; + 0 0 0 1px rgba(255, 255, 255, 0.15); @secondaryVerticalPadding: 0.75em; diff --git a/src/themes/github/collections/message.variables b/src/themes/github/collections/message.variables index 76cf3dbb4f..a1175e93e0 100644 --- a/src/themes/github/collections/message.variables +++ b/src/themes/github/collections/message.variables @@ -1,8 +1,7 @@ @background: linear-gradient(rgba(255, 255, 255, 0.1), rgba(0, 0, 0, 0.05)) #fefefe; @boxShadow: 0 0 0 1px rgba(255, 255, 255, 0.3) inset, - 0 0 0 1px rgba(0, 0, 0, 0.2) inset -; + 0 0 0 1px rgba(0, 0, 0, 0.2) inset; @verticalPadding: 15px; @horizontalPadding: 15px; @@ -15,8 +14,7 @@ @floatingBoxShadow: 0 0 0 1px rgba(0, 0, 0, 0.1) inset, 0 2px 3px 0 rgba(0, 0, 0, 0.1), - 0 0 0 1px rgba(0, 0, 0, 0.05) inset -; + 0 0 0 1px rgba(0, 0, 0, 0.05) inset; @infoBorderColor: #97c1da; @errorBorderColor: #da9797; diff --git a/src/themes/github/elements/button.variables b/src/themes/github/elements/button.variables index 7c4eadf372..4d9fca30f0 100644 --- a/src/themes/github/elements/button.variables +++ b/src/themes/github/elements/button.variables @@ -21,15 +21,13 @@ @boxShadow: 0 -1px 0 0 rgba(0, 0, 0, 0.05) inset, 0 0 0 1px rgba(0, 0, 0, 0.13) inset, - 0 1px 3px rgba(0, 0, 0, 0.05) -; + 0 1px 3px rgba(0, 0, 0, 0.05); @coloredBackgroundImage: linear-gradient(rgba(255, 255, 255, 0.2), rgba(0, 0, 0, 0.2)); @coloredBoxShadow: 0 -1px 0 0 rgba(0, 0, 0, 0.05) inset, 0 0 0 1px rgba(0, 0, 0, 0.1) inset, - 0 1px 3px rgba(0, 0, 0, 0.05) -; + 0 1px 3px rgba(0, 0, 0, 0.05); @hoverBackgroundColor: #e0e0e0; @hoverBackgroundImage: linear-gradient(rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.08)); @@ -40,15 +38,13 @@ @downBoxShadow: 0 -1px 0 0 rgba(0, 0, 0, 0.05) inset, 0 0 0 1px rgba(0, 0, 0, 0.13) inset, - 0 3px 5px rgba(0, 0, 0, 0.15) inset !important -; + 0 3px 5px rgba(0, 0, 0, 0.15) inset !important; @activeBackgroundColor: #dfdfdf; @activeBackgroundImage: none; @activeBoxShadow: 0 -1px 0 0 rgba(0, 0, 0, 0.05) inset, 0 0 0 1px rgba(0, 0, 0, 0.13) inset, - 0 3px 5px rgba(0, 0, 0, 0.1) inset !important -; + 0 3px 5px rgba(0, 0, 0, 0.1) inset !important; @labeledIconBackgroundColor: transparent; @labeledIconBorder: transparent; diff --git a/src/themes/github/elements/input.variables b/src/themes/github/elements/input.variables index 6a842b563a..1fc57658c8 100644 --- a/src/themes/github/elements/input.variables +++ b/src/themes/github/elements/input.variables @@ -12,5 +12,4 @@ @focusBorderColor: #51a7e8; @focusBoxShadow: 0 1px 2px rgba(0, 0, 0, 0.075) inset, - 0 0 5px rgba(81, 167, 232, 0.5) -; + 0 0 5px rgba(81, 167, 232, 0.5); diff --git a/src/themes/github/modules/dropdown.variables b/src/themes/github/modules/dropdown.variables index b5345b07b5..c4d9377cd0 100644 --- a/src/themes/github/modules/dropdown.variables +++ b/src/themes/github/modules/dropdown.variables @@ -3,8 +3,7 @@ *******************************/ @transition: - width @defaultDuration @defaultEasing -; + width @defaultDuration @defaultEasing; @menuPadding: 0; diff --git a/src/themes/material/elements/button.variables b/src/themes/material/elements/button.variables index eabf35aaed..e3db2e4820 100644 --- a/src/themes/material/elements/button.variables +++ b/src/themes/material/elements/button.variables @@ -32,8 +32,7 @@ background-color 0.3s @defaultEasing, color 0.3s @defaultEasing, box-shadow 0.3s @defaultEasing, - background 0.3s @defaultEasing -; + background 0.3s @defaultEasing; /* ------------------- State @@ -42,8 +41,7 @@ @hoverBackgroundColor: @white; @hoverBoxShadow: @borderBoxShadow, - 0 2px 3px 0 rgba(0, 0, 0, 0.2) !important -; + 0 2px 3px 0 rgba(0, 0, 0, 0.2) !important; @downBackgroundColor: @white; @downBackgroundImage: linear-gradient(rgba(0, 0, 0, 0.04), rgba(0, 0, 0, 0.04)); diff --git a/src/themes/raised/elements/button.variables b/src/themes/raised/elements/button.variables index 126ab45b5f..d5d2f99500 100644 --- a/src/themes/raised/elements/button.variables +++ b/src/themes/raised/elements/button.variables @@ -23,5 +23,4 @@ background-color @defaultDuration @defaultEasing, box-shadow @defaultDuration @defaultEasing, color @defaultDuration @defaultEasing, - background @defaultDuration @defaultEasing -; + background @defaultDuration @defaultEasing; diff --git a/src/themes/round/elements/button.variables b/src/themes/round/elements/button.variables index 91b7909edd..f04b2bc57f 100644 --- a/src/themes/round/elements/button.variables +++ b/src/themes/round/elements/button.variables @@ -12,8 +12,7 @@ @fontWeight: bold; @textColor: rgba(0, 0, 0, 0.6); @boxShadow: - 0 0 0 2px rgba(0, 0, 0, 0.2) inset -; + 0 0 0 2px rgba(0, 0, 0, 0.2) inset; /* Padding */ @verticalPadding: 1.25em; From 1e611926b06de3608d72054cad33a43b2a4884cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= Date: Tue, 20 Dec 2022 19:41:10 +0100 Subject: [PATCH 03/15] welcomed Prettier fixes --- src/definitions/elements/button.less | 8 ++++++-- src/definitions/elements/icon.less | 2 +- src/definitions/modules/toast.less | 4 +++- src/themes/default/elements/flag.variables | 6 +++--- src/themes/default/elements/placeholder.variables | 12 ++++++------ src/themes/default/modules/slider.variables | 4 +++- 6 files changed, 22 insertions(+), 14 deletions(-) diff --git a/src/definitions/elements/button.less b/src/definitions/elements/button.less index e0a454e71f..fc013c5da7 100755 --- a/src/definitions/elements/button.less +++ b/src/definitions/elements/button.less @@ -256,7 +256,9 @@ /* Vertical */ .ui.vertical.animated.button .visible.content, .ui.vertical.animated.button .hidden.content { - transition: top @animationDuration @animationEasing, transform @animationDuration @animationEasing; + transition: + top @animationDuration @animationEasing, + transform @animationDuration @animationEasing; } .ui.vertical.animated.button .visible.content { transform: translateY(0); @@ -282,7 +284,9 @@ /* Fade */ .ui.fade.animated.button .visible.content, .ui.fade.animated.button .hidden.content { - transition: opacity @animationDuration @animationEasing, transform @animationDuration @animationEasing; + transition: + opacity @animationDuration @animationEasing, + transform @animationDuration @animationEasing; } .ui.fade.animated.button .visible.content { left: auto; diff --git a/src/definitions/elements/icon.less b/src/definitions/elements/icon.less index c3f2f82bb0..df0540e1c3 100755 --- a/src/definitions/elements/icon.less +++ b/src/definitions/elements/icon.less @@ -527,7 +527,7 @@ and ((@variationIconBordered) or (@variationIconCircular)) { } } }); -}; +} & when (@variationIconDeprecated) { /* Deprecated *In/Out Naming Conflict) */ diff --git a/src/definitions/modules/toast.less b/src/definitions/modules/toast.less index cf29365925..645e239fe4 100644 --- a/src/definitions/modules/toast.less +++ b/src/definitions/modules/toast.less @@ -589,7 +589,9 @@ } .ui.hoverfloating.message:hover when (@variationToastMessage) and (@variationToastFloating) { - box-shadow: 0 0 0 1px inset, @floatingShadow; + box-shadow: + 0 0 0 1px inset, + @floatingShadow; } .ui.center.toast-container .toast-box, diff --git a/src/themes/default/elements/flag.variables b/src/themes/default/elements/flag.variables index 8a5f797759..dcf42db3fb 100644 --- a/src/themes/default/elements/flag.variables +++ b/src/themes/default/elements/flag.variables @@ -1159,7 +1159,7 @@ countrycode: sa; class: saudi_arabia; aliasClass: saudiarabia; - aliasClass2: saudi + aliasClass2: saudi; }; @1f1f8-1f1f3: { countrycode: sn; @@ -1579,7 +1579,7 @@ countrycode: sj; class: svalbard_and_jan_mayen; aliasClass: svalbard; - aliasClass2: jan_mayen + aliasClass2: jan_mayen; }; @1f1f9-1f1e6: { countrycode: ta; @@ -1598,7 +1598,7 @@ class: united_nations; aliasClass: united_nations; aliasClass2: false; - } + }; }; @size-map: { diff --git a/src/themes/default/elements/placeholder.variables b/src/themes/default/elements/placeholder.variables index 297dc4e4b8..270c05899d 100644 --- a/src/themes/default/elements/placeholder.variables +++ b/src/themes/default/elements/placeholder.variables @@ -35,14 +35,14 @@ @placeholderLoadingAnimationDuration: 2s; @placeholderLoadingGradientWidth: 1200px; @placeholderLoadingGradient: linear-gradient(to right, -rgba(0, 0, 0, 0.08) 0, -rgba(0, 0, 0, 0.15) 15%, -rgba(0, 0, 0, 0.08) 30% + rgba(0, 0, 0, 0.08) 0, + rgba(0, 0, 0, 0.15) 15%, + rgba(0, 0, 0, 0.08) 30% ); @placeholderInvertedLoadingGradient: linear-gradient(to right, -rgba(255, 255, 255, 0.08) 0, -rgba(255, 255, 255, 0.14) 15%, -rgba(255, 255, 255, 0.08) 30% + rgba(255, 255, 255, 0.08) 0, + rgba(255, 255, 255, 0.14) 15%, + rgba(255, 255, 255, 0.08) 30% ); /* Variations */ diff --git a/src/themes/default/modules/slider.variables b/src/themes/default/modules/slider.variables index 6d48e4aca6..67a2b7bb21 100644 --- a/src/themes/default/modules/slider.variables +++ b/src/themes/default/modules/slider.variables @@ -29,7 +29,9 @@ @thumbHeight: @height; @thumbBorderRadius: 100%; @thumbBackground: @white @subtleGradient; -@thumbShadow: @subtleShadow, 0 0 0 1px @borderColor inset; +@thumbShadow: + @subtleShadow, + 0 0 0 1px @borderColor inset; @thumbTransitionDuration: 0.3s; @thumbTransition: background @thumbTransitionDuration @defaultEasing; @thumbVerticalSliderOffset: 0.03em; From 2b6b59ea093cbaac26c423489a2e9be5e7f5d25a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= Date: Tue, 20 Dec 2022 21:39:02 +0100 Subject: [PATCH 04/15] fonts on multiple lines --- src/themes/amazon/elements/button.variables | 6 +- src/themes/bookish/elements/header.variables | 5 +- .../bootstrap3/elements/button.variables | 6 +- src/themes/chubby/elements/button.variables | 5 +- src/themes/chubby/elements/header.variables | 7 +- src/themes/classic/elements/header.variables | 5 +- src/themes/default/globals/reset.overrides | 8 +- src/themes/default/globals/site.variables | 159 +++++++++++++++++- .../default/globals/variation.variables | 40 ++++- src/themes/flat/globals/site.variables | 14 +- src/themes/github/elements/button.variables | 6 +- .../material/collections/menu.variables | 5 +- src/themes/material/elements/button.variables | 5 +- src/themes/material/elements/header.variables | 5 +- src/themes/material/globals/site.variables | 14 +- src/themes/material/modules/modal.overrides | 5 +- src/themes/material/modules/modal.variables | 6 +- src/themes/rtl/globals/site.variables | 16 +- src/themes/twitter/elements/button.variables | 6 +- 19 files changed, 292 insertions(+), 31 deletions(-) diff --git a/src/themes/amazon/elements/button.variables b/src/themes/amazon/elements/button.variables index 8f8953263b..34fdae4533 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/bookish/elements/header.variables b/src/themes/bookish/elements/header.variables index 698f948bfa..11ae801668 100644 --- a/src/themes/bookish/elements/header.variables +++ b/src/themes/bookish/elements/header.variables @@ -2,7 +2,10 @@ Header -------------------- */ -@headerFont: "Karma", "Times New Roman", serif; +@headerFont: + "Karma", + "Times New Roman", + serif; @fontWeight: @normal; @iconSize: 1.5em; diff --git a/src/themes/bootstrap3/elements/button.variables b/src/themes/bootstrap3/elements/button.variables index 57c3207631..431f2ca832 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/button.variables b/src/themes/chubby/elements/button.variables index 0a20968019..b4a55bd748 100644 --- a/src/themes/chubby/elements/button.variables +++ b/src/themes/chubby/elements/button.variables @@ -3,7 +3,10 @@ -------------------- */ /* Button Variables */ -@pageFont: "Source Sans Pro", Arial, sans-serif; +@pageFont: + "Source Sans Pro", + Arial, + sans-serif; @textTransform: none; @fontWeight: @normal; 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/classic/elements/header.variables b/src/themes/classic/elements/header.variables index 99b8c3d381..528219cf96 100644 --- a/src/themes/classic/elements/header.variables +++ b/src/themes/classic/elements/header.variables @@ -6,7 +6,10 @@ Element -------------------- */ -@headerFont: "Open Sans", Arial, sans-serif; +@headerFont: + "Open Sans", + Arial, + sans-serif; @blockBackground: @offWhite @subtleGradient; @blockBoxShadow: @subtleShadow; diff --git a/src/themes/default/globals/reset.overrides b/src/themes/default/globals/reset.overrides index 93d5d68da8..f6e6bfb7cf 100755 --- a/src/themes/default/globals/reset.overrides +++ b/src/themes/default/globals/reset.overrides @@ -62,7 +62,9 @@ hr { */ pre { - font-family: monospace, monospace; /* 1 */ + font-family: + monospace, + monospace; /* 1 */ font-size: 1em; /* 2 */ } @@ -105,7 +107,9 @@ strong { code, kbd, samp { - font-family: monospace, monospace; /* 1 */ + font-family: + monospace, + monospace; /* 1 */ font-size: 1em; /* 2 */ } diff --git a/src/themes/default/globals/site.variables b/src/themes/default/globals/site.variables index 12d054b9d8..aa70a38880 100755 --- a/src/themes/default/globals/site.variables +++ b/src/themes/default/globals/site.variables @@ -14,15 +14,162 @@ @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"; - -@headerFont: @fontName, @fallbackFonts; -@pageFont: @fontName, @fallbackFonts; +@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; @fontDisplay: swap; @textRendering: optimizeLegibility; -@unicodeRangeLatin: U+0000, U+000D, U+0020-007E, U+00A0-017F, U+0192, U+0218-021B, U+0237, U+02C6-02C7, U+02C9, U+02D8-02DD, U+0394, U+03A9, U+03BC, U+03C0, U+1E80-1E85, U+2010, U+2013-2014, U+2018-201A, U+201C-201E, U+2020-2022, U+2026, U+2030, U+2039-203A, U+2044, U+20A3-20A4, U+20A7, U+20AC, U+2113, U+2122, U+2126, U+212E, U+2202, U+2206, U+220F, U+2211-2212, U+2215, U+2219-221A, U+221E, U+222B, U+2248, U+2260, U+2264-2265, U+25CA, U+F8FF, U+FB00-FB04; -@unicodeRangeSupplement: U+0180-0191, U+0193-0217, U+021C-0236, U+0238-02C5, U+02C8, U+02CA-02D7, U+02DE-036F, U+0374-0375, U+037A-037E, U+0384-038A, U+038C, U+038E-0393, U+0395-03A1, U+03A3-03A8, U+03AA-03BB, U+03BD-03BF, U+03C1-03CE, U+03D0-0486, U+0488-0513, U+1D00-1DCA, U+1DFE-1E7F, U+1E86-1E9B, U+1E9E, U+1EA0-1EF9, U+1F00-1F15, U+1F18-1F1D, U+1F20-1F45, U+1F48-1F4D, U+1F50-1F57, U+1F59, U+1F5B, U+1F5D, U+1F5F-1F7D, U+1F80-1FB4, U+1FB6-1FC4, U+1FC6-1FD3, U+1FD6-1FDB, U+1FDD-1FEF, U+1FF2-1FF4, U+1FF6-1FFE, U+2000-200F, U+2012, U+2015-2017, U+201B, U+201F, U+202F, U+2034, U+203C-203E, U+205E-205F, U+2070-2071, U+2074-2094, U+20A0-20A2, U+20A5-20A6, U+20A8-20AB, U+20AD-20B5, U+20B8-20BA, U+20DD, U+2105, U+2116-2117, U+2120, U+2132, U+214D-214E, U+2153-215F, U+2183-2184, U+2190-2199, U+21A8, U+221F, U+2229, U+2261, U+2302, U+2310, U+2320-2321, U+2460-2473, U+24EA-24F4, U+24FF-2500, U+2502, U+250C, U+2510, U+2514, U+2518, U+2C60-2C6C, U+2C74-2C77; +@unicodeRangeLatin: + U+0000, + U+000D, + U+0020-007E, + U+00A0-017F, + U+0192, + U+0218-021B, + U+0237, + U+02C6-02C7, + U+02C9, + U+02D8-02DD, + U+0394, + U+03A9, + U+03BC, + U+03C0, + U+1E80-1E85, + U+2010, + U+2013-2014, + U+2018-201A, + U+201C-201E, + U+2020-2022, + U+2026, + U+2030, + U+2039-203A, + U+2044, + U+20A3-20A4, + U+20A7, + U+20AC, + U+2113, + U+2122, + U+2126, + U+212E, + U+2202, + U+2206, + U+220F, + U+2211-2212, + U+2215, + U+2219-221A, + U+221E, + U+222B, + U+2248, + U+2260, + U+2264-2265, + U+25CA, + U+F8FF, + U+FB00-FB04; +@unicodeRangeSupplement: + U+0180-0191, + U+0193-0217, + U+021C-0236, + U+0238-02C5, + U+02C8, + U+02CA-02D7, + U+02DE-036F, + U+0374-0375, + U+037A-037E, + U+0384-038A, + U+038C, + U+038E-0393, + U+0395-03A1, + U+03A3-03A8, + U+03AA-03BB, + U+03BD-03BF, + U+03C1-03CE, + U+03D0-0486, + U+0488-0513, + U+1D00-1DCA, + U+1DFE-1E7F, + U+1E86-1E9B, + U+1E9E, + U+1EA0-1EF9, + U+1F00-1F15, + U+1F18-1F1D, + U+1F20-1F45, + U+1F48-1F4D, + U+1F50-1F57, + U+1F59, + U+1F5B, + U+1F5D, + U+1F5F-1F7D, + U+1F80-1FB4, + U+1FB6-1FC4, + U+1FC6-1FD3, + U+1FD6-1FDB, + U+1FDD-1FEF, + U+1FF2-1FF4, + U+1FF6-1FFE, + U+2000-200F, + U+2012, + U+2015-2017, + U+201B, + U+201F, + U+202F, + U+2034, + U+203C-203E, + U+205E-205F, + U+2070-2071, + U+2074-2094, + U+20A0-20A2, + U+20A5-20A6, + U+20A8-20AB, + U+20AD-20B5, + U+20B8-20BA, + U+20DD, + U+2105, + U+2116-2117, + U+2120, + U+2132, + U+214D-214E, + U+2153-215F, + U+2183-2184, + U+2190-2199, + U+21A8, + U+221F, + U+2229, + U+2261, + U+2302, + U+2310, + U+2320-2321, + U+2460-2473, + U+24EA-24F4, + U+24FF-2500, + U+2502, + U+250C, + U+2510, + U+2514, + U+2518, + U+2C60-2C6C, + U+2C74-2C77; @importFonts: true; @fonts: { diff --git a/src/themes/default/globals/variation.variables b/src/themes/default/globals/variation.variables index cc079887e1..60c57d2e08 100644 --- a/src/themes/default/globals/variation.variables +++ b/src/themes/default/globals/variation.variables @@ -3,10 +3,42 @@ ***********************************************************/ /* General */ -@variationAllSizes: mini, tiny, small, large, big, huge, massive; -@variationAllColors: primary, secondary, red, orange, yellow, olive, green, teal, blue, violet, purple, pink, brown, grey, black; -@variationAllStates: error, info, success, warning; -@variationAllConsequences: positive, negative, error, info, success, warning; +@variationAllSizes: + mini, + tiny, + small, + large, + big, + huge, + massive; +@variationAllColors: + primary, + secondary, + red, + orange, + yellow, + olive, + green, + teal, + blue, + violet, + purple, + pink, + brown, + grey, + black; +@variationAllStates: + error, + info, + success, + warning; +@variationAllConsequences: + positive, + negative, + error, + info, + success, + warning; /******************************* Elements diff --git a/src/themes/flat/globals/site.variables b/src/themes/flat/globals/site.variables index e54de73087..fd2940f879 100644 --- a/src/themes/flat/globals/site.variables +++ b/src/themes/flat/globals/site.variables @@ -13,8 +13,18 @@ Fonts -------------------- */ -@headerFont: "Open Sans", "Helvetica Neue", Arial, Helvetica, sans-serif; -@pageFont: "Open Sans", "Helvetica Neue", Arial, Helvetica, sans-serif; +@headerFont: + "Open Sans", + "Helvetica Neue", + Arial, + Helvetica, + sans-serif; +@pageFont: + "Open Sans", + "Helvetica Neue", + Arial, + Helvetica, + sans-serif; /* ------------------- Site Colors 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/material/collections/menu.variables b/src/themes/material/collections/menu.variables index 455a401e9f..05e26536aa 100644 --- a/src/themes/material/collections/menu.variables +++ b/src/themes/material/collections/menu.variables @@ -2,7 +2,10 @@ Menu *******************************/ -@fontFamily: "Roboto", Arial, sans-serif; +@fontFamily: + "Roboto", + Arial, + sans-serif; @boxShadow: 0 1px 6px rgba(0, 0, 0, 0.2); @dividerSize: 0; diff --git a/src/themes/material/elements/button.variables b/src/themes/material/elements/button.variables index e3db2e4820..7f1ac89d8e 100644 --- a/src/themes/material/elements/button.variables +++ b/src/themes/material/elements/button.variables @@ -7,7 +7,10 @@ -------------------- */ @googleFontName: "Roboto"; -@pageFont: "Roboto", Arial, sans-serif; +@pageFont: + "Roboto", + Arial, + sans-serif; @medium: 13px; diff --git a/src/themes/material/elements/header.variables b/src/themes/material/elements/header.variables index 76724657b3..2e7833019a 100644 --- a/src/themes/material/elements/header.variables +++ b/src/themes/material/elements/header.variables @@ -2,7 +2,10 @@ Header -------------------- */ -@headerFont: "Roboto", Arial, sans-serif; +@headerFont: + "Roboto", + Arial, + sans-serif; @fontWeight: normal; @iconSize: 2em; diff --git a/src/themes/material/globals/site.variables b/src/themes/material/globals/site.variables index bb414ec74a..04c2e41207 100644 --- a/src/themes/material/globals/site.variables +++ b/src/themes/material/globals/site.variables @@ -6,8 +6,18 @@ Fonts -------------------- */ -@headerFont: "Roboto", "Helvetica Neue", Arial, Helvetica, sans-serif; -@pageFont: "Roboto", "Helvetica Neue", Arial, Helvetica, sans-serif; +@headerFont: + "Roboto", + "Helvetica Neue", + Arial, + Helvetica, + sans-serif; +@pageFont: + "Roboto", + "Helvetica Neue", + Arial, + Helvetica, + sans-serif; @googleFontName: "Roboto"; /* ------------------- diff --git a/src/themes/material/modules/modal.overrides b/src/themes/material/modules/modal.overrides index 138622203e..a889890ec6 100644 --- a/src/themes/material/modules/modal.overrides +++ b/src/themes/material/modules/modal.overrides @@ -1,6 +1,9 @@ @import (css) url("https://fonts.googleapis.com/css2?family=Roboto"); .ui.modal .header { - font-family: Roboto, Arial, sans-serif !important; + font-family: + Roboto, + Arial, + sans-serif !important; font-weight: 400 !important; } diff --git a/src/themes/material/modules/modal.variables b/src/themes/material/modules/modal.variables index 756dfc4c25..9691c3baeb 100644 --- a/src/themes/material/modules/modal.variables +++ b/src/themes/material/modules/modal.variables @@ -5,7 +5,11 @@ @headerVerticalPadding: 1.7142rem; @headerHorizontalPadding: 1.7142rem; @headerFontWeight: 400; -@headerFontFamily: "Roboto", "Helvetica Neue", Arial, sans-serif; +@headerFontFamily: + "Roboto", + "Helvetica Neue", + Arial, + sans-serif; @headerBorder: none; @contentPadding: 1rem 2rem 2rem; diff --git a/src/themes/rtl/globals/site.variables b/src/themes/rtl/globals/site.variables index bc1c41e823..12f7141b70 100644 --- a/src/themes/rtl/globals/site.variables +++ b/src/themes/rtl/globals/site.variables @@ -9,5 +9,17 @@ @googleFontName: "Droid Sans"; /* Kufi imported in site.overrides */ -@headerFont: "Droid Arabic Kufi", "Droid Sans", "Helvetica Neue", Arial, Helvetica, sans-serif; -@pageFont: "Droid Arabic Kufi", "Droid Sans", "Helvetica Neue", Arial, Helvetica, sans-serif; +@headerFont: + "Droid Arabic Kufi", + "Droid Sans", + "Helvetica Neue", + Arial, + Helvetica, + sans-serif; +@pageFont: + "Droid Arabic Kufi", + "Droid Sans", + "Helvetica Neue", + Arial, + Helvetica, + sans-serif; 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; From 59e419ed9f018d97dc89ae1e1f19e7dee81054cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= Date: Tue, 20 Dec 2022 22:36:16 +0100 Subject: [PATCH 05/15] ok one line (no comma) --- src/definitions/elements/icon.less | 3 +-- src/themes/amazon/elements/button.variables | 3 +-- src/themes/bootstrap3/elements/button.variables | 3 +-- src/themes/colored/modules/checkbox.variables | 3 +-- src/themes/default/elements/list.variables | 3 +-- src/themes/default/globals/site.variables | 3 +-- src/themes/default/modules/dimmer.variables | 3 +-- src/themes/default/modules/embed.variables | 3 +-- src/themes/default/views/card.variables | 6 ++---- src/themes/github/modules/dropdown.variables | 3 +-- src/themes/round/elements/button.variables | 3 +-- 11 files changed, 12 insertions(+), 24 deletions(-) diff --git a/src/definitions/elements/icon.less b/src/definitions/elements/icon.less index df0540e1c3..7a60a26713 100755 --- a/src/definitions/elements/icon.less +++ b/src/definitions/elements/icon.less @@ -443,8 +443,7 @@ i.icons { } } -& when ((@variationIconGroups) or (@variationIconCorner)) -and ((@variationIconBordered) or (@variationIconCircular)) { +& when ((@variationIconGroups) or (@variationIconCorner)) and ((@variationIconBordered) or (@variationIconCircular)) { /************************************************* Bordered/circular with corner or group icons *************************************************/ diff --git a/src/themes/amazon/elements/button.variables b/src/themes/amazon/elements/button.variables index 34fdae4533..cb881dd31a 100644 --- a/src/themes/amazon/elements/button.variables +++ b/src/themes/amazon/elements/button.variables @@ -30,8 +30,7 @@ 0 0 0 1px #adb2bb inset; @coloredBackgroundImage: linear-gradient(rgba(255, 255, 255, 0.2), rgba(0, 0, 0, 0.2)); -@coloredBoxShadow: - 0 1px 0 0 rgba(255, 255, 255, 0.2) inset; +@coloredBoxShadow: 0 1px 0 0 rgba(255, 255, 255, 0.2) inset; @downBoxShadow: 0 0 0 1px #adb2bb inset, diff --git a/src/themes/bootstrap3/elements/button.variables b/src/themes/bootstrap3/elements/button.variables index 431f2ca832..a48eca02f8 100644 --- a/src/themes/bootstrap3/elements/button.variables +++ b/src/themes/bootstrap3/elements/button.variables @@ -50,8 +50,7 @@ /* States */ @hoverBackgroundColor: #e6e6e6; -@hoverBoxShadow: - 0 0 0 1px #adadad inset; +@hoverBoxShadow: 0 0 0 1px #adadad inset; @downBackgroundColor: #e6e6e6; @downBoxShadow: diff --git a/src/themes/colored/modules/checkbox.variables b/src/themes/colored/modules/checkbox.variables index b39950b386..d3a7688ba9 100644 --- a/src/themes/colored/modules/checkbox.variables +++ b/src/themes/colored/modules/checkbox.variables @@ -24,5 +24,4 @@ /* Handle */ @handleBackground: @white @subtleGradient; -@handleBoxShadow: - 0 0 0 1px @selectedBorderColor inset; +@handleBoxShadow: 0 0 0 1px @selectedBorderColor inset; diff --git a/src/themes/default/elements/list.variables b/src/themes/default/elements/list.variables index b6bc68dfec..34ddbe2cc4 100644 --- a/src/themes/default/elements/list.variables +++ b/src/themes/default/elements/list.variables @@ -106,8 +106,7 @@ @linkListItemHoverColor: @hoveredTextColor; @linkListItemDownColor: @pressedTextColor; @linkListItemActiveColor: @selectedTextColor; -@linkListTransition: - @defaultDuration color @defaultEasing; +@linkListTransition: @defaultDuration color @defaultEasing; /* Inverted Link List */ @invertedLinkListItemColor: @invertedUnselectedTextColor; diff --git a/src/themes/default/globals/site.variables b/src/themes/default/globals/site.variables index aa70a38880..f7c715cac1 100755 --- a/src/themes/default/globals/site.variables +++ b/src/themes/default/globals/site.variables @@ -803,8 +803,7 @@ @subtleGradient: linear-gradient(transparent, @transparentBlack); /* Differentiating Layers */ -@subtleShadow: - 0 1px 2px 0 @borderColor; +@subtleShadow: 0 1px 2px 0 @borderColor; @floatingShadow: 0 2px 4px 0 rgba(34, 36, 38, 0.12), 0 2px 10px 0 rgba(34, 36, 38, 0.15); diff --git a/src/themes/default/modules/dimmer.variables b/src/themes/default/modules/dimmer.variables index 9230306816..126ff136b8 100644 --- a/src/themes/default/modules/dimmer.variables +++ b/src/themes/default/modules/dimmer.variables @@ -11,8 +11,7 @@ @padding: 1em; @duration: 0.5s; -@transition: - all @duration linear; +@transition: all @duration linear; @zIndex: 1000; @textAlign: center; @verticalAlign: middle; diff --git a/src/themes/default/modules/embed.variables b/src/themes/default/modules/embed.variables index 4dd48541bd..07e396c76a 100644 --- a/src/themes/default/modules/embed.variables +++ b/src/themes/default/modules/embed.variables @@ -26,8 +26,7 @@ opacity @transitionDuration @transitionEasing, color @transitionDuration @transitionEasing; @iconColor: @white; -@iconShadow: - 0 2px 10px rgba(34, 36, 38, 0.2); +@iconShadow: 0 2px 10px rgba(34, 36, 38, 0.2); @iconZIndex: 10; /* ------------------- diff --git a/src/themes/default/views/card.variables b/src/themes/default/views/card.variables index 10e09791f2..1745a2d3a4 100644 --- a/src/themes/default/views/card.variables +++ b/src/themes/default/views/card.variables @@ -182,10 +182,8 @@ @floatingShadowHover; /* Basic Raised */ -@basicRaisedShadow: - @floatingShadow; -@basicRaisedShadowHover: - @floatingShadowHover; +@basicRaisedShadow: @floatingShadow; +@basicRaisedShadowHover: @floatingShadowHover; /* Card Count */ @wideCardSpacing: 1em; diff --git a/src/themes/github/modules/dropdown.variables b/src/themes/github/modules/dropdown.variables index c4d9377cd0..dddb3da09e 100644 --- a/src/themes/github/modules/dropdown.variables +++ b/src/themes/github/modules/dropdown.variables @@ -2,8 +2,7 @@ User Variable Overrides *******************************/ -@transition: - width @defaultDuration @defaultEasing; +@transition: width @defaultDuration @defaultEasing; @menuPadding: 0; diff --git a/src/themes/round/elements/button.variables b/src/themes/round/elements/button.variables index f04b2bc57f..0161ce087a 100644 --- a/src/themes/round/elements/button.variables +++ b/src/themes/round/elements/button.variables @@ -11,8 +11,7 @@ @backgroundImage: none; @fontWeight: bold; @textColor: rgba(0, 0, 0, 0.6); -@boxShadow: - 0 0 0 2px rgba(0, 0, 0, 0.2) inset; +@boxShadow: 0 0 0 2px rgba(0, 0, 0, 0.2) inset; /* Padding */ @verticalPadding: 1.25em; From bcd5307cebb83872ba46459cd37d3e15f8ae60b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= Date: Tue, 20 Dec 2022 22:37:30 +0100 Subject: [PATCH 06/15] ok multiple lines (/w comma) --- src/definitions/elements/button.less | 4 +++- src/definitions/modules/dropdown.less | 4 +++- src/definitions/modules/modal.less | 7 ++++++- src/definitions/modules/toast.less | 4 +++- src/themes/default/globals/variation.variables | 17 ++++++++++++++--- 5 files changed, 29 insertions(+), 7 deletions(-) diff --git a/src/definitions/elements/button.less b/src/definitions/elements/button.less index fc013c5da7..b8244be497 100755 --- a/src/definitions/elements/button.less +++ b/src/definitions/elements/button.less @@ -215,7 +215,9 @@ } .ui.animated.button .content { - will-change: transform, opacity; + will-change: + transform, + opacity; } .ui.animated.button .visible.content { position: relative; diff --git a/src/definitions/modules/dropdown.less b/src/definitions/modules/dropdown.less index ddffc671ee..ed1b9e372f 100755 --- a/src/definitions/modules/dropdown.less +++ b/src/definitions/modules/dropdown.less @@ -58,7 +58,9 @@ border-radius: @menuBorderRadius; transition: @menuTransition; z-index: @menuZIndex; - will-change: transform, opacity; + will-change: + transform, + opacity; } .ui.dropdown .menu > * { diff --git a/src/definitions/modules/modal.less b/src/definitions/modules/modal.less index eccf401b5f..09e74df4b3 100755 --- a/src/definitions/modules/modal.less +++ b/src/definitions/modules/modal.less @@ -33,7 +33,12 @@ flex: 0 0 auto; border-radius: @borderRadius; user-select: text; - will-change: top, left, margin, transform, opacity; + will-change: + top, + left, + margin, + transform, + opacity; } .ui.modal > :first-child:not(.close):not(.dimmer), diff --git a/src/definitions/modules/toast.less b/src/definitions/modules/toast.less index 645e239fe4..98a55f1adb 100644 --- a/src/definitions/modules/toast.less +++ b/src/definitions/modules/toast.less @@ -126,7 +126,9 @@ margin-bottom: @toastBoxMarginBottom; border-radius: @defaultBorderRadius; cursor: default; - will-change: transform, opacity; + will-change: + transform, + opacity; &:hover { opacity: @toastOpacityOnHover; } diff --git a/src/themes/default/globals/variation.variables b/src/themes/default/globals/variation.variables index 60c57d2e08..04831fa907 100644 --- a/src/themes/default/globals/variation.variables +++ b/src/themes/default/globals/variation.variables @@ -70,7 +70,9 @@ @variationButtonWrapping: true; @variationButtonWrapped: true; @variationButtonSpaced: true; -@variationButtonConsequences: positive, negative; +@variationButtonConsequences: + positive, + negative; @variationButtonSizes: @variationAllSizes; @variationButtonColors: @variationAllColors; @@ -113,7 +115,13 @@ @variationHeaderDividing: true; @variationHeaderBlock: true; @variationHeaderAttached: true; -@variationHeaderTags: h1, h2, h3, h4, h5, h6; +@variationHeaderTags: + h1, + h2, + h3, + h4, + h5, + h6; @variationHeaderSizes: @variationAllSizes; @variationHeaderColors: @variationAllColors; @@ -714,7 +722,10 @@ @variationSliderTicked: true; @variationSliderVertical: true; @variationSliderBasic: true; -@variationSliderSizes: small, large, big; +@variationSliderSizes: + small, + large, + big; @variationSliderColors: @variationAllColors; /* Tab */ From 24e5e29a708cc8593336373131f6eed6eea8dceb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= Date: Tue, 20 Dec 2022 22:42:30 +0100 Subject: [PATCH 07/15] font src /w if supportIE --- src/themes/default/elements/icon.variables | 9 +++----- src/themes/default/globals/site.variables | 24 +++++++-------------- src/themes/material/elements/icon.variables | 3 +-- 3 files changed, 12 insertions(+), 24 deletions(-) diff --git a/src/themes/default/elements/icon.variables b/src/themes/default/elements/icon.variables index c4bc4c6f6c..8d6be90b66 100644 --- a/src/themes/default/elements/icon.variables +++ b/src/themes/default/elements/icon.variables @@ -45,8 +45,7 @@ Icons are order A-Z in their group, Solid, Outline, Thin (Pro only) and Brand @fonts: { @solid: { font-family: @fontName; - src: url("@{fontPath}/@{fontName}.woff2") format("woff2") - if(@supportIE, e(",") url("@{fontPath}/@{fontName}.woff") format("woff")); + src: url("@{fontPath}/@{fontName}.woff2") format("woff2") if(@supportIE, e(",") url("@{fontPath}/@{fontName}.woff") format("woff")); font-style: normal; font-weight: @normal; font-display: block; @@ -56,8 +55,7 @@ Icons are order A-Z in their group, Solid, Outline, Thin (Pro only) and Brand }; @outline: { font-family: @outlineFontName; - src: url("@{fontPath}/@{outlineFontName}.woff2") format("woff2") - if(@supportIE, e(",") url("@{fontPath}/@{outlineFontName}.woff") format("woff")); + src: url("@{fontPath}/@{outlineFontName}.woff2") format("woff2") if(@supportIE, e(",") url("@{fontPath}/@{outlineFontName}.woff") format("woff")); font-style: normal; font-weight: @normal; font-display: block; @@ -67,8 +65,7 @@ Icons are order A-Z in their group, Solid, Outline, Thin (Pro only) and Brand }; @brand: { font-family: @brandFontName; - src: url("@{fontPath}/@{brandFontName}.woff2") format("woff2") - if(@supportIE, e(",") url("@{fontPath}/@{brandFontName}.woff") format("woff")); + src: url("@{fontPath}/@{brandFontName}.woff2") format("woff2") if(@supportIE, e(",") url("@{fontPath}/@{brandFontName}.woff") format("woff")); font-style: normal; font-weight: @normal; font-display: block; diff --git a/src/themes/default/globals/site.variables b/src/themes/default/globals/site.variables index f7c715cac1..1175c429c1 100755 --- a/src/themes/default/globals/site.variables +++ b/src/themes/default/globals/site.variables @@ -175,8 +175,7 @@ @fonts: { @regularLatin: { font-family: @fontName; - src: url("@{fontPath}/@{fontFileNameLatin}-Regular.woff2") format("woff2") - if(@supportIE, e(",") url("@{fontPath}/@{fontFileNameLatin}-Regular.woff") format("woff")); + src: url("@{fontPath}/@{fontFileNameLatin}-Regular.woff2") format("woff2") if(@supportIE, e(",") url("@{fontPath}/@{fontFileNameLatin}-Regular.woff") format("woff")); font-style: normal; font-weight: @normal; font-display: @fontDisplay; @@ -185,8 +184,7 @@ }; @boldLatin: { font-family: @fontName; - src: url("@{fontPath}/@{fontFileNameLatin}-Bold.woff2") format("woff2") - if(@supportIE, e(",") url("@{fontPath}/@{fontFileNameLatin}-Bold.woff") format("woff")); + src: url("@{fontPath}/@{fontFileNameLatin}-Bold.woff2") format("woff2") if(@supportIE, e(",") url("@{fontPath}/@{fontFileNameLatin}-Bold.woff") format("woff")); font-style: normal; font-weight: @bold; font-display: @fontDisplay; @@ -195,8 +193,7 @@ }; @italicLatin: { font-family: @fontName; - src: url("@{fontPath}/@{fontFileNameLatin}-Italic.woff2") format("woff2") - if(@supportIE, e(",") url("@{fontPath}/@{fontFileNameLatin}-Italic.woff") format("woff")); + src: url("@{fontPath}/@{fontFileNameLatin}-Italic.woff2") format("woff2") if(@supportIE, e(",") url("@{fontPath}/@{fontFileNameLatin}-Italic.woff") format("woff")); font-style: italic; font-weight: @normal; font-display: @fontDisplay; @@ -205,8 +202,7 @@ }; @boldItalicLatin: { font-family: @fontName; - src: url("@{fontPath}/@{fontFileNameLatin}-BoldItalic.woff2") format("woff2") - if(@supportIE, e(",") url("@{fontPath}/@{fontFileNameLatin}-BoldItalic.woff") format("woff")); + src: url("@{fontPath}/@{fontFileNameLatin}-BoldItalic.woff2") format("woff2") if(@supportIE, e(",") url("@{fontPath}/@{fontFileNameLatin}-BoldItalic.woff") format("woff")); font-style: italic; font-weight: @bold; font-display: @fontDisplay; @@ -215,8 +211,7 @@ }; @regularSupplement: { font-family: @fontName; - src: url("@{fontPath}/@{fontFileNameSupplement}-Regular.woff2") format("woff2") - if(@supportIE, e(",") url("@{fontPath}/@{fontFileNameSupplement}-Regular.woff") format("woff")); + src: url("@{fontPath}/@{fontFileNameSupplement}-Regular.woff2") format("woff2") if(@supportIE, e(",") url("@{fontPath}/@{fontFileNameSupplement}-Regular.woff") format("woff")); font-style: normal; font-weight: @normal; font-display: @fontDisplay; @@ -225,8 +220,7 @@ }; @boldSupplement: { font-family: @fontName; - src: url("@{fontPath}/@{fontFileNameSupplement}-Bold.woff2") format("woff2") - if(@supportIE, e(",") url("@{fontPath}/@{fontFileNameSupplement}-Bold.woff") format("woff")); + src: url("@{fontPath}/@{fontFileNameSupplement}-Bold.woff2") format("woff2") if(@supportIE, e(",") url("@{fontPath}/@{fontFileNameSupplement}-Bold.woff") format("woff")); font-style: normal; font-weight: @bold; font-display: @fontDisplay; @@ -235,8 +229,7 @@ }; @italicSupplement: { font-family: @fontName; - src: url("@{fontPath}/@{fontFileNameSupplement}-Italic.woff2") format("woff2") - if(@supportIE, e(",") url("@{fontPath}/@{fontFileNameSupplement}-Italic.woff") format("woff")); + src: url("@{fontPath}/@{fontFileNameSupplement}-Italic.woff2") format("woff2") if(@supportIE, e(",") url("@{fontPath}/@{fontFileNameSupplement}-Italic.woff") format("woff")); font-style: italic; font-weight: @normal; font-display: @fontDisplay; @@ -245,8 +238,7 @@ }; @boldItalicSupplement: { font-family: @fontName; - src: url("@{fontPath}/@{fontFileNameSupplement}-BoldItalic.woff2") format("woff2") - if(@supportIE, e(",") url("@{fontPath}/@{fontFileNameSupplement}-BoldItalic.woff") format("woff")); + src: url("@{fontPath}/@{fontFileNameSupplement}-BoldItalic.woff2") format("woff2") if(@supportIE, e(",") url("@{fontPath}/@{fontFileNameSupplement}-BoldItalic.woff") format("woff")); font-style: italic; font-weight: @bold; font-display: @fontDisplay; diff --git a/src/themes/material/elements/icon.variables b/src/themes/material/elements/icon.variables index b83b180206..11f63ce455 100644 --- a/src/themes/material/elements/icon.variables +++ b/src/themes/material/elements/icon.variables @@ -2,8 +2,7 @@ @fonts: { @solid: { font-family: @fontName; - src: url("@{fontPath}/@{fontName}.woff2") format("woff2") - if(@supportIE, e(",") url("@{fontPath}/@{fontName}.woff") format("woff")); + src: url("@{fontPath}/@{fontName}.woff2") format("woff2") if(@supportIE, e(",") url("@{fontPath}/@{fontName}.woff") format("woff")); font-style: normal; font-weight: @normal; font-variant: normal; From 39803afa77e7b14bf89adfdecc9a1cb9b78a5b90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= Date: Tue, 20 Dec 2022 22:45:17 +0100 Subject: [PATCH 08/15] a few not nice changes --- src/definitions/elements/button.less | 6 +----- src/themes/default/elements/placeholder.variables | 12 ++---------- src/themes/default/elements/segment.variables | 14 ++------------ src/themes/striped/modules/progress.overrides | 12 +----------- 4 files changed, 6 insertions(+), 38 deletions(-) diff --git a/src/definitions/elements/button.less b/src/definitions/elements/button.less index b8244be497..adfd791587 100755 --- a/src/definitions/elements/button.less +++ b/src/definitions/elements/button.less @@ -903,11 +903,7 @@ .ui.tertiary.button { transition: color @defaultDuration @defaultEasing !important; border-radius: 0; - margin: - (@verticalPadding - @tertiaryVerticalPadding) - (@horizontalMargin) - (@verticalPadding + @shadowOffset + @verticalMargin - @tertiaryVerticalPadding) - 0 !important; + margin: (@verticalPadding - @tertiaryVerticalPadding) (@horizontalMargin) (@verticalPadding + @shadowOffset + @verticalMargin - @tertiaryVerticalPadding) 0 !important; padding: @tertiaryVerticalPadding @tertiaryHorizontalPadding !important; & when (@tertiaryWithUnderline = true) { diff --git a/src/themes/default/elements/placeholder.variables b/src/themes/default/elements/placeholder.variables index 270c05899d..74a3abcdac 100644 --- a/src/themes/default/elements/placeholder.variables +++ b/src/themes/default/elements/placeholder.variables @@ -34,16 +34,8 @@ /* Glow Gradient */ @placeholderLoadingAnimationDuration: 2s; @placeholderLoadingGradientWidth: 1200px; -@placeholderLoadingGradient: linear-gradient(to right, - rgba(0, 0, 0, 0.08) 0, - rgba(0, 0, 0, 0.15) 15%, - rgba(0, 0, 0, 0.08) 30% -); -@placeholderInvertedLoadingGradient: linear-gradient(to right, - rgba(255, 255, 255, 0.08) 0, - rgba(255, 255, 255, 0.14) 15%, - rgba(255, 255, 255, 0.08) 30% -); +@placeholderLoadingGradient: linear-gradient(to right, rgba(0, 0, 0, 0.08) 0, rgba(0, 0, 0, 0.15) 15%, rgba(0, 0, 0, 0.08) 30%); +@placeholderInvertedLoadingGradient: linear-gradient(to right, rgba(255, 255, 255, 0.08) 0, rgba(255, 255, 255, 0.14) 15%, rgba(255, 255, 255, 0.08) 30%); /* Variations */ @placeholderFullLineOutdent: 0; diff --git a/src/themes/default/elements/segment.variables b/src/themes/default/elements/segment.variables index 143c3198c7..00d71ad88c 100644 --- a/src/themes/default/elements/segment.variables +++ b/src/themes/default/elements/segment.variables @@ -131,19 +131,9 @@ @tertiaryColor: @mutedTextColor; @secondaryInvertedLightness: 0.2; -@secondaryInvertedBackground: - lighten(@black, (@secondaryInvertedLightness * 100)) - linear-gradient( - rgba(255, 255, 255, @secondaryInvertedLightness) 0, - rgba(255, 255, 255, @secondaryInvertedLightness) 100% - ); +@secondaryInvertedBackground: lighten(@black, (@secondaryInvertedLightness * 100)) linear-gradient(rgba(255, 255, 255, @secondaryInvertedLightness) 0, rgba(255, 255, 255, @secondaryInvertedLightness) 100%); @secondaryInvertedColor: @invertedMutedTextColor; @tertiaryInvertedLightness: 0.35; -@tertiaryInvertedBackground: - lighten(@black, (@tertiaryInvertedLightness * 100)) - linear-gradient( - rgba(255, 255, 255, @tertiaryInvertedLightness) 0, - rgba(255, 255, 255, @tertiaryInvertedLightness) 100% - ); +@tertiaryInvertedBackground: lighten(@black, (@tertiaryInvertedLightness * 100)) linear-gradient(rgba(255, 255, 255, @tertiaryInvertedLightness) 0, rgba(255, 255, 255, @tertiaryInvertedLightness) 100%); @tertiaryInvertedColor: @invertedMutedTextColor; diff --git a/src/themes/striped/modules/progress.overrides b/src/themes/striped/modules/progress.overrides index af2476c7ab..75af0c4399 100644 --- a/src/themes/striped/modules/progress.overrides +++ b/src/themes/striped/modules/progress.overrides @@ -4,17 +4,7 @@ .ui.progress .bar { background-size: 30px 30px; - background-image: - linear-gradient( - 135deg, - rgba(255, 255, 255, 0.08) 25%, - transparent 25%, - transparent 50%, - rgba(255, 255, 255, 0.08) 50%, - rgba(255, 255, 255, 0.08) 75%, - transparent 75%, - transparent - ); + background-image: linear-gradient(135deg, rgba(255, 255, 255, 0.08) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.08) 50%, rgba(255, 255, 255, 0.08) 75%, transparent 75%, transparent); } .ui.progress.active .bar::after { From 874103c196a7b6284b84370baefb0218c0195887 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= Date: Wed, 21 Dec 2022 00:07:21 +0100 Subject: [PATCH 09/15] fix stylelint todo --- .stylelintrc.js | 15 ++++----------- src/themes/default/globals/reset.overrides | 16 ++++++++-------- 2 files changed, 12 insertions(+), 19 deletions(-) diff --git a/.stylelintrc.js b/.stylelintrc.js index 06f22e7c5e..fbd1691d79 100644 --- a/.stylelintrc.js +++ b/.stylelintrc.js @@ -16,11 +16,12 @@ module.exports = { 'color-hex-case': 'lower', 'declaration-block-trailing-semicolon': null, // fix bad formatting with "each()" 'function-no-unknown': null, - indentation: null, // TODO change to "4" once https://github.com/fomantic/Fomantic-UI/pull/2593#discussion_r1045131096 is fixed + 'import-notation': null, + indentation: null, // handled by Prettier linebreaks: 'unix', 'max-line-length': null, 'no-descending-specificity': null, - 'no-extra-semicolons': null, // fix GH-1832 - workaround for wikimedia/less.php parser + 'no-extra-semicolons': null, // handled by Prettier 'no-duplicate-selectors': null, 'number-max-precision': 5, 'property-case': null, @@ -36,19 +37,11 @@ module.exports = { 'string-quotes': 'double', 'value-keyword-case': null, - // fix compatibility with Prettier - 'declaration-bang-space-before': null, - 'declaration-block-semicolon-space-before': null, - 'declaration-colon-newline-after': null, - 'declaration-empty-line-before': null, // TODO - 'selector-combinator-space-before': null, - // TODO rules to be removed/fixed in v2.10.0 as fixes are not compatible with IE11 'alpha-value-notation': 'number', // https://caniuse.com/mdn-css_properties_opacity_percentages + 'selector-not-notation': null, // https://caniuse.com/css-not-sel-list // TODO - 'selector-not-notation': null, // 169 errors - 'import-notation': null, // 56 errors 'keyframes-name-pattern': null, // 50 errors 'block-no-empty': null, // 25 errors 'selector-no-vendor-prefix': null, // 19 errors diff --git a/src/themes/default/globals/reset.overrides b/src/themes/default/globals/reset.overrides index f6e6bfb7cf..c0c0a2e2ff 100755 --- a/src/themes/default/globals/reset.overrides +++ b/src/themes/default/globals/reset.overrides @@ -57,15 +57,15 @@ hr { } /** - * 1. Correct the inheritance and scaling of font size in all browsers. - * 2. Correct the odd `em` font sizing in all browsers. + * 1. Correct the odd `em` font sizing in all browsers. */ pre { + // https://github.com/necolas/normalize.css/issues/519 font-family: monospace, - monospace; /* 1 */ - font-size: 1em; /* 2 */ + monospace; + font-size: 1em; /* 1 */ } /* Text-level semantics @@ -100,17 +100,17 @@ strong { } /** - * 1. Correct the inheritance and scaling of font size in all browsers. - * 2. Correct the odd `em` font sizing in all browsers. + * 1. Correct the odd `em` font sizing in all browsers. */ code, kbd, samp { + // https://github.com/necolas/normalize.css/issues/519 font-family: monospace, - monospace; /* 1 */ - font-size: 1em; /* 2 */ + monospace; + font-size: 1em; /* 1 */ } /** From 30a90d62ac7e28da09ee239d1af19d90d32c6ef0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= Date: Tue, 20 Dec 2022 22:45:17 +0100 Subject: [PATCH 10/15] Revert "a few not nice changes" This reverts commit 39803afa77e7b14bf89adfdecc9a1cb9b78a5b90. --- src/definitions/elements/button.less | 6 +++++- src/themes/default/elements/placeholder.variables | 12 ++++++++++-- src/themes/default/elements/segment.variables | 14 ++++++++++++-- src/themes/striped/modules/progress.overrides | 12 +++++++++++- 4 files changed, 38 insertions(+), 6 deletions(-) diff --git a/src/definitions/elements/button.less b/src/definitions/elements/button.less index adfd791587..b8244be497 100755 --- a/src/definitions/elements/button.less +++ b/src/definitions/elements/button.less @@ -903,7 +903,11 @@ .ui.tertiary.button { transition: color @defaultDuration @defaultEasing !important; border-radius: 0; - margin: (@verticalPadding - @tertiaryVerticalPadding) (@horizontalMargin) (@verticalPadding + @shadowOffset + @verticalMargin - @tertiaryVerticalPadding) 0 !important; + margin: + (@verticalPadding - @tertiaryVerticalPadding) + (@horizontalMargin) + (@verticalPadding + @shadowOffset + @verticalMargin - @tertiaryVerticalPadding) + 0 !important; padding: @tertiaryVerticalPadding @tertiaryHorizontalPadding !important; & when (@tertiaryWithUnderline = true) { diff --git a/src/themes/default/elements/placeholder.variables b/src/themes/default/elements/placeholder.variables index 74a3abcdac..270c05899d 100644 --- a/src/themes/default/elements/placeholder.variables +++ b/src/themes/default/elements/placeholder.variables @@ -34,8 +34,16 @@ /* Glow Gradient */ @placeholderLoadingAnimationDuration: 2s; @placeholderLoadingGradientWidth: 1200px; -@placeholderLoadingGradient: linear-gradient(to right, rgba(0, 0, 0, 0.08) 0, rgba(0, 0, 0, 0.15) 15%, rgba(0, 0, 0, 0.08) 30%); -@placeholderInvertedLoadingGradient: linear-gradient(to right, rgba(255, 255, 255, 0.08) 0, rgba(255, 255, 255, 0.14) 15%, rgba(255, 255, 255, 0.08) 30%); +@placeholderLoadingGradient: linear-gradient(to right, + rgba(0, 0, 0, 0.08) 0, + rgba(0, 0, 0, 0.15) 15%, + rgba(0, 0, 0, 0.08) 30% +); +@placeholderInvertedLoadingGradient: linear-gradient(to right, + rgba(255, 255, 255, 0.08) 0, + rgba(255, 255, 255, 0.14) 15%, + rgba(255, 255, 255, 0.08) 30% +); /* Variations */ @placeholderFullLineOutdent: 0; diff --git a/src/themes/default/elements/segment.variables b/src/themes/default/elements/segment.variables index 00d71ad88c..143c3198c7 100644 --- a/src/themes/default/elements/segment.variables +++ b/src/themes/default/elements/segment.variables @@ -131,9 +131,19 @@ @tertiaryColor: @mutedTextColor; @secondaryInvertedLightness: 0.2; -@secondaryInvertedBackground: lighten(@black, (@secondaryInvertedLightness * 100)) linear-gradient(rgba(255, 255, 255, @secondaryInvertedLightness) 0, rgba(255, 255, 255, @secondaryInvertedLightness) 100%); +@secondaryInvertedBackground: + lighten(@black, (@secondaryInvertedLightness * 100)) + linear-gradient( + rgba(255, 255, 255, @secondaryInvertedLightness) 0, + rgba(255, 255, 255, @secondaryInvertedLightness) 100% + ); @secondaryInvertedColor: @invertedMutedTextColor; @tertiaryInvertedLightness: 0.35; -@tertiaryInvertedBackground: lighten(@black, (@tertiaryInvertedLightness * 100)) linear-gradient(rgba(255, 255, 255, @tertiaryInvertedLightness) 0, rgba(255, 255, 255, @tertiaryInvertedLightness) 100%); +@tertiaryInvertedBackground: + lighten(@black, (@tertiaryInvertedLightness * 100)) + linear-gradient( + rgba(255, 255, 255, @tertiaryInvertedLightness) 0, + rgba(255, 255, 255, @tertiaryInvertedLightness) 100% + ); @tertiaryInvertedColor: @invertedMutedTextColor; diff --git a/src/themes/striped/modules/progress.overrides b/src/themes/striped/modules/progress.overrides index 75af0c4399..af2476c7ab 100644 --- a/src/themes/striped/modules/progress.overrides +++ b/src/themes/striped/modules/progress.overrides @@ -4,7 +4,17 @@ .ui.progress .bar { background-size: 30px 30px; - background-image: linear-gradient(135deg, rgba(255, 255, 255, 0.08) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.08) 50%, rgba(255, 255, 255, 0.08) 75%, transparent 75%, transparent); + background-image: + linear-gradient( + 135deg, + rgba(255, 255, 255, 0.08) 25%, + transparent 25%, + transparent 50%, + rgba(255, 255, 255, 0.08) 50%, + rgba(255, 255, 255, 0.08) 75%, + transparent 75%, + transparent + ); } .ui.progress.active .bar::after { From 2a4c08deddcefe9cf7b4630fa24beba529883802 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= Date: Wed, 21 Dec 2022 12:58:08 +0100 Subject: [PATCH 11/15] add prettier-ignore comments --- .stylelintrc.js | 3 +-- src/definitions/elements/button.less | 1 + .../default/elements/placeholder.variables | 8 +++++-- src/themes/default/elements/segment.variables | 2 ++ src/themes/striped/modules/progress.overrides | 22 +++++++++---------- 5 files changed, 21 insertions(+), 15 deletions(-) diff --git a/.stylelintrc.js b/.stylelintrc.js index fbd1691d79..1dacba7ab0 100644 --- a/.stylelintrc.js +++ b/.stylelintrc.js @@ -11,10 +11,9 @@ module.exports = { 'at-rule-empty-line-before': null, 'at-rule-name-case': null, 'at-rule-no-unknown': null, - 'block-closing-brace-newline-before': null, // fix bad formatting with "each()" 'color-function-notation': 'legacy', 'color-hex-case': 'lower', - 'declaration-block-trailing-semicolon': null, // fix bad formatting with "each()" + 'declaration-colon-newline-after': null, // handled by Prettier 'function-no-unknown': null, 'import-notation': null, indentation: null, // handled by Prettier diff --git a/src/definitions/elements/button.less b/src/definitions/elements/button.less index b8244be497..2cfbaf9637 100755 --- a/src/definitions/elements/button.less +++ b/src/definitions/elements/button.less @@ -903,6 +903,7 @@ .ui.tertiary.button { transition: color @defaultDuration @defaultEasing !important; border-radius: 0; + // prettier-ignore margin: (@verticalPadding - @tertiaryVerticalPadding) (@horizontalMargin) diff --git a/src/themes/default/elements/placeholder.variables b/src/themes/default/elements/placeholder.variables index 270c05899d..d0c851da7d 100644 --- a/src/themes/default/elements/placeholder.variables +++ b/src/themes/default/elements/placeholder.variables @@ -34,12 +34,16 @@ /* Glow Gradient */ @placeholderLoadingAnimationDuration: 2s; @placeholderLoadingGradientWidth: 1200px; -@placeholderLoadingGradient: linear-gradient(to right, +// prettier-ignore +@placeholderLoadingGradient: linear-gradient( + to right, rgba(0, 0, 0, 0.08) 0, rgba(0, 0, 0, 0.15) 15%, rgba(0, 0, 0, 0.08) 30% ); -@placeholderInvertedLoadingGradient: linear-gradient(to right, +// prettier-ignore +@placeholderInvertedLoadingGradient: linear-gradient( + to right, rgba(255, 255, 255, 0.08) 0, rgba(255, 255, 255, 0.14) 15%, rgba(255, 255, 255, 0.08) 30% diff --git a/src/themes/default/elements/segment.variables b/src/themes/default/elements/segment.variables index 143c3198c7..671c56c8f6 100644 --- a/src/themes/default/elements/segment.variables +++ b/src/themes/default/elements/segment.variables @@ -131,6 +131,7 @@ @tertiaryColor: @mutedTextColor; @secondaryInvertedLightness: 0.2; +// prettier-ignore @secondaryInvertedBackground: lighten(@black, (@secondaryInvertedLightness * 100)) linear-gradient( @@ -140,6 +141,7 @@ @secondaryInvertedColor: @invertedMutedTextColor; @tertiaryInvertedLightness: 0.35; +// prettier-ignore @tertiaryInvertedBackground: lighten(@black, (@tertiaryInvertedLightness * 100)) linear-gradient( diff --git a/src/themes/striped/modules/progress.overrides b/src/themes/striped/modules/progress.overrides index af2476c7ab..ccbbecd0de 100644 --- a/src/themes/striped/modules/progress.overrides +++ b/src/themes/striped/modules/progress.overrides @@ -4,17 +4,17 @@ .ui.progress .bar { background-size: 30px 30px; - background-image: - linear-gradient( - 135deg, - rgba(255, 255, 255, 0.08) 25%, - transparent 25%, - transparent 50%, - rgba(255, 255, 255, 0.08) 50%, - rgba(255, 255, 255, 0.08) 75%, - transparent 75%, - transparent - ); + // prettier-ignore + background-image: linear-gradient( + 135deg, + rgba(255, 255, 255, 0.08) 25%, + transparent 25%, + transparent 50%, + rgba(255, 255, 255, 0.08) 50%, + rgba(255, 255, 255, 0.08) 75%, + transparent 75%, + transparent + ); } .ui.progress.active .bar::after { From 2b912da467a501e1f98672252ea8bff00a467eb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= Date: Wed, 21 Dec 2022 17:41:19 +0100 Subject: [PATCH 12/15] use Prettier fork instead of local patching --- ...prettier-14007-no-unstable-semicolon.patch | 16 ------------- ...ier-14008-no-space-after-unary-minus.patch | 23 ------------------- ...lower-if-inside-variable-declaration.patch | 18 --------------- .github/fix-prettier-value-with-comma.patch | 18 --------------- .github/workflows/ci.yml | 8 +------ 5 files changed, 1 insertion(+), 82 deletions(-) delete mode 100644 .github/fix-prettier-14007-no-unstable-semicolon.patch delete mode 100644 .github/fix-prettier-14008-no-space-after-unary-minus.patch delete mode 100644 .github/fix-prettier-14034-no-property-name-lower-if-inside-variable-declaration.patch delete mode 100644 .github/fix-prettier-value-with-comma.patch diff --git a/.github/fix-prettier-14007-no-unstable-semicolon.patch b/.github/fix-prettier-14007-no-unstable-semicolon.patch deleted file mode 100644 index 6a1b7a9fee..0000000000 --- a/.github/fix-prettier-14007-no-unstable-semicolon.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/src/language-css/printer-postcss.js b/src/language-css/printer-postcss.js -index 4ba444c8d..eaa5e38ff 100644 ---- a/src/language-css/printer-postcss.js -+++ b/src/language-css/printer-postcss.js -@@ -101,7 +101,10 @@ function genericPrint(path, options, print) { - return [node.raw, hardline]; - case "css-root": { - const nodes = printNodeSequence(path, options, print); -- const after = node.raws.after.trim(); -+ let after = node.raws.after.trim(); -+ if (after.startsWith(";")) { -+ after = after.slice(1).trim(); -+ } - - return [ - nodes, diff --git a/.github/fix-prettier-14008-no-space-after-unary-minus.patch b/.github/fix-prettier-14008-no-space-after-unary-minus.patch deleted file mode 100644 index e14a913c6f..0000000000 --- a/.github/fix-prettier-14008-no-space-after-unary-minus.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/src/language-css/printer-postcss.js b/src/language-css/printer-postcss.js -index 4ba444c8d..a15f7981f 100644 ---- a/src/language-css/printer-postcss.js -+++ b/src/language-css/printer-postcss.js -@@ -744,6 +744,18 @@ function genericPrint(path, options, print) { - continue; - } - -+ // No space before unary minus followed by an opening parenthesis `-(` -+ if ( -+ (options.parser === "scss" || options.parser === "less") && -+ isMathOperator && -+ iNode.value === "-" && -+ isParenGroupNode(iNextNode) && -+ locEnd(iNode) === locStart(iNextNode.open) && -+ iNextNode.open.value === "(" -+ ) { -+ continue; -+ } -+ - // Add `hardline` after inline comment (i.e. `// comment\n foo: bar;`) - if (isInlineValueCommentNode(iNode)) { - if (parentNode.type === "value-paren_group") { diff --git a/.github/fix-prettier-14034-no-property-name-lower-if-inside-variable-declaration.patch b/.github/fix-prettier-14034-no-property-name-lower-if-inside-variable-declaration.patch deleted file mode 100644 index bbae6947a3..0000000000 --- a/.github/fix-prettier-14034-no-property-name-lower-if-inside-variable-declaration.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/src/language-css/printer-postcss.js b/src/language-css/printer-postcss.js -index 4ba444c8d..431cdc7a6 100644 ---- a/src/language-css/printer-postcss.js -+++ b/src/language-css/printer-postcss.js -@@ -155,7 +155,12 @@ function genericPrint(path, options, print) { - - return [ - node.raws.before.replace(/[\s;]/g, ""), -- insideICSSRuleNode(path) ? node.prop : maybeToLowerCase(node.prop), -+ (parentNode.type === "css-atrule" && -+ typeof parentNode.raws.params === "string" && -+ parentNode.raws.params.startsWith(":")) || -+ insideICSSRuleNode(path) -+ ? node.prop -+ : maybeToLowerCase(node.prop), - trimmedBetween.startsWith("//") ? " " : "", - trimmedBetween, - node.extend ? "" : " ", diff --git a/.github/fix-prettier-value-with-comma.patch b/.github/fix-prettier-value-with-comma.patch deleted file mode 100644 index 7308612e43..0000000000 --- a/.github/fix-prettier-value-with-comma.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/src/language-css/printer-postcss.js b/src/language-css/printer-postcss.js -index 4ba444c8d..4f7738bfa 100644 ---- a/src/language-css/printer-postcss.js -+++ b/src/language-css/printer-postcss.js -@@ -886,11 +886,11 @@ function genericPrint(path, options, print) { - - if (!node.open) { - const printed = path.map(print, "groups"); -- const res = []; -+ const res = [hardline]; - - for (let i = 0; i < printed.length; i++) { - if (i !== 0) { -- res.push([",", line]); -+ res.push([",", hardline]); - } - res.push(printed[i]); - } diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6be4d79280..c3e7e1bb29 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,13 +11,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 - name: Install dependencies - run: > - yarn - && yarn add -D eslint-config-airbnb-base eslint-plugin-unicorn eslint-plugin-jest@^26.9.0 @typescript-eslint/eslint-plugin @typescript-eslint/parser typescript github:prettier/prettier#2.8.1 - && (cd node_modules/prettier && git apply -v ../../.github/fix-prettier-14007-no-unstable-semicolon.patch) - && (cd node_modules/prettier && git apply -v ../../.github/fix-prettier-14008-no-space-after-unary-minus.patch) - && (cd node_modules/prettier && git apply -v ../../.github/fix-prettier-14034-no-property-name-lower-if-inside-variable-declaration.patch) - && (cd node_modules/prettier && git apply -v ../../.github/fix-prettier-value-with-comma.patch) + run: yarn && yarn add -D eslint-config-airbnb-base eslint-plugin-unicorn eslint-plugin-jest@^26.9.0 @typescript-eslint/eslint-plugin @typescript-eslint/parser typescript github:fomantic/prettier#ca4fc1130f - name: Lint JS and LESS files run: > npm run lint From a09bbd5ebd332f6b72bff6a761a0eca53a9fdd3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= Date: Wed, 21 Dec 2022 18:27:53 +0100 Subject: [PATCH 13/15] Revert "fonts on multiple lines" --- src/themes/amazon/elements/button.variables | 6 +- src/themes/bookish/elements/header.variables | 5 +- .../bootstrap3/elements/button.variables | 6 +- src/themes/chubby/elements/button.variables | 5 +- src/themes/chubby/elements/header.variables | 7 +- src/themes/classic/elements/header.variables | 5 +- src/themes/default/globals/reset.overrides | 14 +- src/themes/default/globals/site.variables | 159 +----------------- .../default/globals/variation.variables | 40 +---- src/themes/flat/globals/site.variables | 14 +- src/themes/github/elements/button.variables | 6 +- .../material/collections/menu.variables | 5 +- src/themes/material/elements/button.variables | 5 +- src/themes/material/elements/header.variables | 5 +- src/themes/material/globals/site.variables | 14 +- src/themes/material/modules/modal.overrides | 5 +- src/themes/material/modules/modal.variables | 6 +- src/themes/rtl/globals/site.variables | 16 +- src/themes/twitter/elements/button.variables | 6 +- 19 files changed, 33 insertions(+), 296 deletions(-) diff --git a/src/themes/amazon/elements/button.variables b/src/themes/amazon/elements/button.variables index cb881dd31a..39c89ca94f 100644 --- a/src/themes/amazon/elements/button.variables +++ b/src/themes/amazon/elements/button.variables @@ -3,11 +3,7 @@ -------------------- */ /* 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/bookish/elements/header.variables b/src/themes/bookish/elements/header.variables index 11ae801668..698f948bfa 100644 --- a/src/themes/bookish/elements/header.variables +++ b/src/themes/bookish/elements/header.variables @@ -2,10 +2,7 @@ Header -------------------- */ -@headerFont: - "Karma", - "Times New Roman", - serif; +@headerFont: "Karma", "Times New Roman", serif; @fontWeight: @normal; @iconSize: 1.5em; diff --git a/src/themes/bootstrap3/elements/button.variables b/src/themes/bootstrap3/elements/button.variables index a48eca02f8..629db9aef2 100644 --- a/src/themes/bootstrap3/elements/button.variables +++ b/src/themes/bootstrap3/elements/button.variables @@ -3,11 +3,7 @@ -------------------- */ /* 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/button.variables b/src/themes/chubby/elements/button.variables index b4a55bd748..0a20968019 100644 --- a/src/themes/chubby/elements/button.variables +++ b/src/themes/chubby/elements/button.variables @@ -3,10 +3,7 @@ -------------------- */ /* Button Variables */ -@pageFont: - "Source Sans Pro", - Arial, - sans-serif; +@pageFont: "Source Sans Pro", Arial, sans-serif; @textTransform: none; @fontWeight: @normal; diff --git a/src/themes/chubby/elements/header.variables b/src/themes/chubby/elements/header.variables index 0b91849b39..6d327ee0b5 100644 --- a/src/themes/chubby/elements/header.variables +++ b/src/themes/chubby/elements/header.variables @@ -2,12 +2,7 @@ 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/classic/elements/header.variables b/src/themes/classic/elements/header.variables index 528219cf96..99b8c3d381 100644 --- a/src/themes/classic/elements/header.variables +++ b/src/themes/classic/elements/header.variables @@ -6,10 +6,7 @@ Element -------------------- */ -@headerFont: - "Open Sans", - Arial, - sans-serif; +@headerFont: "Open Sans", Arial, sans-serif; @blockBackground: @offWhite @subtleGradient; @blockBoxShadow: @subtleShadow; diff --git a/src/themes/default/globals/reset.overrides b/src/themes/default/globals/reset.overrides index c0c0a2e2ff..578bf40c0e 100755 --- a/src/themes/default/globals/reset.overrides +++ b/src/themes/default/globals/reset.overrides @@ -61,11 +61,8 @@ hr { */ pre { - // https://github.com/necolas/normalize.css/issues/519 - font-family: - monospace, - monospace; - font-size: 1em; /* 1 */ + font-family: monospace, monospace; /* 1 */ + font-size: 1em; /* 2 */ } /* Text-level semantics @@ -106,11 +103,8 @@ strong { code, kbd, samp { - // https://github.com/necolas/normalize.css/issues/519 - font-family: - monospace, - monospace; - font-size: 1em; /* 1 */ + font-family: monospace, monospace; /* 1 */ + font-size: 1em; /* 2 */ } /** diff --git a/src/themes/default/globals/site.variables b/src/themes/default/globals/site.variables index 1175c429c1..fb58cd7042 100755 --- a/src/themes/default/globals/site.variables +++ b/src/themes/default/globals/site.variables @@ -14,162 +14,15 @@ @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"; - -@headerFont: - @fontName, - @fallbackFonts; -@pageFont: - @fontName, - @fallbackFonts; +@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; @fontDisplay: swap; @textRendering: optimizeLegibility; -@unicodeRangeLatin: - U+0000, - U+000D, - U+0020-007E, - U+00A0-017F, - U+0192, - U+0218-021B, - U+0237, - U+02C6-02C7, - U+02C9, - U+02D8-02DD, - U+0394, - U+03A9, - U+03BC, - U+03C0, - U+1E80-1E85, - U+2010, - U+2013-2014, - U+2018-201A, - U+201C-201E, - U+2020-2022, - U+2026, - U+2030, - U+2039-203A, - U+2044, - U+20A3-20A4, - U+20A7, - U+20AC, - U+2113, - U+2122, - U+2126, - U+212E, - U+2202, - U+2206, - U+220F, - U+2211-2212, - U+2215, - U+2219-221A, - U+221E, - U+222B, - U+2248, - U+2260, - U+2264-2265, - U+25CA, - U+F8FF, - U+FB00-FB04; -@unicodeRangeSupplement: - U+0180-0191, - U+0193-0217, - U+021C-0236, - U+0238-02C5, - U+02C8, - U+02CA-02D7, - U+02DE-036F, - U+0374-0375, - U+037A-037E, - U+0384-038A, - U+038C, - U+038E-0393, - U+0395-03A1, - U+03A3-03A8, - U+03AA-03BB, - U+03BD-03BF, - U+03C1-03CE, - U+03D0-0486, - U+0488-0513, - U+1D00-1DCA, - U+1DFE-1E7F, - U+1E86-1E9B, - U+1E9E, - U+1EA0-1EF9, - U+1F00-1F15, - U+1F18-1F1D, - U+1F20-1F45, - U+1F48-1F4D, - U+1F50-1F57, - U+1F59, - U+1F5B, - U+1F5D, - U+1F5F-1F7D, - U+1F80-1FB4, - U+1FB6-1FC4, - U+1FC6-1FD3, - U+1FD6-1FDB, - U+1FDD-1FEF, - U+1FF2-1FF4, - U+1FF6-1FFE, - U+2000-200F, - U+2012, - U+2015-2017, - U+201B, - U+201F, - U+202F, - U+2034, - U+203C-203E, - U+205E-205F, - U+2070-2071, - U+2074-2094, - U+20A0-20A2, - U+20A5-20A6, - U+20A8-20AB, - U+20AD-20B5, - U+20B8-20BA, - U+20DD, - U+2105, - U+2116-2117, - U+2120, - U+2132, - U+214D-214E, - U+2153-215F, - U+2183-2184, - U+2190-2199, - U+21A8, - U+221F, - U+2229, - U+2261, - U+2302, - U+2310, - U+2320-2321, - U+2460-2473, - U+24EA-24F4, - U+24FF-2500, - U+2502, - U+250C, - U+2510, - U+2514, - U+2518, - U+2C60-2C6C, - U+2C74-2C77; +@unicodeRangeLatin: U+0000, U+000D, U+0020-007E, U+00A0-017F, U+0192, U+0218-021B, U+0237, U+02C6-02C7, U+02C9, U+02D8-02DD, U+0394, U+03A9, U+03BC, U+03C0, U+1E80-1E85, U+2010, U+2013-2014, U+2018-201A, U+201C-201E, U+2020-2022, U+2026, U+2030, U+2039-203A, U+2044, U+20A3-20A4, U+20A7, U+20AC, U+2113, U+2122, U+2126, U+212E, U+2202, U+2206, U+220F, U+2211-2212, U+2215, U+2219-221A, U+221E, U+222B, U+2248, U+2260, U+2264-2265, U+25CA, U+F8FF, U+FB00-FB04; +@unicodeRangeSupplement: U+0180-0191, U+0193-0217, U+021C-0236, U+0238-02C5, U+02C8, U+02CA-02D7, U+02DE-036F, U+0374-0375, U+037A-037E, U+0384-038A, U+038C, U+038E-0393, U+0395-03A1, U+03A3-03A8, U+03AA-03BB, U+03BD-03BF, U+03C1-03CE, U+03D0-0486, U+0488-0513, U+1D00-1DCA, U+1DFE-1E7F, U+1E86-1E9B, U+1E9E, U+1EA0-1EF9, U+1F00-1F15, U+1F18-1F1D, U+1F20-1F45, U+1F48-1F4D, U+1F50-1F57, U+1F59, U+1F5B, U+1F5D, U+1F5F-1F7D, U+1F80-1FB4, U+1FB6-1FC4, U+1FC6-1FD3, U+1FD6-1FDB, U+1FDD-1FEF, U+1FF2-1FF4, U+1FF6-1FFE, U+2000-200F, U+2012, U+2015-2017, U+201B, U+201F, U+202F, U+2034, U+203C-203E, U+205E-205F, U+2070-2071, U+2074-2094, U+20A0-20A2, U+20A5-20A6, U+20A8-20AB, U+20AD-20B5, U+20B8-20BA, U+20DD, U+2105, U+2116-2117, U+2120, U+2132, U+214D-214E, U+2153-215F, U+2183-2184, U+2190-2199, U+21A8, U+221F, U+2229, U+2261, U+2302, U+2310, U+2320-2321, U+2460-2473, U+24EA-24F4, U+24FF-2500, U+2502, U+250C, U+2510, U+2514, U+2518, U+2C60-2C6C, U+2C74-2C77; @importFonts: true; @fonts: { diff --git a/src/themes/default/globals/variation.variables b/src/themes/default/globals/variation.variables index 04831fa907..55b4a9afb7 100644 --- a/src/themes/default/globals/variation.variables +++ b/src/themes/default/globals/variation.variables @@ -3,42 +3,10 @@ ***********************************************************/ /* General */ -@variationAllSizes: - mini, - tiny, - small, - large, - big, - huge, - massive; -@variationAllColors: - primary, - secondary, - red, - orange, - yellow, - olive, - green, - teal, - blue, - violet, - purple, - pink, - brown, - grey, - black; -@variationAllStates: - error, - info, - success, - warning; -@variationAllConsequences: - positive, - negative, - error, - info, - success, - warning; +@variationAllSizes: mini, tiny, small, large, big, huge, massive; +@variationAllColors: primary, secondary, red, orange, yellow, olive, green, teal, blue, violet, purple, pink, brown, grey, black; +@variationAllStates: error, info, success, warning; +@variationAllConsequences: positive, negative, error, info, success, warning; /******************************* Elements diff --git a/src/themes/flat/globals/site.variables b/src/themes/flat/globals/site.variables index fd2940f879..e54de73087 100644 --- a/src/themes/flat/globals/site.variables +++ b/src/themes/flat/globals/site.variables @@ -13,18 +13,8 @@ Fonts -------------------- */ -@headerFont: - "Open Sans", - "Helvetica Neue", - Arial, - Helvetica, - sans-serif; -@pageFont: - "Open Sans", - "Helvetica Neue", - Arial, - Helvetica, - sans-serif; +@headerFont: "Open Sans", "Helvetica Neue", Arial, Helvetica, sans-serif; +@pageFont: "Open Sans", "Helvetica Neue", Arial, Helvetica, sans-serif; /* ------------------- Site Colors diff --git a/src/themes/github/elements/button.variables b/src/themes/github/elements/button.variables index 8115caae4d..4d9fca30f0 100644 --- a/src/themes/github/elements/button.variables +++ b/src/themes/github/elements/button.variables @@ -3,11 +3,7 @@ -------------------- */ /* 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/material/collections/menu.variables b/src/themes/material/collections/menu.variables index 05e26536aa..455a401e9f 100644 --- a/src/themes/material/collections/menu.variables +++ b/src/themes/material/collections/menu.variables @@ -2,10 +2,7 @@ Menu *******************************/ -@fontFamily: - "Roboto", - Arial, - sans-serif; +@fontFamily: "Roboto", Arial, sans-serif; @boxShadow: 0 1px 6px rgba(0, 0, 0, 0.2); @dividerSize: 0; diff --git a/src/themes/material/elements/button.variables b/src/themes/material/elements/button.variables index 7f1ac89d8e..e3db2e4820 100644 --- a/src/themes/material/elements/button.variables +++ b/src/themes/material/elements/button.variables @@ -7,10 +7,7 @@ -------------------- */ @googleFontName: "Roboto"; -@pageFont: - "Roboto", - Arial, - sans-serif; +@pageFont: "Roboto", Arial, sans-serif; @medium: 13px; diff --git a/src/themes/material/elements/header.variables b/src/themes/material/elements/header.variables index 2e7833019a..76724657b3 100644 --- a/src/themes/material/elements/header.variables +++ b/src/themes/material/elements/header.variables @@ -2,10 +2,7 @@ Header -------------------- */ -@headerFont: - "Roboto", - Arial, - sans-serif; +@headerFont: "Roboto", Arial, sans-serif; @fontWeight: normal; @iconSize: 2em; diff --git a/src/themes/material/globals/site.variables b/src/themes/material/globals/site.variables index 04c2e41207..bb414ec74a 100644 --- a/src/themes/material/globals/site.variables +++ b/src/themes/material/globals/site.variables @@ -6,18 +6,8 @@ Fonts -------------------- */ -@headerFont: - "Roboto", - "Helvetica Neue", - Arial, - Helvetica, - sans-serif; -@pageFont: - "Roboto", - "Helvetica Neue", - Arial, - Helvetica, - sans-serif; +@headerFont: "Roboto", "Helvetica Neue", Arial, Helvetica, sans-serif; +@pageFont: "Roboto", "Helvetica Neue", Arial, Helvetica, sans-serif; @googleFontName: "Roboto"; /* ------------------- diff --git a/src/themes/material/modules/modal.overrides b/src/themes/material/modules/modal.overrides index a889890ec6..138622203e 100644 --- a/src/themes/material/modules/modal.overrides +++ b/src/themes/material/modules/modal.overrides @@ -1,9 +1,6 @@ @import (css) url("https://fonts.googleapis.com/css2?family=Roboto"); .ui.modal .header { - font-family: - Roboto, - Arial, - sans-serif !important; + font-family: Roboto, Arial, sans-serif !important; font-weight: 400 !important; } diff --git a/src/themes/material/modules/modal.variables b/src/themes/material/modules/modal.variables index 9691c3baeb..756dfc4c25 100644 --- a/src/themes/material/modules/modal.variables +++ b/src/themes/material/modules/modal.variables @@ -5,11 +5,7 @@ @headerVerticalPadding: 1.7142rem; @headerHorizontalPadding: 1.7142rem; @headerFontWeight: 400; -@headerFontFamily: - "Roboto", - "Helvetica Neue", - Arial, - sans-serif; +@headerFontFamily: "Roboto", "Helvetica Neue", Arial, sans-serif; @headerBorder: none; @contentPadding: 1rem 2rem 2rem; diff --git a/src/themes/rtl/globals/site.variables b/src/themes/rtl/globals/site.variables index 12f7141b70..bc1c41e823 100644 --- a/src/themes/rtl/globals/site.variables +++ b/src/themes/rtl/globals/site.variables @@ -9,17 +9,5 @@ @googleFontName: "Droid Sans"; /* Kufi imported in site.overrides */ -@headerFont: - "Droid Arabic Kufi", - "Droid Sans", - "Helvetica Neue", - Arial, - Helvetica, - sans-serif; -@pageFont: - "Droid Arabic Kufi", - "Droid Sans", - "Helvetica Neue", - Arial, - Helvetica, - sans-serif; +@headerFont: "Droid Arabic Kufi", "Droid Sans", "Helvetica Neue", Arial, Helvetica, sans-serif; +@pageFont: "Droid Arabic Kufi", "Droid Sans", "Helvetica Neue", Arial, Helvetica, sans-serif; diff --git a/src/themes/twitter/elements/button.variables b/src/themes/twitter/elements/button.variables index 73a45d1f1b..52f26d295c 100644 --- a/src/themes/twitter/elements/button.variables +++ b/src/themes/twitter/elements/button.variables @@ -2,11 +2,7 @@ Global Variables -------------------- */ -@pageFont: - Helvetica Neue, - Helvetica, - Arial, - sans-serif; +@pageFont: Helvetica Neue, Helvetica, Arial, sans-serif; @textColor: #66757f; @blue: #55acee; From 39097161685c214ebc6dbe0be46c33c852279234 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= Date: Wed, 21 Dec 2022 18:51:29 +0100 Subject: [PATCH 14/15] address feedback --- .github/workflows/ci.yml | 6 ++++-- src/definitions/elements/button.less | 4 +--- src/definitions/modules/dropdown.less | 4 +--- src/definitions/modules/modal.less | 7 +------ src/definitions/modules/toast.less | 4 +--- src/themes/default/globals/reset.overrides | 6 ++++-- src/themes/default/globals/variation.variables | 17 +++-------------- 7 files changed, 15 insertions(+), 33 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c3e7e1bb29..7416835208 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,10 +11,12 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 - name: Install dependencies - run: yarn && yarn add -D eslint-config-airbnb-base eslint-plugin-unicorn eslint-plugin-jest@^26.9.0 @typescript-eslint/eslint-plugin @typescript-eslint/parser typescript github:fomantic/prettier#ca4fc1130f + run: yarn && yarn add -D eslint-config-airbnb-base eslint-plugin-unicorn eslint-plugin-jest@^26.9.0 @typescript-eslint/eslint-plugin @typescript-eslint/parser typescript - name: Lint JS and LESS files + run: npm run lint + - name: Assert LESS files formatting using Prettier run: > - npm run lint + yarn add -D eslint-config-airbnb-base eslint-plugin-unicorn eslint-plugin-jest@^26.9.0 @typescript-eslint/eslint-plugin @typescript-eslint/parser typescript github:fomantic/prettier#2.8.1-patched && 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 --exit-code diff --git a/src/definitions/elements/button.less b/src/definitions/elements/button.less index 2cfbaf9637..9201dfe1d0 100755 --- a/src/definitions/elements/button.less +++ b/src/definitions/elements/button.less @@ -215,9 +215,7 @@ } .ui.animated.button .content { - will-change: - transform, - opacity; + will-change: transform, opacity; } .ui.animated.button .visible.content { position: relative; diff --git a/src/definitions/modules/dropdown.less b/src/definitions/modules/dropdown.less index ed1b9e372f..ddffc671ee 100755 --- a/src/definitions/modules/dropdown.less +++ b/src/definitions/modules/dropdown.less @@ -58,9 +58,7 @@ border-radius: @menuBorderRadius; transition: @menuTransition; z-index: @menuZIndex; - will-change: - transform, - opacity; + will-change: transform, opacity; } .ui.dropdown .menu > * { diff --git a/src/definitions/modules/modal.less b/src/definitions/modules/modal.less index 09e74df4b3..eccf401b5f 100755 --- a/src/definitions/modules/modal.less +++ b/src/definitions/modules/modal.less @@ -33,12 +33,7 @@ flex: 0 0 auto; border-radius: @borderRadius; user-select: text; - will-change: - top, - left, - margin, - transform, - opacity; + will-change: top, left, margin, transform, opacity; } .ui.modal > :first-child:not(.close):not(.dimmer), diff --git a/src/definitions/modules/toast.less b/src/definitions/modules/toast.less index 98a55f1adb..645e239fe4 100644 --- a/src/definitions/modules/toast.less +++ b/src/definitions/modules/toast.less @@ -126,9 +126,7 @@ margin-bottom: @toastBoxMarginBottom; border-radius: @defaultBorderRadius; cursor: default; - will-change: - transform, - opacity; + will-change: transform, opacity; &:hover { opacity: @toastOpacityOnHover; } diff --git a/src/themes/default/globals/reset.overrides b/src/themes/default/globals/reset.overrides index 578bf40c0e..93d5d68da8 100755 --- a/src/themes/default/globals/reset.overrides +++ b/src/themes/default/globals/reset.overrides @@ -57,7 +57,8 @@ hr { } /** - * 1. Correct the odd `em` font sizing in all browsers. + * 1. Correct the inheritance and scaling of font size in all browsers. + * 2. Correct the odd `em` font sizing in all browsers. */ pre { @@ -97,7 +98,8 @@ strong { } /** - * 1. Correct the odd `em` font sizing in all browsers. + * 1. Correct the inheritance and scaling of font size in all browsers. + * 2. Correct the odd `em` font sizing in all browsers. */ code, diff --git a/src/themes/default/globals/variation.variables b/src/themes/default/globals/variation.variables index 55b4a9afb7..cc079887e1 100644 --- a/src/themes/default/globals/variation.variables +++ b/src/themes/default/globals/variation.variables @@ -38,9 +38,7 @@ @variationButtonWrapping: true; @variationButtonWrapped: true; @variationButtonSpaced: true; -@variationButtonConsequences: - positive, - negative; +@variationButtonConsequences: positive, negative; @variationButtonSizes: @variationAllSizes; @variationButtonColors: @variationAllColors; @@ -83,13 +81,7 @@ @variationHeaderDividing: true; @variationHeaderBlock: true; @variationHeaderAttached: true; -@variationHeaderTags: - h1, - h2, - h3, - h4, - h5, - h6; +@variationHeaderTags: h1, h2, h3, h4, h5, h6; @variationHeaderSizes: @variationAllSizes; @variationHeaderColors: @variationAllColors; @@ -690,10 +682,7 @@ @variationSliderTicked: true; @variationSliderVertical: true; @variationSliderBasic: true; -@variationSliderSizes: - small, - large, - big; +@variationSliderSizes: small, large, big; @variationSliderColors: @variationAllColors; /* Tab */ From e4abaddc5db1590e247328c4d759c0d7fefcd2e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= Date: Wed, 21 Dec 2022 20:05:08 +0100 Subject: [PATCH 15/15] fix install deps --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7416835208..ad5655a50c 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 eslint-config-airbnb-base eslint-plugin-unicorn eslint-plugin-jest@^26.9.0 @typescript-eslint/eslint-plugin @typescript-eslint/parser typescript github:fomantic/prettier#2.8.1-patched + yarn add -D github:fomantic/prettier#2.8.1-patched && 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 --exit-code