diff options
author | Mark Otto <markotto@twitter.com> | 2012-02-22 20:21:29 +0400 |
---|---|---|
committer | Mark Otto <markotto@twitter.com> | 2012-02-22 20:21:29 +0400 |
commit | b86969f762c7c1c94e75eebd9905ef568713d647 (patch) | |
tree | 8831b622570aeb390f53a0acd009ceccd28c4f85 /docs/assets/css/bootstrap-responsive.css | |
parent | 4410ede8ed976f449d9b1735652e081ed863a131 (diff) |
restore fixed navbar container reset to grid mixin, add override for inputs within grid mixins to fix #2080
Diffstat (limited to 'docs/assets/css/bootstrap-responsive.css')
-rw-r--r-- | docs/assets/css/bootstrap-responsive.css | 58 |
1 files changed, 32 insertions, 26 deletions
diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index 7b7a810d9b..447a865c8e 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -174,7 +174,7 @@ float: left; margin-left: 20px; } - .container { + .container, .navbar-fixed-top .container, .navbar-fixed-bottom .container { width: 724px; } .span1 { @@ -303,40 +303,43 @@ .row-fluid > .span12 { 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; } - input.span2, textarea.span2, .uneditable-input.span2 { + input > .span2, textarea > .span2, .uneditable-input > .span2 { width: 94px; } - input.span3, textarea.span3, .uneditable-input.span3 { + input > .span3, textarea > .span3, .uneditable-input > .span3 { width: 156px; } - input.span4, textarea.span4, .uneditable-input.span4 { + input > .span4, textarea > .span4, .uneditable-input > .span4 { width: 218px; } - input.span5, textarea.span5, .uneditable-input.span5 { + input > .span5, textarea > .span5, .uneditable-input > .span5 { width: 280px; } - input.span6, textarea.span6, .uneditable-input.span6 { + input > .span6, textarea > .span6, .uneditable-input > .span6 { width: 342px; } - input.span7, textarea.span7, .uneditable-input.span7 { + input > .span7, textarea > .span7, .uneditable-input > .span7 { width: 404px; } - input.span8, textarea.span8, .uneditable-input.span8 { + input > .span8, textarea > .span8, .uneditable-input > .span8 { width: 466px; } - input.span9, textarea.span9, .uneditable-input.span9 { + input > .span9, textarea > .span9, .uneditable-input > .span9 { width: 528px; } - input.span10, textarea.span10, .uneditable-input.span10 { + input > .span10, textarea > .span10, .uneditable-input > .span10 { width: 590px; } - input.span11, textarea.span11, .uneditable-input.span11 { + input > .span11, textarea > .span11, .uneditable-input > .span11 { width: 652px; } - input.span12, textarea.span12, .uneditable-input.span12 { + input > .span12, textarea > .span12, .uneditable-input > .span12 { width: 714px; } } @@ -466,7 +469,7 @@ float: left; margin-left: 30px; } - .container { + .container, .navbar-fixed-top .container, .navbar-fixed-bottom .container { width: 1170px; } .span1 { @@ -595,40 +598,43 @@ .row-fluid > .span12 { 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; } - input.span2, textarea.span2, .uneditable-input.span2 { + input > .span2, textarea > .span2, .uneditable-input > .span2 { width: 160px; } - input.span3, textarea.span3, .uneditable-input.span3 { + input > .span3, textarea > .span3, .uneditable-input > .span3 { width: 260px; } - input.span4, textarea.span4, .uneditable-input.span4 { + input > .span4, textarea > .span4, .uneditable-input > .span4 { width: 360px; } - input.span5, textarea.span5, .uneditable-input.span5 { + input > .span5, textarea > .span5, .uneditable-input > .span5 { width: 460px; } - input.span6, textarea.span6, .uneditable-input.span6 { + input > .span6, textarea > .span6, .uneditable-input > .span6 { width: 560px; } - input.span7, textarea.span7, .uneditable-input.span7 { + input > .span7, textarea > .span7, .uneditable-input > .span7 { width: 660px; } - input.span8, textarea.span8, .uneditable-input.span8 { + input > .span8, textarea > .span8, .uneditable-input > .span8 { width: 760px; } - input.span9, textarea.span9, .uneditable-input.span9 { + input > .span9, textarea > .span9, .uneditable-input > .span9 { width: 860px; } - input.span10, textarea.span10, .uneditable-input.span10 { + input > .span10, textarea > .span10, .uneditable-input > .span10 { width: 960px; } - input.span11, textarea.span11, .uneditable-input.span11 { + input > .span11, textarea > .span11, .uneditable-input > .span11 { width: 1060px; } - input.span12, textarea.span12, .uneditable-input.span12 { + input > .span12, textarea > .span12, .uneditable-input > .span12 { width: 1160px; } .thumbnails { |