diff options
| author | smain@google.com <smain@google.com> | 2015-08-24 16:48:53 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-24 16:48:53 +0000 |
| commit | e24174d2a204983e7263c6d229c3cfc547bc2ec0 (patch) | |
| tree | 03c00a45f313dadf447a0c9da7f0839f04beab7e /tools | |
| parent | 7c4c6f589e846d838136de148ae7e7d680c74d91 (diff) | |
| parent | 15bb28fc73fa30e9c7b8ee0d924c8906724809e0 (diff) | |
| download | build-e24174d2a204983e7263c6d229c3cfc547bc2ec0.zip build-e24174d2a204983e7263c6d229c3cfc547bc2ec0.tar.gz build-e24174d2a204983e7263c6d229c3cfc547bc2ec0.tar.bz2 | |
am 15bb28fc: am ed7e864a: 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
* commit '15bb28fc73fa30e9c7b8ee0d924c8906724809e0':
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/
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/droiddoc/templates-sdk/assets/css/default.css | 2 | ||||
| -rw-r--r-- | tools/droiddoc/templates-sdk/sdkpage.cs | 6 |
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; } } |