Skip to content

B
bootstrap
Commit b86969f7 authored by Mark Otto's avatar Mark Otto
Browse files
Options

restore fixed navbar container reset to grid mixin, add override for inputs... 

restore fixed navbar container reset to grid mixin, add override for inputs within grid mixins to fix #2080
parent 4410ede8
Hide whitespace changes
Inline Side-by-side
Showing with 103 additions and 90 deletions
docs/assets/css/bootstrap-responsive.css
View file @ b86969f7
...@@ -174,7 +174,7 @@ ...@@ -174,7 +174,7 @@
float: left; float: left;
margin-left: 20px; margin-left: 20px;
} }
.container { .container, .navbar-fixed-top .container, .navbar-fixed-bottom .container {
width: 724px; width: 724px;
} }
.span1 { .span1 {
...@@ -303,40 +303,43 @@ ...@@ -303,40 +303,43 @@
.row-fluid > .span12 { .row-fluid > .span12 {
width: 99.999999993%; width: 99.999999993%;
} }
input.span1, textarea.span1, .uneditable-input.span1 { input, textarea, .uneditable-input {
margin-left: 0;
}
input > .span1, textarea > .span1, .uneditable-input > .span1 {
width: 32px; width: 32px;
} }
input.span2, textarea.span2, .uneditable-input.span2 { input > .span2, textarea > .span2, .uneditable-input > .span2 {
width: 94px; width: 94px;
} }
input.span3, textarea.span3, .uneditable-input.span3 { input > .span3, textarea > .span3, .uneditable-input > .span3 {
width: 156px; width: 156px;
} }
input.span4, textarea.span4, .uneditable-input.span4 { input > .span4, textarea > .span4, .uneditable-input > .span4 {
width: 218px; width: 218px;
} }
input.span5, textarea.span5, .uneditable-input.span5 { input > .span5, textarea > .span5, .uneditable-input > .span5 {
width: 280px; width: 280px;
} }
input.span6, textarea.span6, .uneditable-input.span6 { input > .span6, textarea > .span6, .uneditable-input > .span6 {
width: 342px; width: 342px;
} }
input.span7, textarea.span7, .uneditable-input.span7 { input > .span7, textarea > .span7, .uneditable-input > .span7 {
width: 404px; width: 404px;
} }
input.span8, textarea.span8, .uneditable-input.span8 { input > .span8, textarea > .span8, .uneditable-input > .span8 {
width: 466px; width: 466px;
} }
input.span9, textarea.span9, .uneditable-input.span9 { input > .span9, textarea > .span9, .uneditable-input > .span9 {
width: 528px; width: 528px;
} }
input.span10, textarea.span10, .uneditable-input.span10 { input > .span10, textarea > .span10, .uneditable-input > .span10 {
width: 590px; width: 590px;
} }
input.span11, textarea.span11, .uneditable-input.span11 { input > .span11, textarea > .span11, .uneditable-input > .span11 {
width: 652px; width: 652px;
} }
input.span12, textarea.span12, .uneditable-input.span12 { input > .span12, textarea > .span12, .uneditable-input > .span12 {
width: 714px; width: 714px;
} }
} }
...@@ -466,7 +469,7 @@ ...@@ -466,7 +469,7 @@
float: left; float: left;
margin-left: 30px; margin-left: 30px;
} }
.container { .container, .navbar-fixed-top .container, .navbar-fixed-bottom .container {
width: 1170px; width: 1170px;
} }
.span1 { .span1 {
...@@ -595,40 +598,43 @@ ...@@ -595,40 +598,43 @@
.row-fluid > .span12 { .row-fluid > .span12 {
width: 100%; width: 100%;
} }
input.span1, textarea.span1, .uneditable-input.span1 { input, textarea, .uneditable-input {
margin-left: 0;
}
input > .span1, textarea > .span1, .uneditable-input > .span1 {
width: 60px; width: 60px;
} }
input.span2, textarea.span2, .uneditable-input.span2 { input > .span2, textarea > .span2, .uneditable-input > .span2 {
width: 160px; width: 160px;
} }
input.span3, textarea.span3, .uneditable-input.span3 { input > .span3, textarea > .span3, .uneditable-input > .span3 {
width: 260px; width: 260px;
} }
input.span4, textarea.span4, .uneditable-input.span4 { input > .span4, textarea > .span4, .uneditable-input > .span4 {
width: 360px; width: 360px;
} }
input.span5, textarea.span5, .uneditable-input.span5 { input > .span5, textarea > .span5, .uneditable-input > .span5 {
width: 460px; width: 460px;
} }
input.span6, textarea.span6, .uneditable-input.span6 { input > .span6, textarea > .span6, .uneditable-input > .span6 {
width: 560px; width: 560px;
} }
input.span7, textarea.span7, .uneditable-input.span7 { input > .span7, textarea > .span7, .uneditable-input > .span7 {
width: 660px; width: 660px;
} }
input.span8, textarea.span8, .uneditable-input.span8 { input > .span8, textarea > .span8, .uneditable-input > .span8 {
width: 760px; width: 760px;
} }
input.span9, textarea.span9, .uneditable-input.span9 { input > .span9, textarea > .span9, .uneditable-input > .span9 {
width: 860px; width: 860px;
} }
input.span10, textarea.span10, .uneditable-input.span10 { input > .span10, textarea > .span10, .uneditable-input > .span10 {
width: 960px; width: 960px;
} }
input.span11, textarea.span11, .uneditable-input.span11 { input > .span11, textarea > .span11, .uneditable-input > .span11 {
width: 1060px; width: 1060px;
} }
input.span12, textarea.span12, .uneditable-input.span12 { input > .span12, textarea > .span12, .uneditable-input > .span12 {
width: 1160px; width: 1160px;
} }
.thumbnails { .thumbnails {
......
docs/assets/css/bootstrap.css
View file @ b86969f7
...@@ -134,7 +134,7 @@ a:hover { ...@@ -134,7 +134,7 @@ a:hover {
float: left; float: left;
margin-left: 20px; margin-left: 20px;
} }
.container { .container, .navbar-fixed-top .container, .navbar-fixed-bottom .container {
width: 940px; width: 940px;
} }
.span1 { .span1 {
...@@ -726,40 +726,43 @@ textarea[class*="span"], ...@@ -726,40 +726,43 @@ textarea[class*="span"],
float: none; float: none;
margin-left: 0; margin-left: 0;
} }
input.span1, textarea.span1, .uneditable-input.span1 { input, textarea, .uneditable-input {
margin-left: 0;
}
input > .span1, textarea > .span1, .uneditable-input > .span1 {
width: 50px; width: 50px;
} }
input.span2, textarea.span2, .uneditable-input.span2 { input > .span2, textarea > .span2, .uneditable-input > .span2 {
width: 130px; width: 130px;
} }
input.span3, textarea.span3, .uneditable-input.span3 { input > .span3, textarea > .span3, .uneditable-input > .span3 {
width: 210px; width: 210px;
} }
input.span4, textarea.span4, .uneditable-input.span4 { input > .span4, textarea > .span4, .uneditable-input > .span4 {
width: 290px; width: 290px;
} }
input.span5, textarea.span5, .uneditable-input.span5 { input > .span5, textarea > .span5, .uneditable-input > .span5 {
width: 370px; width: 370px;
} }
input.span6, textarea.span6, .uneditable-input.span6 { input > .span6, textarea > .span6, .uneditable-input > .span6 {
width: 450px; width: 450px;
} }
input.span7, textarea.span7, .uneditable-input.span7 { input > .span7, textarea > .span7, .uneditable-input > .span7 {
width: 530px; width: 530px;
} }
input.span8, textarea.span8, .uneditable-input.span8 { input > .span8, textarea > .span8, .uneditable-input > .span8 {
width: 610px; width: 610px;
} }
input.span9, textarea.span9, .uneditable-input.span9 { input > .span9, textarea > .span9, .uneditable-input > .span9 {
width: 690px; width: 690px;
} }
input.span10, textarea.span10, .uneditable-input.span10 { input > .span10, textarea > .span10, .uneditable-input > .span10 {
width: 770px; width: 770px;
} }
input.span11, textarea.span11, .uneditable-input.span11 { input > .span11, textarea > .span11, .uneditable-input > .span11 {
width: 850px; width: 850px;
} }
input.span12, textarea.span12, .uneditable-input.span12 { input > .span12, textarea > .span12, .uneditable-input > .span12 {
width: 930px; width: 930px;
} }
input[disabled], input[disabled],
......
less/mixins.less
View file @ b86969f7
...@@ -502,33 +502,36 @@ ...@@ -502,33 +502,36 @@
margin-left: @gridGutterWidth; margin-left: @gridGutterWidth;
} }
.container { .span(12); } // Set the container width, and reset it for fixed navbars
.container,
.span1 { .span(1) } .navbar-fixed-top .container,
.span2 { .span(2) } .navbar-fixed-bottom .container { .span(12); }
.span3 { .span(3) }
.span4 { .span(4) } .span1 { .span(1); }
.span5 { .span(5) } .span2 { .span(2); }
.span6 { .span(6) } .span3 { .span(3); }
.span7 { .span(7) } .span4 { .span(4); }
.span8 { .span(8) } .span5 { .span(5); }
.span9 { .span(9) } .span6 { .span(6); }
.span10 { .span(10) } .span7 { .span(7); }
.span11 { .span(11) } .span8 { .span(8); }
.span12 { .span(12) } .span9 { .span(9); }
.span10 { .span(10); }
.offset1 { .offset(1) } .span11 { .span(11); }
.offset2 { .offset(2) } .span12 { .span(12); }
.offset3 { .offset(3) }
.offset4 { .offset(4) } .offset1 { .offset(1); }
.offset5 { .offset(5) } .offset2 { .offset(2); }
.offset6 { .offset(6) } .offset3 { .offset(3); }
.offset7 { .offset(7) } .offset4 { .offset(4); }
.offset8 { .offset(8) } .offset5 { .offset(5); }
.offset9 { .offset(9) } .offset6 { .offset(6); }
.offset10 { .offset(10) } .offset7 { .offset(7); }
.offset11 { .offset(11) } .offset8 { .offset(8); }
.offset12 { .offset(12) } .offset9 { .offset(9); }
.offset10 { .offset(10); }
.offset11 { .offset(11); }
.offset12 { .offset(12); }
} }
...@@ -548,18 +551,18 @@ ...@@ -548,18 +551,18 @@
> [class*="span"]:first-child { > [class*="span"]:first-child {
margin-left: 0; margin-left: 0;
} }
> .span1 { .span(1) } > .span1 { .span(1); }
> .span2 { .span(2) } > .span2 { .span(2); }
> .span3 { .span(3) } > .span3 { .span(3); }
> .span4 { .span(4) } > .span4 { .span(4); }
> .span5 { .span(5) } > .span5 { .span(5); }
> .span6 { .span(6) } > .span6 { .span(6); }
> .span7 { .span(7) } > .span7 { .span(7); }
> .span8 { .span(8) } > .span8 { .span(8); }
> .span9 { .span(9) } > .span9 { .span(9); }
> .span10 { .span(10) } > .span10 { .span(10); }
> .span11 { .span(11) } > .span11 { .span(11); }
> .span12 { .span(12) } > .span12 { .span(12); }
} }
} }
...@@ -573,18 +576,19 @@ ...@@ -573,18 +576,19 @@
input, input,
textarea, textarea,
.uneditable-input { .uneditable-input {
&.span1 { .span(1) } margin-left: 0; // override margin-left from core grid system
&.span2 { .span(2) } > .span1 { .span(1); }
&.span3 { .span(3) } > .span2 { .span(2); }
&.span4 { .span(4) } > .span3 { .span(3); }
&.span5 { .span(5) } > .span4 { .span(4); }
&.span6 { .span(6) } > .span5 { .span(5); }
&.span7 { .span(7) } > .span6 { .span(6); }
&.span8 { .span(8) } > .span7 { .span(7); }
&.span9 { .span(9) } > .span8 { .span(8); }
&.span10 { .span(10) } > .span9 { .span(9); }
&.span11 { .span(11) } > .span10 { .span(10); }
&.span12 { .span(12) } > .span11 { .span(11); }
> .span12 { .span(12); }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment