am 2990dc10: am 578d6446: docs: move loading of google ref into doc load event to prevent error during load
* commit '2990dc1076619ae890c4dd171b655bb88d4eee94':
diff --git a/tools/droiddoc/templates-sdk/assets/css/default.css b/tools/droiddoc/templates-sdk/assets/css/default.css
index 9f4edc6..de47705 100644
--- a/tools/droiddoc/templates-sdk/assets/css/default.css
+++ b/tools/droiddoc/templates-sdk/assets/css/default.css
@@ -1089,13 +1089,18 @@
dd {
margin:0 0 10px 30px;
}
-dd p {
+dd p,
+dd pre,
+dd ul,
+dd ol,
+dd dl {
margin:10px 0 0;
}
li p,
li pre,
li ul,
-li ol {
+li ol,
+li dl {
margin-top:5px;
margin-bottom:5px;
}
@@ -1104,11 +1109,11 @@
}
pre, code {
color: #060;
- font: 14px/1.5 'courier new', courier, monospace;
+ font: 13px/1.5 monospace;
}
code {
font-weight:bold;
- font: 14px/14px 'courier new', courier, monospace;
+ font: 13px/14px monospace;
}
legend {
@@ -2473,7 +2478,7 @@
p.code-caption {
margin: 0 0 4px 0;
- font: 13px/1.5 'courier new', courier, monospace;
+ font: 12px/1.5 monospace;
color:#666;
}
diff --git a/tools/droiddoc/templates-sdk/customizations.cs b/tools/droiddoc/templates-sdk/customizations.cs
index d36d2f5..75559e6 100644
--- a/tools/droiddoc/templates-sdk/customizations.cs
+++ b/tools/droiddoc/templates-sdk/customizations.cs
@@ -146,12 +146,15 @@
</div>
+ <script type="text/javascript">
+ showGoogleRefTree();
+
+ </script>
</div> <!-- end side-nav -->
- <script type="text/javascript">
+ <script>
$(document).ready(function() {
- showGoogleRefTree();
scrollIntoView("devdoc-nav");
- });
+ });
</script>
<?cs /def ?>