[ticket/15115] Update grads & single line rules

hanakin · hanakin · commit 74fcd60afea0 · 2017-03-24T20:33:24.000-04:00
PHPBB3-15115
diff --git a/.postcss-sorting.json b/.postcss-sorting.json
@@ -2,12 +2,16 @@
 	"order": [
 		"custom-properties",
 		"dollar-variables",
+		{
+			"type": "at-rule",
+			"name": "include"
+		},
 		"declarations",
+		"rules",
 		{
 			"type": "at-rule",
 			"name": "media"
-		},
-		"rules"
+		}
 	],
 	"properties-order": [
 		{
@@ -70,12 +74,7 @@
 				"background-origin",
 				"background-size",
 				"interpolation-mode",
-				"filter"
-			]
-		},
-		{
-			"emptyLineBefore": false,
-			"properties": [
+				"filter",
 				"border",
 				"border-width",
 				"border-style",
diff --git a/.stylelintrc b/.stylelintrc
@@ -18,12 +18,11 @@
 			}
 		],
 		"block-closing-brace-newline-before": "always-multi-line",
-		"block-closing-brace-space-after": "always-single-line",
 		"block-closing-brace-space-before": "always-single-line",
 
 		"block-no-empty": true,
 
-		"block-opening-brace-newline-after": "always",
+		"block-opening-brace-newline-after": "always-multi-line",
 		"block-opening-brace-space-after": "always-single-line",
 		"block-opening-brace-space-before": "always",
 
@@ -131,6 +130,11 @@
 		"property-case": "lower",
 		"property-no-unknown": true,
 
+		"rule-empty-line-before": ["always-multi-line", {
+			"ignore": ["after-comment"],
+			"except": ["first-nested"]
+		}],
+
 		"selector-attribute-brackets-space-inside": "never",
 		"selector-attribute-operator-space-after": "never",
 		"selector-attribute-operator-space-before": "never",
@@ -179,12 +183,16 @@
 		"order/declaration-block-order": [
 			"custom-properties",
 			"dollar-variables",
+			{
+				"type": "at-rule",
+				"name": "include"
+			},
 			"declarations",
+			"rules",
 			{
 				"type": "at-rule",
 				"name": "media"
-			},
-			"rules"
+			}
 		],
 		"order/declaration-block-properties-specified-order": [
 			[
diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css
