Highlight "Preview" subtab on preview pages. Support templating for ndk files within templates-sdk.
Change-Id: Iade5ac4630c9e763c377ab5749f16832e3ba47b7
diff --git a/tools/droiddoc/templates-sdk/assets/css/default.css b/tools/droiddoc/templates-sdk/assets/css/default.css
index 71d15df..8513843 100644
--- a/tools/droiddoc/templates-sdk/assets/css/default.css
+++ b/tools/droiddoc/templates-sdk/assets/css/default.css
@@ -7438,6 +7438,10 @@
font-weight: 400;
}
+.dac-header-crumbs-link.current.ndk {
+ color: #00BCD4;
+}
+
@media (max-width: 719px) {
.dac-header-crumbs {
display: none;
@@ -7630,6 +7634,10 @@
padding-bottom: 11px;
}
+.dac-nav-link.has-subnav.ndk, .dac-nav-link.selected.ndk {
+ border-bottom: 3px solid #00BCD4;
+}
+
.dac-nav-secondary {
border-bottom: 1px solid #e5e5e5;
display: none;
@@ -7660,11 +7668,12 @@
}
}
-.dac-nav-secondary .dac-nav-item:first-child .dac-nav-link {
- padding-left: 20px;
+.dac-nav-secondary .dac-nav-link.selected {
+ border: none;
+ font-weight: 700;
}
-.dac-nav-secondary .dac-nav-link.selected {
+.dac-nav-secondary .dac-nav-link.selected.ndk {
border: none;
font-weight: 700;
}
@@ -7750,6 +7759,11 @@
padding: 0 20px;
}
+ .dac-nav-link.has-subnav.ndk, .dac-nav-link.selected.ndk {
+ border: none;
+ padding: 0 20px;
+ }
+
.dac-logo-image {
margin-right: 5px;
vertical-align: top;
diff --git a/tools/droiddoc/templates-sdk/assets/images/android_logo_ndk.png b/tools/droiddoc/templates-sdk/assets/images/android_logo_ndk.png
new file mode 100644
index 0000000..511c200
--- /dev/null
+++ b/tools/droiddoc/templates-sdk/assets/images/android_logo_ndk.png
Binary files differ
diff --git a/tools/droiddoc/templates-sdk/assets/images/android_logo_ndk@2x.png b/tools/droiddoc/templates-sdk/assets/images/android_logo_ndk@2x.png
new file mode 100644
index 0000000..1d88dfa
--- /dev/null
+++ b/tools/droiddoc/templates-sdk/assets/images/android_logo_ndk@2x.png
Binary files differ
diff --git a/tools/droiddoc/templates-sdk/assets/js/docs.js b/tools/droiddoc/templates-sdk/assets/js/docs.js
index 2efe3dc..30a29fc 100644
--- a/tools/droiddoc/templates-sdk/assets/js/docs.js
+++ b/tools/droiddoc/templates-sdk/assets/js/docs.js
@@ -163,6 +163,21 @@
} else {
navEl.find("> li.home > a").addClass('selected');
}
+
+// highlight NDK tabs
+ } else if ($("body").hasClass("ndk")) {
+ parentNavEl = navEl.find("> li.ndk > a");
+ parentNavEl.addClass('has-subnav');
+ if ($("body").hasClass("guide")) {
+ navEl.find("> li.guides > a").addClass("selected ndk");
+ } else if ($("body").hasClass("reference")) {
+ navEl.find("> li.reference > a").addClass("selected ndk");
+ } else if ($("body").hasClass("samples")) {
+ navEl.find("> li.samples > a").addClass("selected ndk");
+ } else if ($("body").hasClass("downloads")) {
+ navEl.find("> li.downloads > a").addClass("selected ndk");
+ }
+
// highlight Develop tab
} else if ($("body").hasClass("develop") || $("body").hasClass("google")) {
parentNavEl = navEl.find("> li.develop > a");
@@ -1056,7 +1071,7 @@
var top = $(window).scrollTop();
// we set the navbar fixed when the scroll position is beyond the height of the site header...
- var shouldBeSticky = top >= stickyTop;
+ var shouldBeSticky = top > stickyTop;
// ... except if the document content is shorter than the sidenav height.
// (this is necessary to avoid crazy behavior on OSX Lion due to overscroll bouncing)
if ($("#doc-col").height() < $("#side-nav").height()) {