Reconcile with jb-dev
Change-Id: I759af63dfafa66468b93dc7c4ef7db42d760c4d6
diff --git a/tools/droiddoc/templates-sdk/assets/css/default.css b/tools/droiddoc/templates-sdk/assets/css/default.css
index 7c395c7..8782afd 100644
--- a/tools/droiddoc/templates-sdk/assets/css/default.css
+++ b/tools/droiddoc/templates-sdk/assets/css/default.css
@@ -95,6 +95,11 @@
position: fixed;
margin:0;
top: 20px; }
+
+#devdoc-nav span.small {
+ font-size:12px;
+ font-weight:normal;
+}
#content {
width: 760px;
@@ -914,7 +919,7 @@
margin-top: 0;
}
li {
- margin:0 0 4px;
+ margin:0 0 5px;
}
dd {
margin:0 0 10px 30px;
@@ -924,7 +929,7 @@
}
ul p,
ol p {
- margin:10px 0 0;
+ margin:5px 0 0;
}
pre strong, pre b, a strong, a b, a code {
color: inherit;
@@ -1620,6 +1625,7 @@
border-left:4px solid #99CC00;
float:right;
padding:0 0 0 10px;
+ margin:0 0 1em 20px;
}
.sidebox h2,
@@ -1819,7 +1825,7 @@
Code Style
*/
pre {
- margin: 1em 0;
+ margin:0 0 1em 0;
padding: 1em;
overflow: auto;
border: solid 1px #ddd;
@@ -2224,11 +2230,17 @@
}
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 {
@@ -2242,15 +2254,15 @@
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;
}
@@ -2274,7 +2286,7 @@
margin-bottom:0;
}
-blockquote {
+body.about blockquote {
display:block;
float:right;
width:280px;
diff --git a/tools/droiddoc/templates-sdk/assets/js/docs.js b/tools/droiddoc/templates-sdk/assets/js/docs.js
index 6ce7c56..8418d7b 100644
--- a/tools/droiddoc/templates-sdk/assets/js/docs.js
+++ b/tools/droiddoc/templates-sdk/assets/js/docs.js
@@ -28,7 +28,7 @@
$('.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
@@ -1811,13 +1811,14 @@
/* ################# JAVADOC REFERENCE ################### */
/* ######################################################## */
-/* Initialize some droiddoc stuff */
-$(document).ready(function() {
-
- // init available apis based on user pref
- changeApiLevel();
- initSidenavHeightResize()
-});
+/* Initialize some droiddoc stuff, but only if we're in the reference */
+if (location.pathname.indexOf("/reference") == 0) {
+ $(document).ready(function() {
+ // init available apis based on user pref
+ changeApiLevel();
+ initSidenavHeightResize()
+ });
+}
var API_LEVEL_COOKIE = "api_level";
var minLevel = 1;