p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

DO NOT MERGE 

cherrypick from jb-devChange-Id: I6eb11d3629dd13d2c7ac297cc9fa3828ed59f170
add style for code captions;
ignore sidenav headers for HRs

Change-Id: Ic7768dc388a3871be8b02634e2b70f360a62e407
This commit is contained in:
Scott Main 2012-09-21 14:33:43 -07:00
parent 52948fcf8c
commit 24bbcd5026
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tools/droiddoc/templates-sdk/assets/css/default.css
View File

@ -1625,6 +1625,7 @@ EndColorStr='#ececec');
border-left:4px solid #99CC00; border-left:4px solid #99CC00;
float:right; float:right;
padding:0 0 0 10px; padding:0 0 0 10px;
margin:0 0 1em 20px;
} }
.sidebox h2, .sidebox h2,
@ -1824,7 +1825,7 @@ form .form-error input[type='text'], form .form-error textarea {
Code Style Code Style
*/ */
pre { pre {
margin: 1em 0; margin:0 0 1em 0;
padding: 1em; padding: 1em;
overflow: auto; overflow: auto;
border: solid 1px #ddd; border: solid 1px #ddd;
@ -2229,11 +2230,17 @@ div.figure {
} }
p.table-caption { p.table-caption {
margin: 0 0 4px 0; /* matches default table left-margin */ margin: 0 0 4px 0;
font-size:13px; font-size:13px;
color:#666; color:#666;
} }
p.code-caption {
margin: 0 0 4px 0;
font: 13px/1.5 'courier new', courier, monospace;
color:#666;
}
div.note, div.note,
div.caution, div.caution,
div.warning { div.warning {
@ -2247,15 +2254,15 @@ p.warning, div.warning {
border-left: 4px solid; border-left: 4px solid;
} }
p.note { p.note, div.note {
border-color: #258AAF; border-color: #258AAF;
} }
p.caution { p.caution, div.caution {
border-color: #FF8800; border-color: #FF8800;
} }
p.warning { p.warning, div.warning {
border-color: #ff4443; border-color: #ff4443;
} }

2
tools/droiddoc/templates-sdk/assets/js/docs.js
View File

@ -28,7 +28,7 @@ $(document).ready(function() {
$('.scroll-pane').jScrollPane( {verticalGutter:0} ); $('.scroll-pane').jScrollPane( {verticalGutter:0} );
// add HRs below all H2s (except for a few other h2 variants) // 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 // set search's onkeyup handler here so we can show suggestions
// even while search results are visible // even while search results are visible