diff options
| author | Mark Otto <[email protected]> | 2012-02-22 08:21:29 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-02-22 08:21:29 -0800 |
| commit | b86969f762c7c1c94e75eebd9905ef568713d647 (patch) | |
| tree | 8831b622570aeb390f53a0acd009ceccd28c4f85 /less | |
| parent | 4410ede8ed976f449d9b1735652e081ed863a131 (diff) | |
| download | bootstrap-b86969f762c7c1c94e75eebd9905ef568713d647.tar.xz bootstrap-b86969f762c7c1c94e75eebd9905ef568713d647.zip | |
restore fixed navbar container reset to grid mixin, add override for inputs within grid mixins to fix #2080
Diffstat (limited to 'less')
| -rw-r--r-- | less/mixins.less | 106 |
1 files changed, 55 insertions, 51 deletions
diff --git a/less/mixins.less b/less/mixins.less index 2cd916707..6b85be96f 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -502,33 +502,36 @@ margin-left: @gridGutterWidth; } - .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) } - - .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) } + // 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); } + + .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); } } } |