summaryrefslogtreecommitdiffstats
path: root/tools/droiddoc
diff options
context:
space:
mode:
authorsmain@google.com <smain@google.com>2015-08-19 17:36:57 -0700
committerScott Main <smain@google.com>2015-08-20 00:52:27 +0000
commited7e864a735f004f1dbb4a2db5261855b5693913 (patch)
treeabc69f7fde57d633224d9fa576ff70882e9cea6a /tools/droiddoc
parent956e469327b1da4b635f20795ed48f6c36ba10d6 (diff)
downloadbuild-ed7e864a735f004f1dbb4a2db5261855b5693913.zip
build-ed7e864a735f004f1dbb4a2db5261855b5693913.tar.gz
build-ed7e864a735f004f1dbb4a2db5261855b5693913.tar.bz2
fix a few bugs in the studio download button behavior:
- make button text always white (avoid blue on blue during hover) - revise logic to add the platform name to download button to avoid weird duplicity bug on small screens - remove the animation script when clicking download before agree because it reloaded the page (unkown cause) depends on: https://googleplex-android-review.git.corp.google.com/#/c/752757/ Change-Id: I1b2b4ff9c0b0cbbd34f1c77a2b736fe3425a16e4
Diffstat (limited to 'tools/droiddoc')
-rw-r--r--tools/droiddoc/templates-sdk/assets/css/default.css2
-rw-r--r--tools/droiddoc/templates-sdk/sdkpage.cs6
2 files changed, 3 insertions, 5 deletions
diff --git a/tools/droiddoc/templates-sdk/assets/css/default.css b/tools/droiddoc/templates-sdk/assets/css/default.css
index e4e1118..d493566 100644
--- a/tools/droiddoc/templates-sdk/assets/css/default.css
+++ b/tools/droiddoc/templates-sdk/assets/css/default.css
@@ -6362,7 +6362,7 @@ div.jd-descr > .resource-widget[data-section=distribute\/tools] .section-card-me
.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; }
+ background-color: #0288d1; color:#fff; }
.dac-button.dac-raised.dac-primary:active, .landing-secondary:active, .button:active {
background-color: #0277bd; }
diff --git a/tools/droiddoc/templates-sdk/sdkpage.cs b/tools/droiddoc/templates-sdk/sdkpage.cs
index 8ec034f..013de59 100644
--- a/tools/droiddoc/templates-sdk/sdkpage.cs
+++ b/tools/droiddoc/templates-sdk/sdkpage.cs
@@ -404,6 +404,7 @@ var:sdk.linux_download
<script>
+
if (location.hash == "#Requirements") {
$('.reqs').show();
} else if (location.hash == "#ExistingIDE") {
@@ -434,7 +435,7 @@ var:sdk.linux_download
$('#not-supported').hide();
/* set up primary Android Studio download button */
- $('.download-bundle-button').append(" <br/><span class='small'>for " + os + "</span>");
+ $('.download-bundle-button > .small').html(" for " + os);
$('.download-bundle-button').click(function() {return onDownload(this,true,true);}).attr('href', bundlename);
}
@@ -501,9 +502,6 @@ var:sdk.linux_download
ga('send', 'event', 'SDK', 'IDE and Tools', $("#downloadForRealz").html());
return true;
} else {
- $("label#agreeLabel").parent().stop().animate({color: "#258AAF"}, 200,
- function() {$("label#agreeLabel").parent().stop().animate({color: "#222"}, 200)}
- );
return false;
}
}