From 9f5dc941dc5a1628b9a8b8284cc8c471ef8d3a33 Mon Sep 17 00:00:00 2001
From: hanakin <midaym@gmail.com>
Date: Sat, 18 Mar 2017 18:21:22 -0400
Subject: [PATCH] [ticket/15115] Slight tweaks to rc and sorting file

PHPBB3-15115
---
 .postcss-sorting.json |  1 -
 .stylelintrc          | 19 +++++++++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/.postcss-sorting.json b/.postcss-sorting.json
index af119c28c4..fa52bd6769 100644
--- a/.postcss-sorting.json
+++ b/.postcss-sorting.json
@@ -2,7 +2,6 @@
 	"order": [
 		"custom-properties",
 		"dollar-variables",
-		"at-rules",
 		"declarations",
 		{
 			"type": "at-rule",
diff --git a/.stylelintrc b/.stylelintrc
index 094033df34..cc261b4622 100644
--- a/.stylelintrc
+++ b/.stylelintrc
@@ -12,7 +12,11 @@
 		"at-rule-no-vendor-prefix": true,
 		"at-rule-semicolon-newline-after": "always",
 
-		"block-closing-brace-newline-after": "always",
+		"block-closing-brace-newline-after": [
+			"always", {
+				"ignoreAtRules": ["if", "else"]
+			}
+		],
 		"block-closing-brace-newline-before": "always-multi-line",
 		"block-closing-brace-space-after": "always-single-line",
 		"block-closing-brace-space-before": "always-single-line",
@@ -59,11 +63,11 @@
 		"declaration-empty-line-before": "never",
 
 		"declaration-property-unit-blacklist": {
-			"line-height": ["rem", "em", "%"]
+			"line-height": ["rem", "px", "em", "%"]
 		},
 		"declaration-property-unit-whitelist": {
-			"height": ["px", "%"],
-			"width": ["px", "%"],
+			"height": ["px", "%", "vh"],
+			"width": ["px", "%", "vw"],
 			"font-size": ["px", "rem", "%"],
 			"margin-left": ["px", "rem", "%"],
 			"margin-right": ["px", "rem", "%"],
@@ -72,7 +76,9 @@
 			"padding-left": ["px", "rem"],
 			"padding-right": ["px", "rem"],
 			"padding-top": ["px", "rem"],
-			"padding-bottom": ["px", "rem"]
+			"padding-bottom": ["px", "rem"],
+			"letter-spacing": ["em"],
+			"word-spacing": ["em"]
 		},
 
 		"font-family-name-quotes": "always-where-recommended",
@@ -178,7 +184,6 @@
 		"order/declaration-block-order": [
 			"custom-properties",
 			"dollar-variables",
-			"at-rules",
 			"declarations",
 			{
 				"type": "at-rule",
@@ -187,8 +192,6 @@
 			"rules"
 		],
 		"order/declaration-block-properties-specified-order": [
-			"-moz-osx-font-smoothing",
-			"-webkit-font-smoothing",
 			"font",
 			"font-family",
 			"font-size",