From ca2dc639c4523f0a147193ef804176ec93aae20a Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Tue, 4 Aug 2020 15:10:06 -0700 Subject: [PATCH] styles: Enable most stylelint-config-standard rules. Signed-off-by: Anders Kaseorg --- package.json | 2 +- stylelint.config.js | 20 +++++--------------- templates/zerver/emails/email.css | 30 +++++++++++++++--------------- version.py | 2 +- yarn.lock | 7 +++++++ 5 files changed, 29 insertions(+), 32 deletions(-) diff --git a/package.json b/package.json index f82c3977e5..fc574b479f 100644 --- a/package.json +++ b/package.json @@ -103,7 +103,7 @@ "source-map": "^0.6.1", "stylelint": "^13.0.0", "stylelint-config-prettier": "^8.0.2", - "stylelint-config-recommended": "^3.0.0", + "stylelint-config-standard": "^20.0.0", "svgo": "^1.2.2", "swagger-parser": "^10.0.0", "typescript": "^3.5.1", diff --git a/stylelint.config.js b/stylelint.config.js index 72b09f3765..64c1cb176c 100644 --- a/stylelint.config.js +++ b/stylelint.config.js @@ -1,7 +1,7 @@ "use strict"; module.exports = { - extends: ["stylelint-config-recommended", "stylelint-config-prettier"], + extends: ["stylelint-config-standard", "stylelint-config-prettier"], rules: { // Add some exceptions for recommended rules "at-rule-no-unknown": [true, {ignoreAtRules: ["extend"]}], @@ -14,20 +14,10 @@ module.exports = { "no-descending-specificity": null, "no-duplicate-selectors": null, - // Stylistic rules for CSS. - "function-whitespace-after": "always", - - "value-keyword-case": "lower", - - "selector-attribute-operator-space-after": "never", - "selector-attribute-operator-space-before": "never", - "selector-pseudo-element-colon-notation": "double", - "selector-type-case": "lower", - - "media-feature-range-operator-space-after": "always", - "media-feature-range-operator-space-before": "always", - - "comment-whitespace-inside": "always", + // Disable standard rules we don't comply with yet + "comment-empty-line-before": null, + "declaration-empty-line-before": null, + "length-zero-no-unit": null, // Limit language features "color-no-hex": true, diff --git a/templates/zerver/emails/email.css b/templates/zerver/emails/email.css index 7c9c361d9a..d3d5bf3e4b 100644 --- a/templates/zerver/emails/email.css +++ b/templates/zerver/emails/email.css @@ -55,7 +55,7 @@ table td { } .main { - background-color: #ffffff; + background-color: #fff; border-radius: 3px; width: 100%; } @@ -77,7 +77,7 @@ table td { .footer p, .footer span, .footer a { - color: #999999; + color: #999; font-size: 12px; text-align: center; } @@ -90,7 +90,7 @@ h1, h2, h3, h4 { - color: #000000; + color: #000; font-family: sans-serif; font-weight: 400; line-height: 1.4; @@ -144,7 +144,7 @@ a:hover { border-radius: 4px; font-size: 16px; outline: none; - color: #ffffff; + color: #fff; font-family: sans-serif; text-decoration: none; text-align: center; @@ -183,14 +183,14 @@ a.button:hover { .recipient_block { background-color: #f0f4f5; - border: 1px solid #000000; + border: 1px solid #000; margin-bottom: 4px; } .recipient_header { color: #e0dada; - background-color: #444444; - border-bottom: 1px solid #000000; + background-color: #444; + border-bottom: 1px solid #000; font-weight: bold; padding: 2px; } @@ -219,13 +219,13 @@ a.button:hover { } .hot_convo_recipient_block { - border: 1px solid #000000; + border: 1px solid #000; margin-bottom: 4px; } .hot_convo_recipient_header { background-color: #9ec9ff; - border-bottom: 1px solid #000000; + border-bottom: 1px solid #000; font-weight: bold; padding: 2px; } @@ -241,13 +241,13 @@ a.button:hover { } .recipient_block_with_messages { - border: 1px solid #000000; + border: 1px solid #000; margin-bottom: 4px; } .recipient_header_with_messages { background-color: #9ecaff; - border-bottom: 1px solid #000000; + border-bottom: 1px solid #000; font-weight: bold; padding: 2px; } @@ -259,14 +259,14 @@ a.button:hover { .recipient_block_without_messages { background-color: #f0f4f5; - border: 1px solid #000000; + border: 1px solid #000; margin-bottom: 4px; } .recipient_header_without_messages { - color: #ffffff; - background-color: #444444; - border-bottom: 1px solid #000000; + color: #fff; + background-color: #444; + border-bottom: 1px solid #000; font-weight: bold; padding: 2px; } diff --git a/version.py b/version.py index 529d487db6..738d7c0f0b 100644 --- a/version.py +++ b/version.py @@ -44,4 +44,4 @@ API_FEATURE_LEVEL = 27 # historical commits sharing the same major version, in which case a # minor version bump suffices. -PROVISION_VERSION = '95.2' +PROVISION_VERSION = '95.3' diff --git a/yarn.lock b/yarn.lock index e8618c94bb..4d8f9ea494 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11350,6 +11350,13 @@ stylelint-config-recommended@^3.0.0: resolved "https://registry.yarnpkg.com/stylelint-config-recommended/-/stylelint-config-recommended-3.0.0.tgz#e0e547434016c5539fe2650afd58049a2fd1d657" integrity sha512-F6yTRuc06xr1h5Qw/ykb2LuFynJ2IxkKfCMf+1xqPffkxh0S09Zc902XCffcsw/XMFq/OzQ1w54fLIDtmRNHnQ== +stylelint-config-standard@^20.0.0: + version "20.0.0" + resolved "https://registry.yarnpkg.com/stylelint-config-standard/-/stylelint-config-standard-20.0.0.tgz#06135090c9e064befee3d594289f50e295b5e20d" + integrity sha512-IB2iFdzOTA/zS4jSVav6z+wGtin08qfj+YyExHB3LF9lnouQht//YyB0KZq9gGz5HNPkddHOzcY8HsUey6ZUlA== + dependencies: + stylelint-config-recommended "^3.0.0" + stylelint@^13.0.0: version "13.6.1" resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-13.6.1.tgz#cc1d76338116d55e8ff2be94c4a4386c1239b878"