jenkins-bot has submitted this change and it was merged.

Change subject: Add block formatting rules to stylelint
......................................................................


Add block formatting rules to stylelint

See https://www.mediawiki.org/wiki/Manual:Coding_conventions/CSS#Whitespace

Change-Id: I011da395f9dae9773ba0355198f0be6473be275e
---
M .stylelintrc
M src/themes/apex/widgets.less
M src/themes/mediawiki/widgets.less
M src/themes/mediawiki/windows.less
4 files changed, 36 insertions(+), 11 deletions(-)

Approvals:
  Jforrester: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/.stylelintrc b/.stylelintrc
index 5c8ac8d..47e6ba3 100644
--- a/.stylelintrc
+++ b/.stylelintrc
@@ -5,12 +5,27 @@
                "color-named": [ "never" ],
                "color-no-invalid-hex": true,
 
+               "block-closing-brace-newline-after": [ "always" ],
+               "block-closing-brace-newline-before": [ "always-multi-line" ],
+               "block-closing-brace-space-before": [ "always-single-line" ],
+               "block-opening-brace-newline-after": [ "always-multi-line" ],
+               "block-opening-brace-space-after": [ "always-single-line" ],
+               "block-opening-brace-space-before": [ "always" ],
+
                "declaration-bang-space-after": [ "never" ],
                "declaration-bang-space-before": [ "always" ],
 
                "declaration-block-no-duplicate-properties": [ true, { ignore: 
[ "consecutive-duplicates" ] } ],
                "declaration-block-no-shorthand-property-overrides": true,
 
+               "declaration-block-semicolon-newline-after": [ "always" ],
+               "declaration-block-semicolon-newline-before": [ 
"never-multi-line" ],
+               "declaration-block-semicolon-space-after": [ 
"always-single-line" ],
+               "declaration-block-semicolon-space-before": [ "never" ],
+
+               "declaration-block-single-line-max-declarations": 1,
+               "declaration-block-trailing-semicolon": [ "always" ],
+
                "declaration-colon-space-after": [ "always" ],
                "declaration-colon-space-before": [ "never" ],
 
diff --git a/src/themes/apex/widgets.less b/src/themes/apex/widgets.less
index 2e46697..63bd10b 100644
--- a/src/themes/apex/widgets.less
+++ b/src/themes/apex/widgets.less
@@ -1053,10 +1053,20 @@
        }
 
        .oo-ui-progressBarWidget-slide-frames () {
-               from { margin-left: -40%; }
-               to { margin-left: 100%; }
+               from {
+                       margin-left: -40%;
+               }
+               to {
+                       margin-left: 100%;
+               }
        }
-       @-webkit-keyframes oo-ui-progressBarWidget-slide { 
.oo-ui-progressBarWidget-slide-frames }
-       @-moz-keyframes oo-ui-progressBarWidget-slide { 
.oo-ui-progressBarWidget-slide-frames }
-       @keyframes oo-ui-progressBarWidget-slide { 
.oo-ui-progressBarWidget-slide-frames }
+       @-webkit-keyframes oo-ui-progressBarWidget-slide {
+               .oo-ui-progressBarWidget-slide-frames;
+       }
+       @-moz-keyframes oo-ui-progressBarWidget-slide {
+               .oo-ui-progressBarWidget-slide-frames;
+       }
+       @keyframes oo-ui-progressBarWidget-slide {
+               .oo-ui-progressBarWidget-slide-frames;
+       }
 }
diff --git a/src/themes/mediawiki/widgets.less 
b/src/themes/mediawiki/widgets.less
index e3025c0..fc83fb9 100644
--- a/src/themes/mediawiki/widgets.less
+++ b/src/themes/mediawiki/widgets.less
@@ -390,7 +390,7 @@
                        border-radius: @border-radius-default;
                }
 
-               &:checked + span  {
+               &:checked + span {
                        background-size: 100% 100%;
                }
 
@@ -513,7 +513,7 @@
                        border-radius: 100%;
                }
 
-               &:checked + span  {
+               &:checked + span {
                        background-size: 100% 100%;
                }
 
@@ -1360,12 +1360,12 @@
                }
        }
        @-webkit-keyframes oo-ui-progressBarWidget-slide {
-               .oo-ui-progressBarWidget-slide-frames
+               .oo-ui-progressBarWidget-slide-frames;
        }
        @-moz-keyframes oo-ui-progressBarWidget-slide {
-               .oo-ui-progressBarWidget-slide-frames
+               .oo-ui-progressBarWidget-slide-frames;
        }
        @keyframes oo-ui-progressBarWidget-slide {
-               .oo-ui-progressBarWidget-slide-frames
+               .oo-ui-progressBarWidget-slide-frames;
        }
 }
diff --git a/src/themes/mediawiki/windows.less 
b/src/themes/mediawiki/windows.less
index f994380..a92fc22 100644
--- a/src/themes/mediawiki/windows.less
+++ b/src/themes/mediawiki/windows.less
@@ -280,7 +280,7 @@
                }
 
                &.oo-ui-window-ready {
-                       > .oo-ui-window-frame  {
+                       > .oo-ui-window-frame {
                                // Fade frame
                                opacity: 1;
                                .oo-ui-transform( scale( 1 ) );

-- 
To view, visit https://gerrit.wikimedia.org/r/289330
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I011da395f9dae9773ba0355198f0be6473be275e
Gerrit-PatchSet: 4
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: VolkerE <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: VolkerE <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to