Merge pull request #9718 from twbs/bs3_row_margins

BS3: Simpler row margins

dist/css/bootstrap.css

@@ -300,6 +300,8 @@ html {
 }
 
 body {
+  padding-right: 15px;
+  padding-left: 15px;
   font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
   font-size: 14px;
   line-height: 1.428571429;
@@ -757,6 +759,11 @@ pre code {
   clear: both;
 }
 
+.row {
+  margin-right: -15px;
+  margin-left: -15px;
+}
+
 .row:before,
 .row:after {
   display: table;
@@ -777,18 +784,6 @@ pre code {
   clear: both;
 }
 
-@media (min-width: 768px) {
-  .container .row {
-    margin-right: -15px;
-    margin-left: -15px;
-  }
-}
-
-.row .row {
-  margin-right: -15px;
-  margin-left: -15px;
-}
-
 .col-xs-1,
 .col-xs-2,
 .col-xs-3,
@@ -1888,6 +1883,11 @@ textarea.input-lg {
   padding-top: 6px;
 }
 
+.form-horizontal .form-group {
+  margin-right: -15px;
+  margin-left: -15px;
+}
+
 .form-horizontal .form-group:before,
 .form-horizontal .form-group:after {
   display: table;
@@ -1908,18 +1908,6 @@ textarea.input-lg {
   clear: both;
 }
 
-@media (min-width: 768px) {
-  .container .form-horizontal .form-group {
-    margin-right: -15px;
-    margin-left: -15px;
-  }
-}
-
-.form-horizontal .form-group .row {
-  margin-right: -15px;
-  margin-left: -15px;
-}
-
 @media (min-width: 768px) {
   .form-horizontal .control-label {
     text-align: right;

less/mixins.less

@@ -529,21 +529,9 @@
 
 // Creates a wrapper for a series of columns
 .make-row(@gutter: @grid-gutter-width) {
-  // Then clear the floated columns
+  margin-left:  (@gutter / -2);
+  margin-right: (@gutter / -2);
   .clearfix();
-
-  .container & {
-    @media (min-width: @screen-small) {
-      margin-left:  (@gutter / -2);
-      margin-right: (@gutter / -2);
-    }
-  }
-
-  // Negative margin nested rows out to align the content of columns
-  .row {
-    margin-left:  (@gutter / -2);
-    margin-right: (@gutter / -2);
-  }
 }
 
 // Generate the extra small columns

less/scaffolding.less

@@ -22,6 +22,8 @@ html {
 }
 
 body {
+  padding-left:  (@grid-gutter-width / 2);
+  padding-right: (@grid-gutter-width / 2);
   font-family: @font-family-base;
   font-size: @font-size-base;
   line-height: @line-height-base;