From ab5d7f863c2b2e7c6fc9ae48ddaea405aa153629 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 10 Dec 2012 09:57:23 -0800 Subject: move reset after vars and mixins --- docs/assets/css/bootstrap.css | 64 +++++++++++++++++++++---------------------- 1 file changed, 32 insertions(+), 32 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 8ab3cefcf..53f3a8cb1 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -8,6 +8,38 @@ * Designed and built with all the love in the world @twitter by @mdo and @fat. */ +.clearfix { + *zoom: 1; +} + +.clearfix:before, +.clearfix:after { + display: table; + line-height: 0; + content: ""; +} + +.clearfix:after { + clear: both; +} + +.hide-text { + font: 0/0 a; + color: transparent; + text-shadow: none; + background-color: transparent; + border: 0; +} + +.input-block-level { + display: block; + width: 100%; + min-height: 30px; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} + article, aside, details, @@ -189,38 +221,6 @@ textarea { } } -.clearfix { - *zoom: 1; -} - -.clearfix:before, -.clearfix:after { - display: table; - line-height: 0; - content: ""; -} - -.clearfix:after { - clear: both; -} - -.hide-text { - font: 0/0 a; - color: transparent; - text-shadow: none; - background-color: transparent; - border: 0; -} - -.input-block-level { - display: block; - width: 100%; - min-height: 30px; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; -} - body { margin: 0; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; -- cgit v1.2.3 From 83a6a55d2c3448771925f467be1f2ced321e63df Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 10 Dec 2012 10:25:18 -0800 Subject: Move IE10 responsive fix to responsive utilities so Customizer gets it --- docs/assets/css/bootstrap.css | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 53f3a8cb1..0e9f0cdf6 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -6014,6 +6014,10 @@ a.badge:hover { line-height: 30px; } +@-ms-viewport { + width: device-width; +} + .pull-right { float: right; } -- cgit v1.2.3 From 847b632577ee46f2acf0b0778c5a3014428cb528 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 10 Dec 2012 10:29:16 -0800 Subject: IE10 fix in responsive utilities, not regular utilities --- docs/assets/css/bootstrap.css | 4 ---- 1 file changed, 4 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 0e9f0cdf6..53f3a8cb1 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -6014,10 +6014,6 @@ a.badge:hover { line-height: 30px; } -@-ms-viewport { - width: device-width; -} - .pull-right { float: right; } -- cgit v1.2.3 From cddca18f122887b183aa3a8e601c5cd1aa80c206 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 10 Dec 2012 10:59:57 -0800 Subject: Fixes #6174: Caret alignment in small and mini buttons --- docs/assets/css/bootstrap.css | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 53f3a8cb1..842eb4c30 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3744,8 +3744,6 @@ input[type="submit"].btn.btn-mini { margin-left: 0; } -.btn-mini .caret, -.btn-small .caret, .btn-large .caret { margin-top: 6px; } @@ -3756,6 +3754,11 @@ input[type="submit"].btn.btn-mini { border-left-width: 5px; } +.btn-mini .caret, +.btn-small .caret { + margin-top: 8px; +} + .dropup .btn-large .caret { border-bottom-width: 5px; } -- cgit v1.2.3 From 529ecc5a77c9e653dd7219bd4457cb994e338075 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 10 Dec 2012 18:31:04 -0800 Subject: Version bump --- docs/assets/css/bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 842eb4c30..1940302cd 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1,5 +1,5 @@ /*! - * Bootstrap v2.2.2 + * Bootstrap v2.2.3 * * Copyright 2012 Twitter, Inc * Licensed under the Apache License v2.0 -- cgit v1.2.3 From dc6142751feced6761f67503323c0c6e62844d4e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 19 Dec 2012 18:46:55 -0800 Subject: Fixes #6337: scope '.media .pull-left' and '.media .pull-right' to immediate children only --- docs/assets/css/bootstrap.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 1940302cd..6ef11ed9b 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -5519,11 +5519,11 @@ a.thumbnail:hover { margin: 0 0 5px; } -.media .pull-left { +.media > .pull-left { margin-right: 10px; } -.media .pull-right { +.media > .pull-right { margin-left: 10px; } -- cgit v1.2.3 From 9726fded1c587c14b57a61a92b88ac74fe21d320 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 19 Dec 2012 23:52:38 -0800 Subject: Get on that carousel indicator lifestyle with some new hawtness --- docs/assets/css/bootstrap.css | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'docs/assets/css/bootstrap.css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 6ef11ed9b..9b77c47b8 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -5968,6 +5968,31 @@ a.badge:hover { filter: alpha(opacity=90); } +.carousel-indicators { + position: absolute; + top: 15px; + right: 15px; + z-index: 5; + margin: 0; + list-style: none; +} + +.carousel-indicators li { + display: block; + float: left; + width: 10px; + height: 10px; + margin-left: 5px; + text-indent: -999px; + background-color: #ccc; + background-color: rgba(255, 255, 255, 0.25); + border-radius: 5px; +} + +.carousel-indicators .active { + background-color: #fff; +} + .carousel-caption { position: absolute; right: 0; -- cgit v1.2.3