jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/338474 )
Change subject: build: Bump stylelint and make pass ...................................................................... build: Bump stylelint and make pass grunt-stylelint 0.6.0 → 0.7.0 stylelint-config-wikimedia 0.3.0 → 0.4.1 Change-Id: Id87b8df04d415e1f1058a4042a31408236402037 --- M .stylelintrc M package.json M src/styles/common.less M src/themes/apex/elements.less M src/themes/apex/widgets.less M src/themes/mediawiki/windows.less 6 files changed, 16 insertions(+), 12 deletions(-) Approvals: jenkins-bot: Verified VolkerE: Looks good to me, approved diff --git a/.stylelintrc b/.stylelintrc index 0e2a672..06a77ac 100644 --- a/.stylelintrc +++ b/.stylelintrc @@ -4,7 +4,6 @@ "at-rule-empty-line-before": null, "block-closing-brace-space-after": null, "block-no-empty": null, - "block-no-single-line": null, "no-descending-specificity": null } } diff --git a/package.json b/package.json index 7e7e97f..83b2d0b 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "grunt-jsonlint": "1.1.0", "grunt-karma": "2.0.0", "grunt-promise-q": "git://github.com/jdforrester/grunt-promise-q.git#v0.1.1-wmf.1", - "grunt-stylelint": "0.6.0", + "grunt-stylelint": "0.7.0", "grunt-svg2png": "git://github.com/jdforrester/grunt-svg2png.git#v0.2.7-wmf.1", "grunt-tyops": "0.1.0", "karma": "1.1.1", @@ -55,6 +55,6 @@ "karma-qunit": "1.1.0", "q": "1.4.1", "qunitjs": "1.22.0", - "stylelint-config-wikimedia": "0.3.0" + "stylelint-config-wikimedia": "0.4.1" } } diff --git a/src/styles/common.less b/src/styles/common.less index e65a34a..06add49 100644 --- a/src/styles/common.less +++ b/src/styles/common.less @@ -44,14 +44,14 @@ } .oo-ui-animation( @value1, @value2: X, ... ) { - @value: ~`"@{arguments}".replace( /[\[\]]|\,\sX/g, '' )`; // stylelint-disable-line function-comma-space-after, function-whitespace-after, string-quotes + @value: ~`"@{arguments}".replace( /[\[\]]|\,\sX/g, '' )`; // stylelint-disable-line function-comma-space-after, function-whitespace-after, string-quotes, value-keyword-case -webkit-animation: @value; -moz-animation: @value; animation: @value; } .oo-ui-transition( @value1, @value2: X, ... ) { - @value: ~`"@{arguments}".replace( /[\[\]]|\,\sX/g, '' )`; // stylelint-disable-line function-comma-space-after, function-whitespace-after, string-quotes + @value: ~`"@{arguments}".replace( /[\[\]]|\,\sX/g, '' )`; // stylelint-disable-line function-comma-space-after, function-whitespace-after, string-quotes, value-keyword-case -webkit-transition: @value; -moz-transition: @value; transition: @value; diff --git a/src/themes/apex/elements.less b/src/themes/apex/elements.less index fb724de..78900ca 100644 --- a/src/themes/apex/elements.less +++ b/src/themes/apex/elements.less @@ -28,7 +28,7 @@ &:hover, &:focus { - outline: none; + outline: 0; > .oo-ui-iconElement-icon { opacity: 1; @@ -98,7 +98,8 @@ &:hover, &:focus { border-color: #aaa; - outline: none; + outline: 0; + } } diff --git a/src/themes/apex/widgets.less b/src/themes/apex/widgets.less index c1837b7..7c1bb6d 100644 --- a/src/themes/apex/widgets.less +++ b/src/themes/apex/widgets.less @@ -340,7 +340,8 @@ select:hover, select:focus { border-color: rgba( 0, 0, 0, 0.2 ); - outline: none; + outline: 0; + } } @@ -386,7 +387,8 @@ &.oo-ui-widget-enabled { input:focus, textarea:focus { - outline: none; + outline: 0; + border-color: #a7dcff; box-shadow: 0 0 0.3em #a7dcff, 0 0 0 #fff; } @@ -533,7 +535,8 @@ > .oo-ui-capsuleMultiselectWidget-content > input:focus { // For Chrome - outline: none; + outline: 0; + } } @@ -596,7 +599,8 @@ border-radius: 0.25em; &:focus { - outline: none; + outline: 0; + border-color: @progressive; } diff --git a/src/themes/mediawiki/windows.less b/src/themes/mediawiki/windows.less index a443250..bc8bff6 100644 --- a/src/themes/mediawiki/windows.less +++ b/src/themes/mediawiki/windows.less @@ -181,7 +181,7 @@ } &.oo-ui-flaggedElement { - &-progressive + &-progressive, // Deprecated in v0.16.1 &-constructive { &:hover { -- To view, visit https://gerrit.wikimedia.org/r/338474 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id87b8df04d415e1f1058a4042a31408236402037 Gerrit-PatchSet: 2 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Jforrester <jforres...@wikimedia.org> Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org> Gerrit-Reviewer: VolkerE <volke...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits