diff options
| author | Jacob Thornton <[email protected]> | 2012-03-10 12:42:39 -0800 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-03-10 12:42:39 -0800 |
| commit | 1fd5e558811a63703e01b6e5e75c44820e59dfc9 (patch) | |
| tree | 3d7f4fd3d55b6d5ef61bbda0a7cf6c2e992be9da /docs/assets/css/bootstrap.css | |
| parent | 1a8d7576e091c06662ee94f84d0f3f88a2f2dad8 (diff) | |
| parent | 9ebc6b4c9700610fbc83173c95f5464999f83bff (diff) | |
| download | bootstrap-1fd5e558811a63703e01b6e5e75c44820e59dfc9.tar.xz bootstrap-1fd5e558811a63703e01b6e5e75c44820e59dfc9.zip | |
Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip
Conflicts:
docs/assets/bootstrap.zip
docs/assets/css/bootstrap-responsive.css
docs/assets/css/bootstrap.css
Diffstat (limited to 'docs/assets/css/bootstrap.css')
| -rw-r--r-- | docs/assets/css/bootstrap.css | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 74ce8db86..a363a7759 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -324,9 +324,9 @@ h4, h5, h6 { margin: 0; - font-family: ''; - font-weight: normal; - color: ''; + font-family: inherit; + font-weight: bold; + color: inherit; text-rendering: optimizelegibility; } h1 small, @@ -1878,6 +1878,18 @@ table .span24 { border-color: #ddd; border-color: rgba(0, 0, 0, 0.15); } +.well-large { + padding: 24px; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; +} +.well-small { + padding: 9px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; +} .fade { -webkit-transition: opacity 0.15s linear; -moz-transition: opacity 0.15s linear; |