From 65d8dafdf0047a18e30debf8f54fc09da7831d7f Mon Sep 17 00:00:00 2001 From: Herst Date: Tue, 18 Sep 2018 13:35:27 +0200 Subject: [PATCH] Support new grid Ports the following checks: - W009 (empty spacer column) - E005 (row and col on same element) - E012 (input-group and col on the same element) - E013 (invalid children of rows) - E014 (invalid parent of cols) - E029 (col 0 classes) - E037 (float classes and col) - E051 (float style and col) - E052 (float style and row) --- src/bootlint.js | 119 +++++++----------- test/bootlint_test.js | 92 ++++++-------- .../grid/col-0.html} | 6 +- .../grid/col-lg-0.html | 4 +- .../grid/col-md-0.html | 4 +- .../grid/col-no-float.html | 10 +- .../grid/col-sm-0.html | 4 +- test/fixtures/grid/col-xl-0.html | 32 +++++ .../grid/cols-not-redundant.html | 4 +- .../grid/cols-outside-row-and-form-group.html | 2 +- .../grid/cols-redundant.html | 20 +-- .../grid/cols-within-form-group.html | 0 .../grid/cols-within-row.html | 0 .../grid/non-col-row-children.html | 2 +- .../grid/row-col-same-elem.html | 6 +- .../grid/row-no-float.html | 8 +- .../grid/script-child-of-row.html | 0 .../grid/spacer-col/blank-text.html | 6 +- .../grid/spacer-col/child-with-text.html | 4 +- .../grid/spacer-col/child-without-text.html | 4 +- .../grid/spacer-col/col-element.html | 8 +- .../grid/spacer-col/last-child.html | 4 +- .../spacer-col/multiple-reversed-order.html | 6 +- .../grid/spacer-col/no-child-no-text.html | 6 +- .../grid/spacer-col/non-blank-text.html | 4 +- .../grid/spacer-col/tricky-classes.html | 6 +- .../grid/spacer-col/void-elements.html | 20 +-- 27 files changed, 189 insertions(+), 192 deletions(-) rename test/{_old_fixtures/grid/col-xs-0.html => fixtures/grid/col-0.html} (84%) rename test/{_old_fixtures => fixtures}/grid/col-lg-0.html (88%) rename test/{_old_fixtures => fixtures}/grid/col-md-0.html (88%) rename test/{_old_fixtures => fixtures}/grid/col-no-float.html (77%) rename test/{_old_fixtures => fixtures}/grid/col-sm-0.html (88%) create mode 100644 test/fixtures/grid/col-xl-0.html rename test/{_old_fixtures => fixtures}/grid/cols-not-redundant.html (83%) rename test/{_old_fixtures => fixtures}/grid/cols-outside-row-and-form-group.html (90%) rename test/{_old_fixtures => fixtures}/grid/cols-redundant.html (65%) rename test/{_old_fixtures => fixtures}/grid/cols-within-form-group.html (100%) rename test/{_old_fixtures => fixtures}/grid/cols-within-row.html (100%) rename test/{_old_fixtures => fixtures}/grid/non-col-row-children.html (90%) rename test/{_old_fixtures => fixtures}/grid/row-col-same-elem.html (79%) rename test/{_old_fixtures => fixtures}/grid/row-no-float.html (85%) rename test/{_old_fixtures => fixtures}/grid/script-child-of-row.html (100%) rename test/{_old_fixtures => fixtures}/grid/spacer-col/blank-text.html (78%) rename test/{_old_fixtures => fixtures}/grid/spacer-col/child-with-text.html (88%) rename test/{_old_fixtures => fixtures}/grid/spacer-col/child-without-text.html (89%) rename test/{_old_fixtures => fixtures}/grid/spacer-col/col-element.html (85%) rename test/{_old_fixtures => fixtures}/grid/spacer-col/last-child.html (89%) rename test/{_old_fixtures => fixtures}/grid/spacer-col/multiple-reversed-order.html (72%) rename test/{_old_fixtures => fixtures}/grid/spacer-col/no-child-no-text.html (77%) rename test/{_old_fixtures => fixtures}/grid/spacer-col/non-blank-text.html (89%) rename test/{_old_fixtures => fixtures}/grid/spacer-col/tricky-classes.html (74%) rename test/{_old_fixtures => fixtures}/grid/spacer-col/void-elements.html (71%) diff --git a/src/bootlint.js b/src/bootlint.js index 33fdc9e0..eeda4280 100644 --- a/src/bootlint.js +++ b/src/bootlint.js @@ -16,22 +16,23 @@ var LocationIndex = _location.LocationIndex; (function (exports) { 'use strict'; var NUM_COLS = 12; - var COL_REGEX = /\bcol-(xs|sm|md|lg)-(\d{1,2})\b/; - var COL_REGEX_G = /\bcol-(xs|sm|md|lg)-(\d{1,2})\b/g; + var COL_REGEX = /\bcol(?:-(sm|md|lg|xl))?(?:-(auto|\d{1,2}))?\b/; + var COL_REGEX_G = /\bcol(?:-(sm|md|lg|xl))?(?:-(auto|\d{1,2}))?\b/g; var COL_CLASSES = []; - var SCREENS = ['xs', 'sm', 'md', 'lg']; + var SCREENS = ['', 'sm', 'md', 'lg', 'xl']; SCREENS.forEach(function (screen) { - for (var n = 1; n <= NUM_COLS; n++) { - COL_CLASSES.push('.col-' + screen + '-' + n); + for (var n = -1; n <= NUM_COLS; n++) { + COL_CLASSES.push('.col' + (screen && '-' + screen) + (n < 0 ? '' : '-' + (n || 'auto'))); } }); var SCREEN2NUM = { - xs: 0, - sm: 1, - md: 2, - lg: 3 + '': 0, + 'sm': 1, + 'md': 2, + 'lg': 3, + 'xl': 4 }; - var NUM2SCREEN = ['xs', 'sm', 'md', 'lg']; + var NUM2SCREEN = ['', 'sm', 'md', 'lg', 'xl']; var IN_NODE_JS = Boolean(cheerio.load); var MIN_JQUERY_VERSION = '1.9.1'; // as of Bootstrap v3.3.0 var CURRENT_BOOTSTRAP_VERSION = '3.3.7'; @@ -131,11 +132,11 @@ var LocationIndex = _location.LocationIndex; var width2screens = {}; while (true) { var match = COL_REGEX_G.exec(classes); - if (!match) { + if (!match || !match[1] && !match[2]) { break; } - var screen = match[1]; - width = match[2]; + var screen = match[1] || ''; + width = match[2] || ''; // can also be 'auto' var screens = width2screens[width]; if (!screens) { screens = width2screens[width] = []; @@ -476,7 +477,6 @@ var LocationIndex = _location.LocationIndex; } }); */ - /* addLinter('W009', function lintEmptySpacerCols($, reporter) { var selector = COL_CLASSES.map(function (colClass) { return colClass + ':not(:last-child)'; @@ -492,18 +492,9 @@ var LocationIndex = _location.LocationIndex; return; } - var colClasses = column.attr('class').split(/\s+/g).filter(function (klass) { - return COL_REGEX.test(klass); - }); - colClasses = sortedColumnClasses(colClasses.join(' ')).trim(); - - var colRegex = new RegExp('\\b(col-)(' + SCREENS.join('|') + ')(-\\d+)\\b', 'g'); - var offsetClasses = colClasses.replace(colRegex, '$1$2-offset$3'); - - reporter('Using empty spacer columns isn\'t necessary with Bootstrap\'s grid. So instead of having an empty grid column with `class="' + colClasses + '"` , just add `class="' + offsetClasses + '"` to the next grid column.', column); + reporter('Using empty spacer columns isn\'t necessary with Bootstrap\'s grid.', column); }); }); - */ /* addLinter('W010', function lintMediaPulls($, reporter) { var mediaPulls = $('.media>.pull-left, .media>.pull-right'); @@ -695,7 +686,6 @@ var LocationIndex = _location.LocationIndex; } }); */ - /* addLinter('E005', function lintRowAndColOnSameElem($, reporter) { var selector = COL_CLASSES.map(function (col) { return '.row' + col; @@ -703,10 +693,9 @@ var LocationIndex = _location.LocationIndex; var rowCols = $(selector); if (rowCols.length) { - reporter('Found both `.row` and `.col-*-*` used on the same element', rowCols); + reporter('Found both `.row` and `.col*` used on the same element', rowCols); } }); - */ /* addLinter('E006', function lintInputGroupFormControlTypes($, reporter) { var selectInputGroups = $('.input-group select'); @@ -759,7 +748,6 @@ var LocationIndex = _location.LocationIndex; } }); */ - /* addLinter('E012', function lintGridClassMixedWithInputGroup($, reporter) { var selector = COL_CLASSES.map(function (colClass) { return '.input-group' + colClass; @@ -767,35 +755,31 @@ var LocationIndex = _location.LocationIndex; var badMixes = $(selector); if (badMixes.length) { - reporter('`.input-group` and `.col-*-*` cannot be used directly on the same element. Instead, nest the `.input-group` within the `.col-*-*`', badMixes); + reporter('`.input-group` and `.col*` cannot be used directly on the same element. Instead, nest the `.input-group` within the `.col*`', badMixes); } }); - */ - /* addLinter('E013', function lintRowChildrenAreCols($, reporter) { - var ALLOWED_CHILDREN = COL_CLASSES.concat(['script', '.clearfix', '.bs-customizer-input']); - var selector = '.row>*' + ALLOWED_CHILDREN.map(function (colClass) { + var ALLOWED_CHILDREN = COL_CLASSES.concat(['script', '.clearfix']); + var disallowedChildren = ALLOWED_CHILDREN.map(function (colClass) { return ':not(' + colClass + ')'; }).join(''); + var selector = '.row>*' + disallowedChildren + ',.form-row>*' + disallowedChildren; var nonColRowChildren = $(selector); if (nonColRowChildren.length) { - reporter('Only columns (`.col-*-*`) may be children of `.row`s', nonColRowChildren); + reporter('Only columns (`.col*`) or `.clearfix` may be children of `.row`s or `.form-row`s', nonColRowChildren); } }); - */ - /* addLinter('E014', function lintColParentsAreRowsOrFormGroups($, reporter) { var selector = COL_CLASSES.map(function (colClass) { - return '*:not(.row):not(.form-group)>' + colClass + ':not(col):not(th):not(td)'; + return '*:not(.row):not(.form-row)>' + colClass + ':not(col):not(th):not(td)'; }).join(','); var colsOutsideRowsAndFormGroups = $(selector); if (colsOutsideRowsAndFormGroups.length) { - reporter('Columns (`.col-*-*`) can only be children of `.row`s or `.form-group`s', colsOutsideRowsAndFormGroups); + reporter('Columns (`.col*`) can only be children of `.row`s or `.form-row`s', colsOutsideRowsAndFormGroups); } }); - */ /* addLinter('E015', function lintInputGroupsWithMultipleAddOnsPerSide($, reporter) { var addOnClasses = ['.input-group-addon', '.input-group-btn']; @@ -944,7 +928,6 @@ var LocationIndex = _location.LocationIndex; } }); */ - /* addLinter('E029', function lintRedundantColumnClasses($, reporter) { var columns = $(COL_CLASSES.join(',')); columns.each(function (_index, col) { @@ -953,27 +936,26 @@ var LocationIndex = _location.LocationIndex; var simplifiedClasses = classes; var width2screens = width2screensFor(classes); var isRedundant = false; - for (var width = 1; width <= NUM_COLS; width++) { - var screens = width2screens[width]; - if (!screens) { - continue; - } - var runs = incrementingRunsFrom(screens); - if (!runs.length) { - continue; - } + for (var width in width2screens) { + if (Object.prototype.hasOwnProperty.call(width2screens, width)) { + var screens = width2screens[width]; + var runs = incrementingRunsFrom(screens); + if (!runs.length) { + continue; + } - isRedundant = true; + isRedundant = true; - for (var i = 0; i < runs.length; i++) { - var run = runs[i]; - var min = run[0]; - var max = run[1]; + for (var i = 0; i < runs.length; i++) { + var run = runs[i]; + var min = run[0]; + var max = run[1]; - // remove redundant classes - for (var screenNum = min + 1; screenNum <= max; screenNum++) { - var colClass = 'col-' + NUM2SCREEN[screenNum] + '-' + width; - simplifiedClasses = withoutClass(simplifiedClasses, colClass); + // remove redundant classes + for (var screenNum = min + 1; screenNum <= max; screenNum++) { + var colClass = 'col' + (NUM2SCREEN[screenNum] && '-' + NUM2SCREEN[screenNum]) + (width && '-' + width); + simplifiedClasses = withoutClass(simplifiedClasses, colClass); + } } } } @@ -992,7 +974,6 @@ var LocationIndex = _location.LocationIndex; ); }); }); - */ /* addLinter('E030', function lintSoloGlyphiconClasses($, reporter) { var missingGlyphiconClass = $('[class*="glyphicon-"]:not(.glyphicon):not(.glyphicon-class)').filter(function () { @@ -1076,17 +1057,15 @@ var LocationIndex = _location.LocationIndex; } }); */ - /* addLinter('E037', function lintColZeros($, reporter) { var selector = SCREENS.map(function (screen) { - return '.col-' + screen + '-0'; + return '.col' + (screen && '-' + screen) + '-0'; }).join(','); var elements = $(selector); if (elements.length) { - reporter('Column widths must be positive integers (and <= 12 by default). Found usage(s) of invalid nonexistent `.col-*-0` classes.', elements); + reporter('Column widths must be positive integers (and <= 12 by default). Found usage(s) of invalid nonexistent `.col*-0` classes.', elements); } }); - */ /* addLinter('E038', function lintMediaPulls($, reporter) { var mediaPullsOutsideMedia = $('.media-left, .media-right').filter(function () { @@ -1227,14 +1206,13 @@ var LocationIndex = _location.LocationIndex; } }); */ - /* addLinter('E051', function lintColumnsNoFloats($, reporter) { var pullSelector = COL_CLASSES.map(function (col) { - return '.pull-left' + col + ',.pull-right' + col; + return '.float-left' + col + ',.float-right' + col; }).join(','); var pulledCols = $(pullSelector); if (pulledCols.length) { - reporter('`.pull-right` and `.pull-left` must not be used on `.col-*-*` elements', pulledCols); + reporter('`.float-right` and `.float-left` must not be used on `.col*` elements', pulledCols); } var styledSelector = COL_CLASSES.map(function (col) { return col + '[style]'; @@ -1244,15 +1222,13 @@ var LocationIndex = _location.LocationIndex; return /float\s*:\s*[a-z]+/i.test($(el).attr('style')); }); if (styledCols.length) { - reporter('Manually added `float` styles must not be added on `.col-*-*` elements', styledCols); + reporter('Manually added `float` styles must not be added on `.col*` elements', styledCols); } }); - */ - /* addLinter('E052', function lintRowsNoFloats($, reporter) { - var pulledRows = $('.row.pull-right, .row.pull-left'); + var pulledRows = $('.row.float-right, .row.float-left'); if (pulledRows.length) { - reporter('`.pull-right` and `.pull-left` must not be used on `.row` elements', pulledRows); + reporter('`.float-right` and `.float-left` must not be used on `.row` elements', pulledRows); } var styledRows = $('.row[style]').filter(function (i, el) { //test for `float:*` in the style attribute @@ -1262,7 +1238,6 @@ var LocationIndex = _location.LocationIndex; reporter('Manually added `float` styles must not be added on `.row` elements', styledRows); } }); - */ exports._lint = function ($, reporter, disabledIdList, html) { var locationIndex = IN_NODE_JS ? new LocationIndex(html) : null; var reporterWrapper = IN_NODE_JS ? diff --git a/test/bootlint_test.js b/test/bootlint_test.js index 57cbbf42..db374407 100644 --- a/test/bootlint_test.js +++ b/test/bootlint_test.js @@ -161,18 +161,16 @@ exports.bootlint = { test.done(); }, */ - /* 'row and column classes on same element': function (test) { test.expect(1); test.deepEqual(lintHtml(utf8Fixture('grid/row-col-same-elem.html')), [ - 'Found both `.row` and `.col-*-*` used on the same element', - 'Columns (`.col-*-*`) can only be children of `.row`s or `.form-group`s' + 'Found both `.row` and `.col*` used on the same element', + 'Columns (`.col*`) can only be children of `.row`s or `.form-row`s' ], - 'should complain when .row and .col-*-* are used on the same element.'); + 'should complain when .row and .col* are used on the same element.'); test.done(); }, - */ /* 'row and container classes on same element': function (test) { test.expect(2); @@ -184,7 +182,6 @@ exports.bootlint = { 'should complain when .row and .container-fluid are used on the same element.'); test.done(); }, - */ /* 'remote modals': function (test) { test.expect(1); @@ -319,18 +316,16 @@ exports.bootlint = { test.done(); }, */ - /* 'non-column children of rows': function (test) { test.expect(2); test.deepEqual(lintHtml(utf8Fixture('grid/non-col-row-children.html')), - ['Only columns (`.col-*-*`) may be children of `.row`s'], + ['Only columns (`.col*`) or `.clearfix` may be children of `.row`s or `.form-row`s'], 'should complain when rows have non-column children.'); test.deepEqual(lintHtml(utf8Fixture('grid/script-child-of-row.html')), [], 'should not complain about + + + + + + + +
+
+
Content
+
+
+ +
+
    +
  1. +
  2. +
+ + diff --git a/test/_old_fixtures/grid/cols-not-redundant.html b/test/fixtures/grid/cols-not-redundant.html similarity index 83% rename from test/_old_fixtures/grid/cols-not-redundant.html rename to test/fixtures/grid/cols-not-redundant.html index 0a6452ba..f057c25c 100644 --- a/test/_old_fixtures/grid/cols-not-redundant.html +++ b/test/fixtures/grid/cols-not-redundant.html @@ -19,10 +19,10 @@
-
Single-digit columns
+
Single-digit columns
-
Double-digit columns
+
Double-digit columns
diff --git a/test/_old_fixtures/grid/cols-outside-row-and-form-group.html b/test/fixtures/grid/cols-outside-row-and-form-group.html similarity index 90% rename from test/_old_fixtures/grid/cols-outside-row-and-form-group.html rename to test/fixtures/grid/cols-outside-row-and-form-group.html index 360c8eaf..ab2acc81 100644 --- a/test/_old_fixtures/grid/cols-outside-row-and-form-group.html +++ b/test/fixtures/grid/cols-outside-row-and-form-group.html @@ -25,7 +25,7 @@
    -
  1. +
diff --git a/test/_old_fixtures/grid/cols-redundant.html b/test/fixtures/grid/cols-redundant.html similarity index 65% rename from test/_old_fixtures/grid/cols-redundant.html rename to test/fixtures/grid/cols-redundant.html index 46c4ad9e..c2b61e63 100644 --- a/test/_old_fixtures/grid/cols-redundant.html +++ b/test/fixtures/grid/cols-redundant.html @@ -19,16 +19,16 @@
-
Single-digit columns; sm-lg redundant; random classes interleaved
+
Single-digit columns; sm-xl redundant; random classes interleaved
-
Double-digit columns; xs-md redundant; random classes interleaved
+
Double-digit columns; [default]-lg redundant; random classes interleaved
-
xs-lg redundant
+
up to xl redundant
-
xs-sm redundant
+
up to sm redundant
sm-md redundant
@@ -36,16 +36,20 @@
md-lg redundant
+
+
lg-xl redundant
+
    -
  1. -
  2. -
  3. -
  4. +
  5. +
  6. +
  7. +
  10. +
diff --git a/test/_old_fixtures/grid/cols-within-form-group.html b/test/fixtures/grid/cols-within-form-group.html similarity index 100% rename from test/_old_fixtures/grid/cols-within-form-group.html rename to test/fixtures/grid/cols-within-form-group.html diff --git a/test/_old_fixtures/grid/cols-within-row.html b/test/fixtures/grid/cols-within-row.html similarity index 100% rename from test/_old_fixtures/grid/cols-within-row.html rename to test/fixtures/grid/cols-within-row.html diff --git a/test/_old_fixtures/grid/non-col-row-children.html b/test/fixtures/grid/non-col-row-children.html similarity index 90% rename from test/_old_fixtures/grid/non-col-row-children.html rename to test/fixtures/grid/non-col-row-children.html index 4a3f40f4..292c5e7c 100644 --- a/test/_old_fixtures/grid/non-col-row-children.html +++ b/test/fixtures/grid/non-col-row-children.html @@ -25,7 +25,7 @@
    -
  1. +
diff --git a/test/_old_fixtures/grid/row-col-same-elem.html b/test/fixtures/grid/row-col-same-elem.html similarity index 79% rename from test/_old_fixtures/grid/row-col-same-elem.html rename to test/fixtures/grid/row-col-same-elem.html index e67a9b27..8bcd3694 100644 --- a/test/_old_fixtures/grid/row-col-same-elem.html +++ b/test/fixtures/grid/row-col-same-elem.html @@ -18,13 +18,13 @@
-
+
    -
  1. -
  2. +
  3. +
diff --git a/test/_old_fixtures/grid/row-no-float.html b/test/fixtures/grid/row-no-float.html similarity index 85% rename from test/_old_fixtures/grid/row-no-float.html rename to test/fixtures/grid/row-no-float.html index bc1fc878..19d0debe 100644 --- a/test/_old_fixtures/grid/row-no-float.html +++ b/test/fixtures/grid/row-no-float.html @@ -18,11 +18,11 @@
-
-
Content
+
+
Content
-
+
Content
@@ -37,7 +37,7 @@
    -
  1. +
diff --git a/test/_old_fixtures/grid/script-child-of-row.html b/test/fixtures/grid/script-child-of-row.html similarity index 100% rename from test/_old_fixtures/grid/script-child-of-row.html rename to test/fixtures/grid/script-child-of-row.html diff --git a/test/_old_fixtures/grid/spacer-col/blank-text.html b/test/fixtures/grid/spacer-col/blank-text.html similarity index 78% rename from test/_old_fixtures/grid/spacer-col/blank-text.html rename to test/fixtures/grid/spacer-col/blank-text.html index a04f981e..e2dc2e39 100644 --- a/test/_old_fixtures/grid/spacer-col/blank-text.html +++ b/test/fixtures/grid/spacer-col/blank-text.html @@ -19,16 +19,16 @@
-
+
-
Actual column
+
Actual column
    -
  1. +
diff --git a/test/_old_fixtures/grid/spacer-col/child-with-text.html b/test/fixtures/grid/spacer-col/child-with-text.html similarity index 88% rename from test/_old_fixtures/grid/spacer-col/child-with-text.html rename to test/fixtures/grid/spacer-col/child-with-text.html index f01cfedd..6a0e06e9 100644 --- a/test/_old_fixtures/grid/spacer-col/child-with-text.html +++ b/test/fixtures/grid/spacer-col/child-with-text.html @@ -19,8 +19,8 @@
-

Some text

-
Actual column
+

Some text

+
Actual column
diff --git a/test/_old_fixtures/grid/spacer-col/child-without-text.html b/test/fixtures/grid/spacer-col/child-without-text.html similarity index 89% rename from test/_old_fixtures/grid/spacer-col/child-without-text.html rename to test/fixtures/grid/spacer-col/child-without-text.html index 121fd368..72177659 100644 --- a/test/_old_fixtures/grid/spacer-col/child-without-text.html +++ b/test/fixtures/grid/spacer-col/child-without-text.html @@ -19,8 +19,8 @@
-

-
Actual column
+

+
Actual column
diff --git a/test/_old_fixtures/grid/spacer-col/col-element.html b/test/fixtures/grid/spacer-col/col-element.html similarity index 85% rename from test/_old_fixtures/grid/spacer-col/col-element.html rename to test/fixtures/grid/spacer-col/col-element.html index 731123b5..c490967e 100644 --- a/test/_old_fixtures/grid/spacer-col/col-element.html +++ b/test/fixtures/grid/spacer-col/col-element.html @@ -20,8 +20,8 @@
- - + + @@ -31,8 +31,8 @@
-

Some text

-
Actual column
+

Some text

+
Actual column
diff --git a/test/_old_fixtures/grid/spacer-col/last-child.html b/test/fixtures/grid/spacer-col/last-child.html similarity index 89% rename from test/_old_fixtures/grid/spacer-col/last-child.html rename to test/fixtures/grid/spacer-col/last-child.html index 38a461b2..69aaf9a0 100644 --- a/test/_old_fixtures/grid/spacer-col/last-child.html +++ b/test/fixtures/grid/spacer-col/last-child.html @@ -19,8 +19,8 @@
-
Some content
-
+
Some content
+
diff --git a/test/_old_fixtures/grid/spacer-col/multiple-reversed-order.html b/test/fixtures/grid/spacer-col/multiple-reversed-order.html similarity index 72% rename from test/_old_fixtures/grid/spacer-col/multiple-reversed-order.html rename to test/fixtures/grid/spacer-col/multiple-reversed-order.html index b2ce673f..ebd9908c 100644 --- a/test/_old_fixtures/grid/spacer-col/multiple-reversed-order.html +++ b/test/fixtures/grid/spacer-col/multiple-reversed-order.html @@ -19,14 +19,14 @@
-
-
Actual column
+
+
Actual column
    -
  1. +
diff --git a/test/_old_fixtures/grid/spacer-col/no-child-no-text.html b/test/fixtures/grid/spacer-col/no-child-no-text.html similarity index 77% rename from test/_old_fixtures/grid/spacer-col/no-child-no-text.html rename to test/fixtures/grid/spacer-col/no-child-no-text.html index 0003e064..66e9441c 100644 --- a/test/_old_fixtures/grid/spacer-col/no-child-no-text.html +++ b/test/fixtures/grid/spacer-col/no-child-no-text.html @@ -19,14 +19,14 @@
-
-
Actual column
+
+
Actual column
    -
  1. +
diff --git a/test/_old_fixtures/grid/spacer-col/non-blank-text.html b/test/fixtures/grid/spacer-col/non-blank-text.html similarity index 89% rename from test/_old_fixtures/grid/spacer-col/non-blank-text.html rename to test/fixtures/grid/spacer-col/non-blank-text.html index c581140a..bc5d5214 100644 --- a/test/_old_fixtures/grid/spacer-col/non-blank-text.html +++ b/test/fixtures/grid/spacer-col/non-blank-text.html @@ -19,8 +19,8 @@
-
Some text
-
Actual column
+
Some text
+
Actual column
diff --git a/test/_old_fixtures/grid/spacer-col/tricky-classes.html b/test/fixtures/grid/spacer-col/tricky-classes.html similarity index 74% rename from test/_old_fixtures/grid/spacer-col/tricky-classes.html rename to test/fixtures/grid/spacer-col/tricky-classes.html index 71e86cac..b725d813 100644 --- a/test/_old_fixtures/grid/spacer-col/tricky-classes.html +++ b/test/fixtures/grid/spacer-col/tricky-classes.html @@ -19,14 +19,14 @@
-
-
Actual column
+
+
Actual column
    -
  1. +
diff --git a/test/_old_fixtures/grid/spacer-col/void-elements.html b/test/fixtures/grid/spacer-col/void-elements.html similarity index 71% rename from test/_old_fixtures/grid/spacer-col/void-elements.html rename to test/fixtures/grid/spacer-col/void-elements.html index 5d038e48..642a05c8 100644 --- a/test/_old_fixtures/grid/spacer-col/void-elements.html +++ b/test/fixtures/grid/spacer-col/void-elements.html @@ -19,36 +19,36 @@
-
-
Actual column
+
+
Actual column
- -
Actual column
+ +
Actual column
-
-
Actual column
+
+
Actual column
- An image -
Actual column
+ An image +
Actual column
- -
Actual column
+ +
Actual column