From 6c9ec3d87f400d77dbb598bff22b0e98a517e29c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 13 Oct 2013 15:54:49 -0700 Subject: run grunt dist on .small additions --- dist/css/bootstrap.css | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 35b69da70..76ef7b477 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -495,7 +495,19 @@ h6 small, .h3 small, .h4 small, .h5 small, -.h6 small { +.h6 small, +h1 .small, +h2 .small, +h3 .small, +h4 .small, +h5 .small, +h6 .small, +.h1 .small, +.h2 .small, +.h3 .small, +.h4 .small, +.h5 .small, +.h6 .small { font-weight: normal; line-height: 1; color: #999999; @@ -510,7 +522,10 @@ h3 { h1 small, h2 small, -h3 small { +h3 small, +h1 .small, +h2 .small, +h3 .small { font-size: 65%; } @@ -523,7 +538,10 @@ h6 { h4 small, h5 small, -h6 small { +h6 small, +h4 .small, +h5 .small, +h6 .small { font-size: 75%; } @@ -685,15 +703,18 @@ blockquote.pull-right { } blockquote.pull-right p, -blockquote.pull-right small { +blockquote.pull-right small, +blockquote.pull-right .small { text-align: right; } -blockquote.pull-right small:before { +blockquote.pull-right small:before, +blockquote.pull-right .small:before { content: ''; } -blockquote.pull-right small:after { +blockquote.pull-right small:after, +blockquote.pull-right .small:after { content: '\00A0 \2014'; } @@ -744,7 +765,7 @@ pre code { color: inherit; white-space: pre-wrap; background-color: transparent; - border: 0; + border-radius: 0; } .pre-scrollable { -- cgit v1.2.3 From 590975b4077ae6a2d5cba7d01403bbc09484bd6c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 13 Oct 2013 15:55:13 -0700 Subject: remove undocumented and unsupported .pill-content and .pill-pane /cc #10102 --- dist/css/bootstrap.css | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'dist/css/bootstrap.css') diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 76ef7b477..2e958e32c 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -4088,13 +4088,11 @@ textarea.input-group-sm > .input-group-btn > .btn { clear: both; } -.tab-content > .tab-pane, -.pill-content > .pill-pane { +.tab-content > .tab-pane { display: none; } -.tab-content > .active, -.pill-content > .active { +.tab-content > .active { display: block; } -- cgit v1.2.3