From 90c190d4efedd4080c574b34bffdf54cd5b9ed88 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 29 Nov 2011 23:48:27 -0800 Subject: updates to add warning for bordered tables to docs, fix to spacing on prettyprint pre blocks --- bootstrap.css | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 6c5e58b71..aa852460e 100644 --- a/bootstrap.css +++ b/bootstrap.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Tue Nov 29 22:53:00 PST 2011 + * Date: Tue Nov 29 23:48:09 PST 2011 */ html, body { margin: 0; @@ -514,6 +514,9 @@ pre { white-space: pre-wrap; word-break: break-all; } +pre.prettyprint { + margin-bottom: 18px; +} pre code { padding: 0; background-color: transparent; -- cgit v1.2.3 From f2c40ee24d0caa26e79ed206370858918c603419 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 30 Nov 2011 00:39:38 -0800 Subject: adding step nav to components --- bootstrap.css | 44 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index aa852460e..6e10706f7 100644 --- a/bootstrap.css +++ b/bootstrap.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Tue Nov 29 23:48:09 PST 2011 + * Date: Wed Nov 30 00:39:32 PST 2011 */ html, body { margin: 0; @@ -2088,6 +2088,48 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { .tab-content > .active, .pill-content > .active { display: block; } +.step-nav { + position: relative; + margin: 0 0 18px; + list-style: none; + line-height: 30px; + text-align: center; + background-color: #f5f5f5; + -webkit-border-radius: 15px; + -moz-border-radius: 15px; + border-radius: 15px; +} +.step-nav li { + display: inline; + color: #bfbfbf; +} +.step-nav .prev, .step-nav .next { + position: absolute; + top: 6px; +} +.step-nav .prev { + left: 15px; +} +.step-nav .next { + right: 15px; +} +.step-nav .dot { + display: inline-block; + width: 10px; + height: 10px; + margin: 0 3px; + text-indent: -999em; + background-color: #bfbfbf; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.25); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.25); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.25); +} +.step-nav .dot:hover, .step-nav .active .dot { + background-color: #404040; +} .breadcrumb { padding: 7px 14px; margin: 0 0 18px; -- cgit v1.2.3 From bc51c15709469fd0c2e78886a15e849626a8f191 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 30 Nov 2011 01:00:55 -0800 Subject: adding temp idea for subnav to docs --- bootstrap.css | 45 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 6e10706f7..2bef99e1a 100644 --- a/bootstrap.css +++ b/bootstrap.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Wed Nov 30 00:39:32 PST 2011 + * Date: Wed Nov 30 00:54:47 PST 2011 */ html, body { margin: 0; @@ -2130,6 +2130,49 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { .step-nav .dot:hover, .step-nav .active .dot { background-color: #404040; } +.subnav { + position: relative; + background-color: #eeeeee; + background-image: -khtml-gradient(linear, left top, left bottom, from(#f5f5f5), to(#eeeeee)); + background-image: -moz-linear-gradient(top, #f5f5f5, #eeeeee); + background-image: -ms-linear-gradient(top, #f5f5f5, #eeeeee); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #f5f5f5), color-stop(100%, #eeeeee)); + background-image: -webkit-linear-gradient(top, #f5f5f5, #eeeeee); + background-image: -o-linear-gradient(top, #f5f5f5, #eeeeee); + background-image: linear-gradient(top, #f5f5f5, #eeeeee); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#eeeeee', GradientType=0); + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; +} +.subnav a { + padding: 10px 15px; + color: #0069d6; + text-shadow: 0 1px 0 #fff; + border-left: 1px solid #f9f9f9; + border-right: 1px solid #e5e5e5; +} +.subnav a:hover { + color: #00438a; + background-color: #eee; +} +.subnav li:first-child a { + border-left: 0; + -webkit-border-radius: 6px 0 0 6px; + -moz-border-radius: 6px 0 0 6px; + border-radius: 6px 0 0 6px; +} +.subnav li:last-child a { + border-right: 0; + -webkit-border-radius: 0 6px 6px 0; + -moz-border-radius: 0 6px 6px 0; + border-radius: 0 6px 6px 0; +} +.subnav ul .active > a { + color: #404040; + background-color: #eee; +} .breadcrumb { padding: 7px 14px; margin: 0 0 18px; -- cgit v1.2.3 From dc628c9115b74e49940c0cc200a8914232c9d2a2 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Wed, 30 Nov 2011 22:05:09 -0800 Subject: start of carousel --- bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bootstrap.css') diff --git a/bootstrap.css b/bootstrap.css index 4c4d85aa9..462c254a8 100644 --- a/bootstrap.css +++ b/bootstrap.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Fri Nov 25 21:33:58 PST 2011 + * Date: Mon Nov 28 11:50:42 PST 2011 */ html, body { margin: 0; -- cgit v1.2.3