Skip to content

Commit

Permalink
[ticket/15115] Slight tweaks to rc and sorting file
Browse files Browse the repository at this point in the history
PHPBB3-15115
  • Loading branch information
hanakin committed Mar 25, 2017
1 parent f1ad532 commit 9f5dc94
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 9 deletions.
1 change: 0 additions & 1 deletion .postcss-sorting.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"order": [
"custom-properties",
"dollar-variables",
"at-rules",
"declarations",
{
"type": "at-rule",
Expand Down
19 changes: 11 additions & 8 deletions .stylelintrc
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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", "%"],
Expand All @@ -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",
Expand Down Expand Up @@ -178,7 +184,6 @@
"order/declaration-block-order": [
"custom-properties",
"dollar-variables",
"at-rules",
"declarations",
{
"type": "at-rule",
Expand All @@ -187,8 +192,6 @@
"rules"
],
"order/declaration-block-properties-specified-order": [
"-moz-osx-font-smoothing",
"-webkit-font-smoothing",
"font",
"font-family",
"font-size",
Expand Down

0 comments on commit 9f5dc94

Please sign in to comment.