Container-related checks

Port E003 (misplaced .row), and remove E004 (nestable containers).
twbs · Jul 28, 2019 · 79ca109 · 79ca109
1 parent f7d2f09
commit 79ca109
Show file tree

Hide file tree

Showing 13 changed files with 3 additions and 149 deletions.
diff --git a/src/bootlint.js b/src/bootlint.js
@@ -586,7 +586,6 @@ var LocationIndex = _location.LocationIndex;
             }
         };
     })());
-    /*
     addLinter('E003', function lintContainers($, reporter) {
         var notAnyColClass = COL_CLASSES.map(function (colClass) {
             return ':not(' + colClass + ')';
@@ -607,15 +606,6 @@ var LocationIndex = _location.LocationIndex;
             reporter('Found one or more `.row`s that were not children of a grid column or descendants of a `.container` or `.container-fluid` or `.modal-body`', rowsOutsideColumnsAndContainers);
         }
     });
-    */
-    /*
-    addLinter('E004', function lintNestedContainers($, reporter) {
-        var nestedContainers = $('.container, .container-fluid').children('.container, .container-fluid');
-        if (nestedContainers.length) {
-            reporter('Containers (`.container` and `.container-fluid`) are not nestable', nestedContainers);
-        }
-    });
-    */
     addLinter('E005', function lintRowAndColOnSameElem($, reporter) {
         var selector = COL_CLASSES.map(function (col) {
             return '.row' + col;

diff --git a/test/_old_fixtures/containers/nested-fixed-fixed.html b/test/_old_fixtures/containers/nested-fixed-fixed.html
diff --git a/test/_old_fixtures/containers/nested-fixed-fluid.html b/test/_old_fixtures/containers/nested-fixed-fluid.html
diff --git a/test/_old_fixtures/containers/nested-fluid-fixed.html b/test/_old_fixtures/containers/nested-fluid-fixed.html
diff --git a/test/_old_fixtures/containers/nested-fluid-fluid.html b/test/_old_fixtures/containers/nested-fluid-fluid.html
diff --git a/test/bootlint_test.js b/test/bootlint_test.js
@@ -97,25 +97,6 @@ exports.bootlint = {
             'should not complain when rows are children of `.modal-body`.');
         test.done();
     },
-    */
-    /*
-    'nested containers': function (test) {
-        test.expect(4);
-        test.deepEqual(lintHtml(utf8Fixture('containers/nested-fixed-fixed.html')),
-            ['Containers (`.container` and `.container-fluid`) are not nestable'],
-            'should complain when a container is within a container.');
-        test.deepEqual(lintHtml(utf8Fixture('containers/nested-fixed-fluid.html')),
-            ['Containers (`.container` and `.container-fluid`) are not nestable'],
-            'should complain when a container is within a container.');
-        test.deepEqual(lintHtml(utf8Fixture('containers/nested-fluid-fluid.html')),
-            ['Containers (`.container` and `.container-fluid`) are not nestable'],
-            'should complain when a container is within a container.');
-        test.deepEqual(lintHtml(utf8Fixture('containers/nested-fluid-fixed.html')),
-            ['Containers (`.container` and `.container-fluid`) are not nestable'],
-            'should complain when a container is within a container.');
-        test.done();
-    },
-    */
     /*
     'viewport meta tag': function (test) {
         test.expect(2);
@@ -138,7 +119,6 @@ exports.bootlint = {
             '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);
         test.deepEqual(lintHtml(utf8Fixture('containers/fixed-row-same-elem.html')),

diff --git a/test/_old_fixtures/containers/ancestor.html → test/fixtures/containers/ancestor.html b/test/_old_fixtures/containers/ancestor.html → test/fixtures/containers/ancestor.html
diff --git a/test/_old_fixtures/containers/columns.html → test/fixtures/containers/columns.html b/test/_old_fixtures/containers/columns.html → test/fixtures/containers/columns.html
@@ -19,14 +19,14 @@
     <body>
         <div class="container-fluid">
             <div class="row">
-                <div class="col-xs-6">
+                <div class="col-sm-6">
                     <div class="row">
-                        <div class="col-xs-12">
+                        <div class="col-xl-12">
                             We can nest rows within columns.
                         </div>
                     </div>
                 </div>
-                <div class="col-xs-6">Rest</div>
+                <div class="col-md-6">Rest</div>
             </div>
         </div>
 

diff --git a/...tures/containers/fixed-row-same-elem.html → ...tures/containers/fixed-row-same-elem.html b/...tures/containers/fixed-row-same-elem.html → ...tures/containers/fixed-row-same-elem.html
diff --git a/test/_old_fixtures/containers/fixed.html → test/fixtures/containers/fixed.html b/test/_old_fixtures/containers/fixed.html → test/fixtures/containers/fixed.html
diff --git a/...tures/containers/fluid-row-same-elem.html → ...tures/containers/fluid-row-same-elem.html b/...tures/containers/fluid-row-same-elem.html → ...tures/containers/fluid-row-same-elem.html
diff --git a/test/_old_fixtures/containers/fluid.html → test/fixtures/containers/fluid.html b/test/_old_fixtures/containers/fluid.html → test/fixtures/containers/fluid.html
diff --git a/test/_old_fixtures/containers/missing.html → test/fixtures/containers/missing.html b/test/_old_fixtures/containers/missing.html → test/fixtures/containers/missing.html