diff options
| author | Mark Otto <[email protected]> | 2013-09-01 10:01:57 +0200 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-09-01 10:01:57 +0200 |
| commit | daa8330b414d5b12e943fd614aaad7a4cd2c0c51 (patch) | |
| tree | 7fbc61d31bf1023b5177f6b0c6b2cfa81c8d4bde /dist/css/bootstrap.css | |
| parent | eb95574d8001591d1e056fcaeaf59138cbbb15a4 (diff) | |
| parent | 4b53ea52e9cc27ab27dde2695400fd6c95a0b6c2 (diff) | |
| download | bootstrap-daa8330b414d5b12e943fd614aaad7a4cd2c0c51.tar.xz bootstrap-daa8330b414d5b12e943fd614aaad7a4cd2c0c51.zip | |
Merge branch 'master' into dancek-breadcrumb-separator
Diffstat (limited to 'dist/css/bootstrap.css')
| -rw-r--r-- | dist/css/bootstrap.css | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 856e378cb..10ba482b5 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -399,7 +399,8 @@ p { } } -small { +small, +.small { font-size: 85%; } @@ -458,6 +459,7 @@ h6, font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-weight: 500; line-height: 1.1; + color: inherit; } h1 small, @@ -3714,6 +3716,7 @@ textarea.input-group-sm > .input-group-btn > .btn { font-size: 14px; font-weight: normal; line-height: 1; + color: #555555; text-align: center; background-color: #eeeeee; border: 1px solid #cccccc; |