Skip to content

Commit 2e09ffe

Browse files
committed
Merge pull request twbs#461 from tinyfly/responsive-row-fix
Undo negative margin on .row for responsive layouts
2 parents 523e02f + 2c0a60a commit 2e09ffe

File tree

3 files changed

+20
-2
lines changed

3 files changed

+20
-2
lines changed

bootstrap.css

+7-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* http://www.apache.org/licenses/LICENSE-2.0
77
*
88
* Designed and built with all the love in the world @twitter by @mdo and @fat.
9-
* Date: Mon Oct 17 23:44:56 PDT 2011
9+
* Date: Fri Oct 21 11:54:44 CDT 2011
1010
*/
1111
/* Reset.less
1212
* Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
@@ -2268,6 +2268,9 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
22682268
width: auto;
22692269
padding: 0 10px;
22702270
}
2271+
.row {
2272+
margin-left: 0;
2273+
}
22712274
[class*="span"] {
22722275
float: none;
22732276
display: block;
@@ -2299,6 +2302,9 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
22992302
width: auto;
23002303
padding: 0 10px;
23012304
}
2305+
.row {
2306+
margin-left: 0;
2307+
}
23022308
[class*="span"] {
23032309
float: none;
23042310
display: block;

bootstrap.min.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/responsive.less

+12
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,12 @@
1212
width: auto;
1313
padding: 0 10px;
1414
}
15+
16+
// remove negative margin so we don't hang off the screen
17+
.row {
18+
margin-left: 0;
19+
}
20+
1521
// Make all columns even
1622
[class*="span"] {
1723
float: none;
@@ -57,6 +63,12 @@
5763
width: auto;
5864
padding: 0 10px;
5965
}
66+
67+
// remove negative margin so we don't hang off the screen
68+
.row {
69+
margin-left: 0;
70+
}
71+
6072
// Make all columns even
6173
[class*="span"] {
6274
float: none;

0 commit comments

Comments
 (0)