diff options
| author | fat <[email protected]> | 2013-08-17 13:43:58 -0700 |
|---|---|---|
| committer | fat <[email protected]> | 2013-08-17 13:43:58 -0700 |
| commit | 728a5e17d667422cdad791e06375e8e9a0f80cc1 (patch) | |
| tree | fa1a70b54684f362584ecbc23be4b82487379261 /dist/css/bootstrap.css | |
| parent | 53c80ed9cbeff8a3c58abe0f824ff68ef56d617a (diff) | |
| parent | 0c70744ea22126b6224bde75b4ccb6068941e38f (diff) | |
| download | bootstrap-728a5e17d667422cdad791e06375e8e9a0f80cc1.tar.xz bootstrap-728a5e17d667422cdad791e06375e8e9a0f80cc1.zip | |
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'dist/css/bootstrap.css')
| -rw-r--r-- | dist/css/bootstrap.css | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css index 00c2f888d..ae1ac035a 100644 --- a/dist/css/bootstrap.css +++ b/dist/css/bootstrap.css @@ -2473,6 +2473,7 @@ textarea.input-group-sm > .input-group-btn > .btn { vertical-align: middle; border-top: 4px solid #000000; border-right: 4px solid transparent; + border-bottom: 0 dotted; border-left: 4px solid transparent; content: ""; } @@ -2591,7 +2592,7 @@ textarea.input-group-sm > .input-group-btn > .btn { .dropup .caret, .navbar-fixed-bottom .dropdown .caret { - border-top: 0; + border-top: 0 dotted; border-bottom: 4px solid #000000; content: ""; } @@ -2726,7 +2727,7 @@ a.list-group-item:focus { .panel-title { margin-top: 0; margin-bottom: 0; - font-size: 17.5px; + font-size: 16px; } .panel-title > a { @@ -4207,12 +4208,12 @@ button.close { } .modal-backdrop { - position: absolute; + position: fixed; top: 0; right: 0; + bottom: 0; left: 0; z-index: 1030; - height: 100%; background-color: #000000; } |
