mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-19 03:41:19 +02:00
Code Issues Releases Wiki Activity

restore fixed navbar container reset to grid mixin, add override for inputs within grid mixins to fix #2080

Browse Source
This commit is contained in:
Mark Otto
2012-02-22 08:21:29 -08:00
parent 4410ede8ed
commit b86969f762
4 changed files with 101 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
less/mixins.less
View File

@@ -502,33 +502,36 @@
margin-left: @gridGutterWidth;
}
.container { .span(12); }
// Set the container width, and reset it for fixed navbars
.container,
.navbar-fixed-top .container,
.navbar-fixed-bottom .container { .span(12); }
.span1 { .span(1) }
.span2 { .span(2) }
.span3 { .span(3) }
.span4 { .span(4) }
.span5 { .span(5) }
.span6 { .span(6) }
.span7 { .span(7) }
.span8 { .span(8) }
.span9 { .span(9) }
.span10 { .span(10) }
.span11 { .span(11) }
.span12 { .span(12) }
.span1 { .span(1); }
.span2 { .span(2); }
.span3 { .span(3); }
.span4 { .span(4); }
.span5 { .span(5); }
.span6 { .span(6); }
.span7 { .span(7); }
.span8 { .span(8); }
.span9 { .span(9); }
.span10 { .span(10); }
.span11 { .span(11); }
.span12 { .span(12); }
.offset1 { .offset(1) }
.offset2 { .offset(2) }
.offset3 { .offset(3) }
.offset4 { .offset(4) }
.offset5 { .offset(5) }
.offset6 { .offset(6) }
.offset7 { .offset(7) }
.offset8 { .offset(8) }
.offset9 { .offset(9) }
.offset10 { .offset(10) }
.offset11 { .offset(11) }
.offset12 { .offset(12) }
.offset1 { .offset(1); }
.offset2 { .offset(2); }
.offset3 { .offset(3); }
.offset4 { .offset(4); }
.offset5 { .offset(5); }
.offset6 { .offset(6); }
.offset7 { .offset(7); }
.offset8 { .offset(8); }
.offset9 { .offset(9); }
.offset10 { .offset(10); }
.offset11 { .offset(11); }
.offset12 { .offset(12); }
}
@@ -548,18 +551,18 @@
> [class*="span"]:first-child {
margin-left: 0;
}
> .span1 { .span(1) }
> .span2 { .span(2) }
> .span3 { .span(3) }
> .span4 { .span(4) }
> .span5 { .span(5) }
> .span6 { .span(6) }
> .span7 { .span(7) }
> .span8 { .span(8) }
> .span9 { .span(9) }
> .span10 { .span(10) }
> .span11 { .span(11) }
> .span12 { .span(12) }
> .span1 { .span(1); }
> .span2 { .span(2); }
> .span3 { .span(3); }
> .span4 { .span(4); }
> .span5 { .span(5); }
> .span6 { .span(6); }
> .span7 { .span(7); }
> .span8 { .span(8); }
> .span9 { .span(9); }
> .span10 { .span(10); }
> .span11 { .span(11); }
> .span12 { .span(12); }
}
}
@@ -573,18 +576,19 @@
input,
textarea,
.uneditable-input {
&.span1 { .span(1) }
&.span2 { .span(2) }
&.span3 { .span(3) }
&.span4 { .span(4) }
&.span5 { .span(5) }
&.span6 { .span(6) }
&.span7 { .span(7) }
&.span8 { .span(8) }
&.span9 { .span(9) }
&.span10 { .span(10) }
&.span11 { .span(11) }
&.span12 { .span(12) }
margin-left: 0; // override margin-left from core grid system
> .span1 { .span(1); }
> .span2 { .span(2); }
> .span3 { .span(3); }
> .span4 { .span(4); }
> .span5 { .span(5); }
> .span6 { .span(6); }
> .span7 { .span(7); }
> .span8 { .span(8); }
> .span9 { .span(9); }
> .span10 { .span(10); }
> .span11 { .span(11); }
> .span12 { .span(12); }
}
}