aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2012-06-19 23:22:16 -0700
committerScott Main <smain@google.com>2012-06-19 23:22:16 -0700
commitb875be1382b20dd95195214ff1f498ef70e523e3 (patch)
tree2b7e29a09955e74b45cb643faffdf9b15587b28b
parent89834335aba4c469c4ac64b502da79d82ca40352 (diff)
downloadbuild-b875be1382b20dd95195214ff1f498ef70e523e3.tar.gz
docs: make fullscreen mode default; remove duplicate search page numbers
Change-Id: I490ae94b1e1fddb607c0ee116c8c245974883458
-rw-r--r--tools/droiddoc/templates-sdk/assets/css/default.css2
-rw-r--r--tools/droiddoc/templates-sdk/assets/js/search_autocomplete.js2
-rw-r--r--tools/droiddoc/templates-sdk/customizations.cs6
-rw-r--r--tools/droiddoc/templates-sdk/head_tag.cs2
4 files changed, 7 insertions, 5 deletions
diff --git a/tools/droiddoc/templates-sdk/assets/css/default.css b/tools/droiddoc/templates-sdk/assets/css/default.css
index 2df3810920..7dd2f17ef4 100644
--- a/tools/droiddoc/templates-sdk/assets/css/default.css
+++ b/tools/droiddoc/templates-sdk/assets/css/default.css
@@ -2262,7 +2262,7 @@ div.design-announce p {
display:none;
}
#devdoc-nav a.totop:hover {
- background-color:#7AA1B0;
+ background-color:#33B5E5;
}
.content-footer a.totop {
diff --git a/tools/droiddoc/templates-sdk/assets/js/search_autocomplete.js b/tools/droiddoc/templates-sdk/assets/js/search_autocomplete.js
index 3de53d5fa9..1838ccbd9c 100644
--- a/tools/droiddoc/templates-sdk/assets/js/search_autocomplete.js
+++ b/tools/droiddoc/templates-sdk/assets/js/search_autocomplete.js
@@ -481,6 +481,7 @@ function hideResults() {
var tabHeaders = $(".gsc-tabHeader");
for (var i = 0; i < tabHeaders.length; i++) {
$(tabHeaders[i]).attr("id",i).click(function() {
+ /*
// make a copy of the page numbers for the search left pane
setTimeout(function() {
// remove any residual page numbers
@@ -492,6 +493,7 @@ function hideResults() {
$('#searchResults .gsc-webResult .gsc-cursor-box.gs-bidi-start-align:visible')
.clone().appendTo('#searchResults .gsc-tabsArea');
}, 200);
+ */
});
}
setTimeout(function(){$(tabHeaders[0]).click()},200);
diff --git a/tools/droiddoc/templates-sdk/customizations.cs b/tools/droiddoc/templates-sdk/customizations.cs
index ce1d16850a..b145029e3c 100644
--- a/tools/droiddoc/templates-sdk/customizations.cs
+++ b/tools/droiddoc/templates-sdk/customizations.cs
@@ -249,10 +249,10 @@ def:default_left_nav() ?>
</div> <!-- end side-nav -->
<script type="text/javascript">
// init fullscreen based on user pref
- if (readCookie("fullscreen") == "true") {
- toggleFullscreen(true);
- } else {
+ if (readCookie("fullscreen") == "false") {
toggleFullscreen(false);
+ } else {
+ toggleFullscreen(true);
}
// init nav version for mobile
if (isMobile) {
diff --git a/tools/droiddoc/templates-sdk/head_tag.cs b/tools/droiddoc/templates-sdk/head_tag.cs
index bd8c778f36..396a992876 100644
--- a/tools/droiddoc/templates-sdk/head_tag.cs
+++ b/tools/droiddoc/templates-sdk/head_tag.cs
@@ -17,7 +17,7 @@ href="//fonts.googleapis.com/css?family=Roboto:regular,medium,thin,italic,medium
<?cs if:reference ?>
<!-- alternative FULLSCREEN styles -->
<link href="<?cs var:toroot ?>assets/css/fullscreen.css" rel="stylesheet" title="fullscreen"
-type="text/css" disabled="disabled">
+type="text/css">
<?cs /if ?>
<?cs if:carousel ?>