diff options
| author | Mark Otto <[email protected]> | 2014-08-27 22:38:46 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-08-27 22:38:46 -0700 |
| commit | f4eefd28d10198ea60ce4069c00236e74cda1bf5 (patch) | |
| tree | 9141bf9c907a2bf7962ca5abdb6f0c8496d8b1ad /docs/assets/css/src | |
| parent | dfa2759a52e73e720b0cda302a1edb9e2dbebc1f (diff) | |
| parent | 1ebc7e62a8672c59c3bd886bc71ca90e9571d1bc (diff) | |
| download | bootstrap-f4eefd28d10198ea60ce4069c00236e74cda1bf5.tar.xz bootstrap-f4eefd28d10198ea60ce4069c00236e74cda1bf5.zip | |
Merge branch 'master' into sr_friendly_hidden_content
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
Diffstat (limited to 'docs/assets/css/src')
| -rw-r--r-- | docs/assets/css/src/docs.css | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/docs/assets/css/src/docs.css b/docs/assets/css/src/docs.css index ea0739893..27467f30c 100644 --- a/docs/assets/css/src/docs.css +++ b/docs/assets/css/src/docs.css @@ -1143,7 +1143,6 @@ h1[id] { margin-top: 0; margin-bottom: 0; word-break: normal; - word-wrap: nowrap; white-space: nowrap; background-color: transparent; border: 0; @@ -1391,13 +1390,16 @@ h1[id] { margin-top: 0; margin-bottom: 5px; } +.bs-dropzone hr { + width: 100px; +} .bs-dropzone .lead { margin-bottom: 10px; font-weight: normal; color: #333; } -.bs-dropzone hr { - width: 100px; +/*.bs-dropzone*/ #import-manual-trigger { + cursor: pointer; } .bs-dropzone p:last-child { margin-bottom: 0; |