make expandable lists under each sample sticky so they don't collapse
when opening other project directories.
change code comment color from red to green, and strings from green to red.
Make sidenav file names smaller.
Change-Id: Idd074c7beba48f79c8c551d319c36fb5ecbbcb5f
diff --git a/tools/droiddoc/templates-sdk/assets/css/default.css b/tools/droiddoc/templates-sdk/assets/css/default.css
index 79a6c49..8eadac0 100644
--- a/tools/droiddoc/templates-sdk/assets/css/default.css
+++ b/tools/droiddoc/templates-sdk/assets/css/default.css
@@ -393,6 +393,17 @@
#nav li ul.tree-list-children ul {
display:block; }
+#nav.samples-nav li li li {
+ font-size:13px;
+}
+#nav.samples-nav li li li a {
+ padding-top:3px;
+ padding-bottom:3px;
+}
+#nav.samples-nav li li ul > li:last-child {
+ padding-bottom:3px;
+}
+
.new,
.new-child {
font-size: .78em;
@@ -2138,16 +2149,15 @@
border: solid 1px #ddd;
background: #f7f7f7;
}
-.str { color: #080; }
+.str { color: #800; } /* Code string */
.kwd { color: #008; }
-.com { color: #800; }
.typ { color: #606; }
.lit { color: #066; }
.pun { color: #660; }
.pln { color: #000; }
.tag { color: #008; }
.atn { color: #828; }
-.atv { color: #080; }
+.atv { color: #800; } /* XML string */
.dec { color: #606; }
/* --------------------------------------------------------------------------
@@ -2483,13 +2493,12 @@
background-position: -10px 0;
}
-
/* --------------------------------------------------------------------------
Styles for samples project trees and code browsing in resources tab
*/
#codesample-wrapper {
- width:1000px;
+ width:100000px; /* super wide to contain floats, but doesn't cause scroll */
overflow:visible;
}
pre#codesample-block {
diff --git a/tools/droiddoc/templates-sdk/assets/js/docs.js b/tools/droiddoc/templates-sdk/assets/js/docs.js
index f779c30..f249a04 100644
--- a/tools/droiddoc/templates-sdk/assets/js/docs.js
+++ b/tools/droiddoc/templates-sdk/assets/js/docs.js
@@ -573,7 +573,7 @@
} else {
/* show me */
// first hide all other siblings
- var $others = $('li.nav-section.expanded', $(this).closest('ul'));
+ var $others = $('li.nav-section.expanded', $(this).closest('ul')).not('.sticky');
$others.removeClass('expanded').children('ul').slideUp(250);
// now expand me
@@ -2716,6 +2716,9 @@
$containerUl.append(new_google_node2(node_data));
}
+ // Make all third-generation list items 'sticky' to prevent them from collapsing
+ $containerUl.find('li li li.nav-section').addClass('sticky');
+
initExpandableNavItems("#"+navtree_id);
}
@@ -2728,9 +2731,11 @@
var $li = $('<li>');
var $a;
if (node_data[NODE_HREF] != null) {
- $a = $('<a href="' + toRoot + node_data[NODE_HREF] + '">' + linkText + '</a>');
+ $a = $('<a href="' + toRoot + node_data[NODE_HREF] + '" title="' + linkText + '" >'
+ + linkText + '</a>');
} else {
- $a = $('<a href="#" onclick="return false;">' + linkText + '/</a>');
+ $a = $('<a href="#" onclick="return false;" title="' + linkText + '" >'
+ + linkText + '/</a>');
}
var $childUl = $('<ul>');
if (node_data[NODE_CHILDREN] != null) {
@@ -2949,7 +2954,7 @@
range.moveToElementText(element);
range.select();
} else if (window.getSelection) { //all others
- selection = window.getSelection();
+ selection = window.getSelection();
range = doc.createRange();
range.selectNodeContents(element);
selection.removeAllRanges();