Rebased Updated templates, styles, scripts for dac.
Change-Id: Ida1a7f39cb6df0255f8f9c8e96a2270a0283c59e
diff --git a/tools/droiddoc/templates-sdk/assets/css/default.css b/tools/droiddoc/templates-sdk/assets/css/default.css
index 9219917..f53845a 100644
--- a/tools/droiddoc/templates-sdk/assets/css/default.css
+++ b/tools/droiddoc/templates-sdk/assets/css/default.css
@@ -6362,9 +6362,13 @@
.dac-button.dac-raised.dac-primary, .landing-secondary, .button {
background-color: #039bef; }
.dac-button.dac-raised.dac-primary:hover, .landing-secondary:hover, .button:hover {
- background-color: #0288d1; color:#fff; }
+ background-color: #0288d1;
+ color:#fff; }
.dac-button.dac-raised.dac-primary:active, .landing-secondary:active, .button:active {
- background-color: #0277bd; }
+ background-color: #0277bd;
+ color:#fff; }
+ .dac-button.dac-raised.dac-primary.disabled, .button.disabled {
+ background-color: #bbb; }
.dac-button.dac-raised.dac-red, .landing-primary {
background-color: #bf3722; }
@@ -8801,11 +8805,6 @@
min-height: 550px;
padding-top: 88px;
}
-
-.dac-hero.summit {
- background-image: url(../../images/ads_hero_17@2x.jpg);
-}
-
.dac-hero.dac-darken.mprev::before {
background: rgba(0, 0, 0, 0.3);
bottom: 0;
diff --git a/tools/droiddoc/templates-sdk/assets/js/docs.js b/tools/droiddoc/templates-sdk/assets/js/docs.js
index c30284b..7a4f715 100644
--- a/tools/droiddoc/templates-sdk/assets/js/docs.js
+++ b/tools/droiddoc/templates-sdk/assets/js/docs.js
@@ -983,7 +983,7 @@
}
// get the selected item's offset from its container nav by measuring the item's offset
// relative to the document then subtract the container nav's offset relative to the document
- var selectedOffset = $selected.offset().top - $nav.offset().top;
+ var selectedOffset = $selected.offset().top - $nav.offset().top + 60;
if (selectedOffset > $nav.height() * .8) { // multiply nav height by .8 so we move up the item
// if it's more than 80% down the nav
// scroll the item up by an amount equal to 80% the container nav's height
diff --git a/tools/droiddoc/templates-sdk/head_tag.cs b/tools/droiddoc/templates-sdk/head_tag.cs
index 33682f2..100b0bc 100644
--- a/tools/droiddoc/templates-sdk/head_tag.cs
+++ b/tools/droiddoc/templates-sdk/head_tag.cs
@@ -75,6 +75,7 @@
var toRoot = "<?cs var:toroot ?>";
var metaTags = [<?cs var:meta.tags ?>];
var devsite = <?cs if:devsite ?>true<?cs else ?>false<?cs /if ?>;
+ var useUpdatedTemplates = <?cs if:useUpdatedTemplates ?>true<?cs else ?>false<?cs /if ?>;
</script>
<script src="<?cs var:toroot ?>assets/js/docs.js?v=17" type="text/javascript"></script>