diff options
| author | Mark Otto <[email protected]> | 2016-02-06 00:47:40 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2016-02-06 00:47:40 -0800 |
| commit | cac92017d3d9fcfc4641379fc0350318efbb6059 (patch) | |
| tree | 5b3d6afcb7a690139a09395b135471ba9de9f170 /scss | |
| parent | e149a6035ef5689040d619ac7301f802b1dc8167 (diff) | |
| parent | 29dcf9ac623c5ae13bd3d582b9e0b369ba7a3cc6 (diff) | |
| download | bootstrap-cac92017d3d9fcfc4641379fc0350318efbb6059.tar.xz bootstrap-cac92017d3d9fcfc4641379fc0350318efbb6059.zip | |
Merge branch 'v4-dev' into v4-grid-redux
Diffstat (limited to 'scss')
| -rw-r--r-- | scss/.scss-lint.yml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scss/.scss-lint.yml b/scss/.scss-lint.yml index b736c3699..f93f30d37 100644 --- a/scss/.scss-lint.yml +++ b/scss/.scss-lint.yml @@ -106,6 +106,12 @@ linters: "-moz-box-sizing", "box-sizing", "display", + "flex", + "flex-direction", + "flex-flow", + "flex-order", + "flex-pack", + "flex-align", "float", "width", "min-width", @@ -113,12 +119,6 @@ linters: "height", "min-height", "max-height", - "flex", - "flex-direction", - "flex-flow", - "flex-order", - "flex-pack", - "flex-align", "padding", "padding-top", "padding-right", |