Merge "revised homepage to use static version of top banner" into klp-modular-dev
diff --git a/docs/html/index.jd b/docs/html/index.jd
index de2980b..2177352 100644
--- a/docs/html/index.jd
+++ b/docs/html/index.jd
@@ -11,13 +11,31 @@
<div class="fullscreen-carousel-content">
<div class="vcenter">
<div class="wrap clearfix">
- <div class="resource-widget resource-flow-layout wrap col-16"
+
+ <div class="static resource-flow-layout wrap col-16">
+ <div class="resource resource-card resource-card-18x6">
+ <div class="card-bg" style="background-image: url('/preview/images/l-dev-prev.png');"></div>
+ <div class="card-info">
+ <div class="section"></div>
+ <div class="title">Android L Developer Preview</div>
+ <div class="description ellipsis" style="height: 285px;">
+ <div class="text" style="height: auto;">
+ <p style="font-size:16px;">Get an early look at the next Android release and
+ start using new APIs so your apps are ready when the platform officially launches.</p>
+ <p>
+ <a href="{@docRoot}preview/index.html" class="landing-button landing-secondary">Learn more</a></p>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="resource-widget resource-flow-layout wrap col-16 no-section"
data-query="collection:index/primary"
data-resourceStyle="card"
data-sortOrder="-timestamp"
- data-numStacks="3"
- data-maxResults="4"
- data-cardSizes="18x6,6x2,6x2,6x2">
+ data-maxResults="3"
+ data-cardSizes="6x2,6x2,6x2">
</div> <!-- end .resource-widget -->
</div> <!-- end .wrap -->
</div> <!-- end .vcenter -->
@@ -38,7 +56,7 @@
<div class="landing-rest-of-page">
- <div class="landing-section" style="background-color:#f5f5f5">
+ <div class="landing-section">
<div class="wrap">
<div class="landing-section-header">
<div class="landing-h1">Android, Everywhere You Need It</div>
@@ -55,7 +73,7 @@
<div class="col-3-wide">
<img src="" alt="">
- <p>Wear</p>
+ <p>Wearable</p>
<p class="landing-small">
Provide information on-the-go for your users, whenever they need it.
</p>
diff --git a/docs/html/jd_collections.js b/docs/html/jd_collections.js
index ca19c02..6564aa8 100644
--- a/docs/html/jd_collections.js
+++ b/docs/html/jd_collections.js
@@ -2,10 +2,9 @@
"index/primary": {
"title": "",
"resources": [
- "preview/index.html",
- "preview/material/index.html",
- "preview/material/index.html",
- "preview/material/index.html"
+ "distribute/essentials/quality/tablets.html",
+ "distribute/engage/game-services.html",
+ "distribute/googleplay/edu/about.html"
]
},
"index/devices": {
diff --git a/docs/html/preview/index.html b/docs/html/preview/index.html
index d4610b5..be2d360 100644
--- a/docs/html/preview/index.html
+++ b/docs/html/preview/index.html
@@ -165,7 +165,7 @@
<img src="/preview/images/l-dev-prev.png" style=" margin:0px 0 0 40px" width="860px"/>
<div class="col-6" style="margin-left:660px; margin-top:-105px">
- <a href="/preview/setup-sdk.html" class="landing-button landing-secondary" style="position:absolute;z-index:100;float:right;margin-top: 0px; background-color:#09c">Get Started</a><!--
+ <a href="/preview/setup-sdk.html" class="landing-button landing-secondary" style="position:absolute;z-index:100;float:right;margin-top: 0px;">Get Started</a><!--
<p>Set up your environment and check out all the docs to get up and running.</p>-->