summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsmain@google.com <smain@google.com>2014-12-03 18:36:34 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-12-03 18:36:34 +0000
commitb8e8e522704f37ea5adc63cce9c34801bb10c42d (patch)
tree141b769317cae645ebc1520f873517595e413e60
parentb60408bb53a4a63cd186c5bedfded90856b60d73 (diff)
parente217fc3c3ee9a437dfdeda2c3cc0df99380dbfc0 (diff)
downloadbuild-b8e8e522704f37ea5adc63cce9c34801bb10c42d.zip
build-b8e8e522704f37ea5adc63cce9c34801bb10c42d.tar.gz
build-b8e8e522704f37ea5adc63cce9c34801bb10c42d.tar.bz2
am e217fc3c: am eee91eb2: am d99989c5: Merge "new version of Helpouts recruit banner for TV and Wear" into lmp-docs
* commit 'e217fc3c3ee9a437dfdeda2c3cc0df99380dbfc0': new version of Helpouts recruit banner for TV and Wear
-rw-r--r--tools/droiddoc/templates-sdk/assets/css/default.css2
-rw-r--r--tools/droiddoc/templates-sdk/components/masthead.cs25
2 files changed, 7 insertions, 20 deletions
diff --git a/tools/droiddoc/templates-sdk/assets/css/default.css b/tools/droiddoc/templates-sdk/assets/css/default.css
index a08cc6e..98bfaf8 100644
--- a/tools/droiddoc/templates-sdk/assets/css/default.css
+++ b/tools/droiddoc/templates-sdk/assets/css/default.css
@@ -7399,7 +7399,7 @@ a.home-new-cta-btn:hover,
/* Helpouts widget */
.resource-card-6x2.helpouts-card {
- width: 220px;
+ width: 255px;
height: 40px;
position:absolute;
z-index:999;
diff --git a/tools/droiddoc/templates-sdk/components/masthead.cs b/tools/droiddoc/templates-sdk/components/masthead.cs
index d07b378..e1ea73f 100644
--- a/tools/droiddoc/templates-sdk/components/masthead.cs
+++ b/tools/droiddoc/templates-sdk/components/masthead.cs
@@ -206,33 +206,20 @@
<div class="wrap" style="position:relative;z-index:1">
<?cs if:reference ?>
- <?cs # HIDE HELPOUTS RECRUIT BANNER
+ <?cs # HIDE HELPOUTS RECRUIT BANNER ?>
<a id="helpoutsLink" class="resource resource-card resource-card-6x2x3 resource-card-6x2 helpouts-card"
- href="http://helpouts.google.com/partner/landing/provider/googledevelopers" target="_blank">
+ href="http://helpouts.google.com/partner/landing/provider/googledevelopers?utm_source=dac&utm_medium=banner&utm_campaign=android_provider_banner3" target="_blank">
<div class="card-bg helpouts-card-bg"></div>
<div class="card-info">
<div class="helpouts-description">
- <div class="text">Help developers solve problems<br/>
- <span id="helpoutsLinkText" class="link-color" style="display:block;padding-top:5px;text-align:right">Learn more</span>
+ <div class="text">Help Android Wear and TV developers<br/>
+ <span id="helpoutsLinkText" class="link-color"
+ style="display:block;padding-top:5px;text-align:right">Learn more</span>
</div>
</div>
</div>
</a>
- <script>
- var textA = "LEARN MORE";
- var linkA = "http://helpouts.google.com/partner/landing/provider/googledevelopers?utm_source=android_banner1&utm_medium=banner&utm_campaign=android_provider_banner1";
- var textB = "SIGN UP NOW";
- var linkB = "http://helpouts.google.com/partner/landing/provider/googledevelopers?utm_source=android_banner2&utm_medium=banner&utm_campaign=android_provider_banner2";
-
- if (Math.floor(1/Math.random()) > 1) {
- $("a#helpoutsLink").attr('href', linkA);
- $("span#helpoutsLinkText").text(textA);
- } else {
- $("a#helpoutsLink").attr('href', linkB);
- $("span#helpoutsLinkText").text(textB);
- }
- </script>
- END HIDE HELPOUTS ?>
+ <?cs # END HIDE HELPOUTS ?>
<?cs /if ?>
<ul class="nav-x col-9 develop" style="width:100%">