From fc56eda94bc9f20f17894cadf2034774d353f98e Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Mon, 1 May 2023 05:23:57 -0400 Subject: [PATCH] Bump stylelint-config-standard-scss from 7.0.1 to 9.0.0 (#24755) Co-authored-by: Yamagishi Kazutoshi --- app/javascript/styles/mailer.scss | 2 +- app/javascript/styles/mastodon/accounts.scss | 4 +- app/javascript/styles/mastodon/admin.scss | 4 +- .../styles/mastodon/components.scss | 54 +++++++------- .../styles/mastodon/containers.scss | 6 +- app/javascript/styles/mastodon/dashboard.scss | 2 +- app/javascript/styles/mastodon/forms.scss | 2 +- app/javascript/styles/mastodon/modal.scss | 2 +- app/javascript/styles/mastodon/statuses.scss | 2 +- app/javascript/styles/mastodon/tables.scss | 2 +- package.json | 2 +- yarn.lock | 71 +++++++++---------- 12 files changed, 76 insertions(+), 77 deletions(-) diff --git a/app/javascript/styles/mailer.scss b/app/javascript/styles/mailer.scss index 18fe522eb..a12f74fc0 100644 --- a/app/javascript/styles/mailer.scss +++ b/app/javascript/styles/mailer.scss @@ -547,7 +547,7 @@ ul.rules-list { } } -@media (max-width: 697px) { +@media (width <= 697px) { .email-container, .col-1, .col-2, diff --git a/app/javascript/styles/mastodon/accounts.scss b/app/javascript/styles/mastodon/accounts.scss index 853d7f70d..8b7b63407 100644 --- a/app/javascript/styles/mastodon/accounts.scss +++ b/app/javascript/styles/mastodon/accounts.scss @@ -33,7 +33,7 @@ border-radius: 4px 4px 0 0; } - @media screen and (max-width: 600px) { + @media screen and (width <= 600px) { height: 200px; } } @@ -158,7 +158,7 @@ color: lighten($inverted-text-color, 10%); } - @media screen and (max-width: 700px) { + @media screen and (width <= 700px) { padding: 30px 20px; .page { diff --git a/app/javascript/styles/mastodon/admin.scss b/app/javascript/styles/mastodon/admin.scss index c92191ea2..c4ecb4254 100644 --- a/app/javascript/styles/mastodon/admin.scss +++ b/app/javascript/styles/mastodon/admin.scss @@ -1355,7 +1355,7 @@ a.sparkline { } } - @media screen and (max-width: 930px) { + @media screen and (width <= 930px) { grid-template-columns: minmax(0, 1fr); } } @@ -1641,7 +1641,7 @@ a.sparkline { } } - @media screen and (max-width: 800px) { + @media screen and (width <= 800px) { border: 0; &__item { diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index b9f27edcc..df3330316 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -514,7 +514,7 @@ body > [data-popper-placement] { outline: 0; } - @media screen and (max-width: 600px) { + @media screen and (width <= 600px) { font-size: 16px; } } @@ -535,7 +535,7 @@ body > [data-popper-placement] { all: unset; } - @media screen and (max-width: 600px) { + @media screen and (width <= 600px) { height: 100px !important; // Prevent auto-resize textarea resize: vertical; } @@ -2414,7 +2414,7 @@ $ui-header-height: 55px; display: none; } - @media screen and (min-width: 320px) { + @media screen and (width >= 320px) { .logo--wordmark { display: block; } @@ -2526,7 +2526,7 @@ $ui-header-height: 55px; overflow: hidden; } -@media screen and (min-width: 631px) { +@media screen and (width >= 631px) { .columns-area { padding: 0; } @@ -2586,7 +2586,7 @@ $ui-header-height: 55px; &:hover, &:focus, &:active { - @media screen and (min-width: 631px) { + @media screen and (width >= 631px) { background: lighten($ui-base-color, 14%); border-bottom-color: lighten($ui-base-color, 14%); } @@ -2603,7 +2603,7 @@ $ui-header-height: 55px; } } -@media screen and (min-width: 600px) { +@media screen and (width >= 600px) { .tabs-bar__link { span { display: inline; @@ -2826,7 +2826,7 @@ $ui-header-height: 55px; color: $darker-text-color; } - @media screen and (min-width: 600px) { + @media screen and (width >= 600px) { padding: 40px; } } @@ -2936,7 +2936,7 @@ $ui-header-height: 55px; height: 36px; color: $dark-text-color; - @media screen and (min-width: 600px) { + @media screen and (width >= 600px) { display: flex; } } @@ -2988,7 +2988,7 @@ $ui-header-height: 55px; position: sticky; background: $ui-base-color; - @media screen and (min-width: 600) { + @media screen and (width >= 600) { padding: 0 40px; } @@ -3256,7 +3256,7 @@ $ui-header-height: 55px; user-select: none; } - @media screen and (min-height: 640px) { + @media screen and (height >= 640px) { display: block; } } @@ -3605,19 +3605,19 @@ $ui-header-height: 55px; } } - @media screen and (max-height: 810px) { + @media screen and (height <= 810px) { .trends__item:nth-of-type(3) { display: none; } } - @media screen and (max-height: 720px) { + @media screen and (height <= 720px) { .trends__item:nth-of-type(2) { display: none; } } - @media screen and (max-height: 670px) { + @media screen and (height <= 670px) { display: none; } @@ -3701,7 +3701,7 @@ $ui-header-height: 55px; margin-bottom: 20px; } - @media screen and (max-width: 600px) { + @media screen and (width <= 600px) { font-size: 16px; } } @@ -4497,7 +4497,7 @@ a.status-card.compact:hover { background: lighten($ui-base-color, 4%); } - @media screen and (max-width: 600px) { + @media screen and (width <= 600px) { font-size: 16px; } } @@ -5832,7 +5832,7 @@ a.status-card.compact:hover { font-weight: 700; margin-bottom: 15px; - @media screen and (max-height: 800px) { + @media screen and (height <= 800px) { font-size: 22px; } } @@ -6019,7 +6019,7 @@ a.status-card.compact:hover { display: flex; border-top: 1px solid $ui-secondary-color; - @media screen and (max-width: 480px) { + @media screen and (width <= 480px) { flex-wrap: wrap; overflow-y: auto; } @@ -6030,7 +6030,7 @@ a.status-card.compact:hover { box-sizing: border-box; width: 50%; - @media screen and (max-width: 480px) { + @media screen and (width <= 480px) { width: 100%; } } @@ -6052,13 +6052,13 @@ a.status-card.compact:hover { color: $inverted-text-color; } - @media screen and (max-width: 480px) { + @media screen and (width <= 480px) { max-height: 10vh; } } .focal-point-modal__content { - @media screen and (max-width: 480px) { + @media screen and (width <= 480px) { max-height: 40vh; } } @@ -6109,7 +6109,7 @@ a.status-card.compact:hover { } } - @media screen and (max-width: 480px) { + @media screen and (width <= 480px) { padding: 10px; max-width: 100%; order: 2; @@ -7138,7 +7138,7 @@ noscript { } } -@media screen and (max-width: 630px) and (max-height: 400px) { +@media screen and (width <= 630px) and (height <= 400px) { $duration: 400ms; $delay: 100ms; @@ -7268,7 +7268,7 @@ noscript { background: lighten($ui-base-color, 4%); } - @media screen and (max-width: 600px) { + @media screen and (width <= 600px) { font-size: 16px; } } @@ -7359,7 +7359,7 @@ noscript { width: 380px; overflow: hidden; - @media screen and (max-width: 420px) { + @media screen and (width <= 420px) { width: 90%; } @@ -7414,7 +7414,7 @@ noscript { width: 380px; overflow: hidden; - @media screen and (max-width: 420px) { + @media screen and (width <= 420px) { width: 90%; } @@ -7513,7 +7513,7 @@ noscript { } } - @media screen and (max-width: 480px) { + @media screen and (width <= 480px) { img, video { max-height: 100%; @@ -9070,7 +9070,7 @@ noscript { margin-bottom: 20px; } - @media screen and (max-width: 600px) { + @media screen and (width <= 600px) { display: block; h4 { diff --git a/app/javascript/styles/mastodon/containers.scss b/app/javascript/styles/mastodon/containers.scss index fb71ad034..3d646da23 100644 --- a/app/javascript/styles/mastodon/containers.scss +++ b/app/javascript/styles/mastodon/containers.scss @@ -2,7 +2,7 @@ width: 700px; margin: 0 auto; - @media screen and (max-width: 740px) { + @media screen and (width <= 740px) { width: 100%; margin: 0; } @@ -44,7 +44,7 @@ margin-top: 40px; box-sizing: border-box; - @media screen and (max-width: 400px) { + @media screen and (width <= 400px) { width: 100%; margin-top: 0; padding: 20px; @@ -64,7 +64,7 @@ margin-bottom: 10px; border-bottom: 1px solid $ui-base-color; - @media screen and (max-width: 440px) { + @media screen and (width <= 440px) { width: 100%; margin: 0; padding: 20px; diff --git a/app/javascript/styles/mastodon/dashboard.scss b/app/javascript/styles/mastodon/dashboard.scss index f25765d1d..bc34c6ec0 100644 --- a/app/javascript/styles/mastodon/dashboard.scss +++ b/app/javascript/styles/mastodon/dashboard.scss @@ -59,7 +59,7 @@ grid-template-columns: minmax(0, 1fr) minmax(0, 1fr) minmax(0, 1fr); grid-gap: 10px; - @media screen and (max-width: 1350px) { + @media screen and (width <= 1350px) { grid-template-columns: minmax(0, 1fr) minmax(0, 1fr); } diff --git a/app/javascript/styles/mastodon/forms.scss b/app/javascript/styles/mastodon/forms.scss index dc52bcd87..03e06c100 100644 --- a/app/javascript/styles/mastodon/forms.scss +++ b/app/javascript/styles/mastodon/forms.scss @@ -722,7 +722,7 @@ code { } } - @media screen and (max-width: 740px) and (min-width: 441px) { + @media screen and (440px < width <= 740px) { margin-top: 40px; } diff --git a/app/javascript/styles/mastodon/modal.scss b/app/javascript/styles/mastodon/modal.scss index 29b1f162b..0b7220b21 100644 --- a/app/javascript/styles/mastodon/modal.scss +++ b/app/javascript/styles/mastodon/modal.scss @@ -30,7 +30,7 @@ } } -@media screen and (max-width: 600px) { +@media screen and (width <= 600px) { .account-header { margin-top: 0; } diff --git a/app/javascript/styles/mastodon/statuses.scss b/app/javascript/styles/mastodon/statuses.scss index 6c9ea916a..590d03fb8 100644 --- a/app/javascript/styles/mastodon/statuses.scss +++ b/app/javascript/styles/mastodon/statuses.scss @@ -63,7 +63,7 @@ } } - @media screen and (max-width: 740px) { + @media screen and (width <= 740px) { .detailed-status, .status, .load-more { diff --git a/app/javascript/styles/mastodon/tables.scss b/app/javascript/styles/mastodon/tables.scss index 49e5bbf9f..38cfc8727 100644 --- a/app/javascript/styles/mastodon/tables.scss +++ b/app/javascript/styles/mastodon/tables.scss @@ -361,7 +361,7 @@ a.table-action-link { } } - @media screen and (max-width: 870px) { + @media screen and (width <= 870px) { .accounts-table tbody td.optional { display: none; } diff --git a/package.json b/package.json index e146a3f4a..3f8899c02 100644 --- a/package.json +++ b/package.json @@ -197,7 +197,7 @@ "react-intl-translations-manager": "^5.0.3", "react-test-renderer": "^16.14.0", "stylelint": "^15.6.0", - "stylelint-config-standard-scss": "^7.0.1", + "stylelint-config-standard-scss": "^9.0.0", "typescript": "^5.0.4", "webpack-dev-server": "^3.11.3", "yargs": "^17.7.1" diff --git a/yarn.lock b/yarn.lock index 223780862..3c0fb85bf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8965,7 +8965,7 @@ postcss-loader@^4.3.0: postcss-media-query-parser@^0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz#27b39c6f4d94f81b1a73b8f76351c609e5cef244" - integrity sha1-J7Ocb02U+Bsac7j3Y1HGCeXO8kQ= + integrity sha512-3sOlxmbKcSHMjlUXQZKQ06jOswE7oVkXPxmZdoB1r5l0q6gTFTQSHxNxOrCccElbW7dxNytifNEo8qidX2Vsig== postcss-merge-longhand@^6.0.0: version "6.0.0" @@ -9133,19 +9133,19 @@ postcss-reduce-transforms@^6.0.0: postcss-resolve-nested-selector@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz#29ccbc7c37dedfac304e9fff0bf1596b3f6a0e4e" - integrity sha1-Kcy8fDfe36wwTp//C/FZaz9qDk4= + integrity sha512-HvExULSwLqHLgUy1rl3ANIqCsvMS0WHss2UOsXhXnQaZ9VCc2oBvIpXrl00IUFT5ZDITME0o6oiXeiHr2SAIfw== postcss-safe-parser@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/postcss-safe-parser/-/postcss-safe-parser-6.0.0.tgz#bb4c29894171a94bc5c996b9a30317ef402adaa1" integrity sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ== -postcss-scss@^4.0.2: +postcss-scss@^4.0.6: version "4.0.6" resolved "https://registry.yarnpkg.com/postcss-scss/-/postcss-scss-4.0.6.tgz#5d62a574b950a6ae12f2aa89b60d63d9e4432bfd" integrity sha512-rLDPhJY4z/i4nVFZ27j9GqLxj1pwxE80eAzUNRMXtcpipFYIeowerzBgG3yJhMtObGEXidtIgbUpQ3eLDsf5OQ== -postcss-selector-parser@^6.0.11, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.5, postcss-selector-parser@^6.0.6, postcss-selector-parser@^6.0.9: +postcss-selector-parser@^6.0.11, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.5, postcss-selector-parser@^6.0.9: version "6.0.11" resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz#2e41dc39b7ad74046e1615185185cd0b17d0c8dc" integrity sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g== @@ -10895,45 +10895,44 @@ stylehacks@^6.0.0: browserslist "^4.21.4" postcss-selector-parser "^6.0.4" -stylelint-config-recommended-scss@^9.0.0: +stylelint-config-recommended-scss@^11.0.0: + version "11.0.0" + resolved "https://registry.yarnpkg.com/stylelint-config-recommended-scss/-/stylelint-config-recommended-scss-11.0.0.tgz#7b933ecac99cd3b52d14d1746e3ecd36f421b4b6" + integrity sha512-EDghTDU7aOv2LTsRZvcT1w8mcjUaMhuy+t38iV5I/0Qiu6ixdkRwhLEMul3K/fnB2v9Nwqvb3xpvJfPH+HduDw== + dependencies: + postcss-scss "^4.0.6" + stylelint-config-recommended "^12.0.0" + stylelint-scss "^4.6.0" + +stylelint-config-recommended@^12.0.0: + version "12.0.0" + resolved "https://registry.yarnpkg.com/stylelint-config-recommended/-/stylelint-config-recommended-12.0.0.tgz#d0993232fca017065fd5acfcb52dd8a188784ef4" + integrity sha512-x6x8QNARrGO2sG6iURkzqL+Dp+4bJorPMMRNPScdvaUK8PsynriOcMW7AFDKqkWAS5wbue/u8fUT/4ynzcmqdQ== + +stylelint-config-standard-scss@^9.0.0: version "9.0.0" - resolved "https://registry.yarnpkg.com/stylelint-config-recommended-scss/-/stylelint-config-recommended-scss-9.0.0.tgz#e755cf3654f3a3a6d7bdf84fe0a814595754a386" - integrity sha512-5e9pn3Ztfncd8s9OqvvCW7tZpYe+vGmPi7VEXX7XEp+Kj38PnKCrvFCBL+hQ7rkD4d5QzjB3BxlFEyo/30UWUw== + resolved "https://registry.yarnpkg.com/stylelint-config-standard-scss/-/stylelint-config-standard-scss-9.0.0.tgz#70c66e1179612519fdf6ca1dbff23c804def1b6b" + integrity sha512-yPKpJsrZn4ybuQZx/DkEHuCjw7pJginErE/47dFhCnrvD48IJ4UYec8tSiCuJWMA3HRjbIa3nh5ZeSauDGuVAg== dependencies: - postcss-scss "^4.0.2" - stylelint-config-recommended "^10.0.1" - stylelint-scss "^4.4.0" + stylelint-config-recommended-scss "^11.0.0" + stylelint-config-standard "^33.0.0" -stylelint-config-recommended@^10.0.1: - version "10.0.1" - resolved "https://registry.yarnpkg.com/stylelint-config-recommended/-/stylelint-config-recommended-10.0.1.tgz#25a8828acf6cde87dac6db2950c8c4ed82a69ae1" - integrity sha512-TQ4xQ48tW4QSlODcti7pgSRqBZcUaBzuh0jPpfiMhwJKBPkqzTIAU+IrSWL/7BgXlOM90DjB7YaNgFpx8QWhuA== - -stylelint-config-standard-scss@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/stylelint-config-standard-scss/-/stylelint-config-standard-scss-7.0.1.tgz#4ba83fa19e1508937f7e02674e085cf94fc1a145" - integrity sha512-m5sRdtsB1F5fnC1Ozla7ryftU47wVpO+HWd+JQTqeoG0g/oPh5EfbWfcVHbNCEtuoHfALIySiUWS20pz2hX6jA== +stylelint-config-standard@^33.0.0: + version "33.0.0" + resolved "https://registry.yarnpkg.com/stylelint-config-standard/-/stylelint-config-standard-33.0.0.tgz#1f7bb299153a53874073e93829e37a475842f0f9" + integrity sha512-eyxnLWoXImUn77+ODIuW9qXBDNM+ALN68L3wT1lN2oNspZ7D9NVGlNHb2QCUn4xDug6VZLsh0tF8NyoYzkgTzg== dependencies: - stylelint-config-recommended-scss "^9.0.0" - stylelint-config-standard "^30.0.1" + stylelint-config-recommended "^12.0.0" -stylelint-config-standard@^30.0.1: - version "30.0.1" - resolved "https://registry.yarnpkg.com/stylelint-config-standard/-/stylelint-config-standard-30.0.1.tgz#a84d57c240c37f7db47023ab9d2e64c49090e1eb" - integrity sha512-NbeHOmpRQhjZh5XB1B/S4MLRWvz4xxAxeDBjzl0tY2xEcayNhLbaRGF0ZQzq+DQZLCcPpOHeS2Ru1ydbkhkmLg== +stylelint-scss@^4.6.0: + version "4.7.0" + resolved "https://registry.yarnpkg.com/stylelint-scss/-/stylelint-scss-4.7.0.tgz#f986bf8c5a4b93eae2b67d3a3562eef822657908" + integrity sha512-TSUgIeS0H3jqDZnby1UO1Qv3poi1N8wUYIJY6D1tuUq2MN3lwp/rITVo0wD+1SWTmRm0tNmGO0b7nKInnqF6Hg== dependencies: - stylelint-config-recommended "^10.0.1" - -stylelint-scss@^4.4.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/stylelint-scss/-/stylelint-scss-4.4.0.tgz#87ce9d049eff1ce67cce788780fbfda63099017e" - integrity sha512-Qy66a+/30aylFhPmUArHhVsHOun1qrO93LGT15uzLuLjWS7hKDfpFm34mYo1ndR4MCo8W4bEZM1+AlJRJORaaw== - dependencies: - lodash "^4.17.21" postcss-media-query-parser "^0.2.3" postcss-resolve-nested-selector "^0.1.1" - postcss-selector-parser "^6.0.6" - postcss-value-parser "^4.1.0" + postcss-selector-parser "^6.0.11" + postcss-value-parser "^4.2.0" stylelint@^15.6.0: version "15.6.0" @@ -11613,7 +11612,7 @@ utf-8-validate@^6.0.3: util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" - integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= + integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw== util@0.10.3: version "0.10.3"