From 93be608bf0a4b85ec3331ebcc14e40f99a1974f2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 9 Jul 2012 20:49:17 -0700 Subject: fixes #3384: add support for multiple inputs per line when using grid sizing --- docs/assets/css/bootstrap-responsive.css | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'docs/assets/css/bootstrap-responsive.css') diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index a584b806e..702359616 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -358,6 +358,9 @@ .uneditable-input { margin-left: 0; } + .controls-row [class*="span"] + [class*="span"] { + margin-left: 30px; + } input.span12, textarea.span12, .uneditable-input.span12 { @@ -700,6 +703,9 @@ .uneditable-input { margin-left: 0; } + .controls-row [class*="span"] + [class*="span"] { + margin-left: 20px; + } input.span12, textarea.span12, .uneditable-input.span12 { -- cgit v1.2.3 From 148e5a3d899d5c2d395e2d5749b755efeef2cd38 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 9 Jul 2012 21:07:49 -0700 Subject: fixes #3291: remove float on responsive .thumbnails for 767px and down to ensure thumbnail images don't pop out of container in FF --- docs/assets/css/bootstrap-responsive.css | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'docs/assets/css/bootstrap-responsive.css') diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index 702359616..9a9bd3307 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -805,7 +805,11 @@ display: block; float: none; width: auto; + max-width: 100%; margin-left: 0; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; } .input-large, .input-xlarge, -- cgit v1.2.3 From f4877c236968ba61ac76f4862bba49e0354c60e5 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 9 Jul 2012 21:13:33 -0700 Subject: fix up docs popover examples and copy --- docs/assets/css/bootstrap-responsive.css | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'docs/assets/css/bootstrap-responsive.css') diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index 9a9bd3307..6a420b179 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -800,16 +800,15 @@ .thumbnails { margin-left: 0; } + .thumbnails > li { + float: none; + } [class*="span"], .row-fluid [class*="span"] { display: block; float: none; width: auto; - max-width: 100%; margin-left: 0; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; } .input-large, .input-xlarge, -- cgit v1.2.3