Merge pull request #9718 from twbs/bs3_row_margins

BS3: Simpler row margins

1 files changed, 12 insertions, 24 deletions

diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index b44253ee2..c153c62f7 100644
--- a/dist/css/bootstrap.css
+++ b/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;
@@ -1909,18 +1909,6 @@ textarea.input-lg {
 }
 
 @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;
   }