diff options
author | Scott Main <smain@google.com> | 2012-09-21 14:33:43 -0700 |
---|---|---|
committer | Scott Main <smain@google.com> | 2012-09-21 14:33:43 -0700 |
commit | 582db97b23982f8e9cac7926ac3f5806b6a9cc71 (patch) | |
tree | 16acedc493717157ef9c7cf92aaba57a05b60a74 | |
parent | 7039b4a7bca269a898aacad9ddde693598ccecfc (diff) | |
download | build-582db97b23982f8e9cac7926ac3f5806b6a9cc71.zip build-582db97b23982f8e9cac7926ac3f5806b6a9cc71.tar.gz build-582db97b23982f8e9cac7926ac3f5806b6a9cc71.tar.bz2 |
add style for code captions;
ignore sidenav headers for HRs
Change-Id: I6eb11d3629dd13d2c7ac297cc9fa3828ed59f170
-rw-r--r-- | tools/droiddoc/templates-sdk/assets/css/default.css | 17 | ||||
-rw-r--r-- | tools/droiddoc/templates-sdk/assets/js/docs.js | 2 |
2 files changed, 13 insertions, 6 deletions
diff --git a/tools/droiddoc/templates-sdk/assets/css/default.css b/tools/droiddoc/templates-sdk/assets/css/default.css index df18ae5..8782afd 100644 --- a/tools/droiddoc/templates-sdk/assets/css/default.css +++ b/tools/droiddoc/templates-sdk/assets/css/default.css @@ -1625,6 +1625,7 @@ EndColorStr='#ececec'); border-left:4px solid #99CC00; float:right; padding:0 0 0 10px; + margin:0 0 1em 20px; } .sidebox h2, @@ -1824,7 +1825,7 @@ form .form-error input[type='text'], form .form-error textarea { Code Style */ pre { - margin: 1em 0; + margin:0 0 1em 0; padding: 1em; overflow: auto; border: solid 1px #ddd; @@ -2229,11 +2230,17 @@ div.figure { } p.table-caption { - margin: 0 0 4px 0; /* matches default table left-margin */ + margin: 0 0 4px 0; font-size:13px; color:#666; } +p.code-caption { + margin: 0 0 4px 0; + font: 13px/1.5 'courier new', courier, monospace; + color:#666; +} + div.note, div.caution, div.warning { @@ -2247,15 +2254,15 @@ p.warning, div.warning { border-left: 4px solid; } -p.note { +p.note, div.note { border-color: #258AAF; } -p.caution { +p.caution, div.caution { border-color: #FF8800; } -p.warning { +p.warning, div.warning { border-color: #ff4443; } diff --git a/tools/droiddoc/templates-sdk/assets/js/docs.js b/tools/droiddoc/templates-sdk/assets/js/docs.js index d7ebbef..8418d7b 100644 --- a/tools/droiddoc/templates-sdk/assets/js/docs.js +++ b/tools/droiddoc/templates-sdk/assets/js/docs.js @@ -28,7 +28,7 @@ $(document).ready(function() { $('.scroll-pane').jScrollPane( {verticalGutter:0} ); // add HRs below all H2s (except for a few other h2 variants) - $('h2').not('#qv h2').not('#tb h2').not('#devdoc-nav h2').css({marginBottom:0}).after('<hr/>'); + $('h2').not('#qv h2').not('#tb h2').not('.sidebox h2').not('#devdoc-nav h2').css({marginBottom:0}).after('<hr/>'); // set search's onkeyup handler here so we can show suggestions // even while search results are visible |