diff options
| author | Mark Otto <[email protected]> | 2013-08-14 16:24:39 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-14 16:24:39 -0700 |
| commit | a9d6b7ee0b4dd7b109daabd586d6198898816dd0 (patch) | |
| tree | fdd96ad8d15001d7e3f18dfea19fee94e17fd2ad /assets/css/docs.css | |
| parent | 4d527ec316081113808f54a67a5a0d825071f480 (diff) | |
| parent | 8e8fe8de93b1d25273dcabe348e2d9205a428037 (diff) | |
| download | bootstrap-a9d6b7ee0b4dd7b109daabd586d6198898816dd0.tar.xz bootstrap-a9d6b7ee0b4dd7b109daabd586d6198898816dd0.zip | |
Merge branch '3.0.0-wip' into reset-FF-Android-default-background-image
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'assets/css/docs.css')
| -rw-r--r-- | assets/css/docs.css | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/assets/css/docs.css b/assets/css/docs.css index a55472cc9..0a1f87317 100644 --- a/assets/css/docs.css +++ b/assets/css/docs.css @@ -437,6 +437,12 @@ body { margin: 0; } +/* Buttons */ +.bs-example > .btn { + margin-top: 5px; + margin-bottom: 5px; +} + /* Forms */ .bs-example-control-sizing select, .bs-example-control-sizing input[type="text"] + input[type="text"] { @@ -553,19 +559,6 @@ body { } - -/* Example templates --------------------------------------------------- */ - -.bs-examples h4 { - margin-bottom: 5px; -} -.bs-examples p { - margin-bottom: 20px; -} - - - /* Responsive docs -------------------------------------------------- */ @@ -578,9 +571,6 @@ body { overflow-x: scroll; border: 1px solid #ddd; } - .bs-table-scrollable .highlight pre { - white-space: normal; - } .bs-table-scrollable .table { margin-bottom: 0; border: 0; @@ -602,6 +592,10 @@ body { border-bottom: 0; } } +.bs-table-scrollable .highlight pre { + white-space: normal; +} + /* Related: responsive utilities tables */ .table code { |