summaryrefslogtreecommitdiffstats
path: root/docs/html
diff options
context:
space:
mode:
authorsmain@google.com <smain@google.com>2014-06-14 01:17:31 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-06-14 01:17:31 +0000
commit2ff0e5ce491428f6d82bf8f49ae54b4bb6845d78 (patch)
tree46abcfcd6601170f62c13c47c7329398370b36a4 /docs/html
parentbbca40a0696e1f0728ac15204eac00a0c26e8eb2 (diff)
parent80b69dc2035711208791d7253bca04eb29eacb68 (diff)
downloadframeworks_base-2ff0e5ce491428f6d82bf8f49ae54b4bb6845d78.zip
frameworks_base-2ff0e5ce491428f6d82bf8f49ae54b4bb6845d78.tar.gz
frameworks_base-2ff0e5ce491428f6d82bf8f49ae54b4bb6845d78.tar.bz2
am 80b69dc2: am b43eff80: adjust scroll position now that there\'s secondary nav bar
* commit '80b69dc2035711208791d7253bca04eb29eacb68': adjust scroll position now that there's secondary nav bar
Diffstat (limited to 'docs/html')
-rw-r--r--docs/html/wear/css/wear.css2
-rw-r--r--docs/html/wear/index.jd3
2 files changed, 2 insertions, 3 deletions
diff --git a/docs/html/wear/css/wear.css b/docs/html/wear/css/wear.css
index fe9eef2..7c8d1a9 100644
--- a/docs/html/wear/css/wear.css
+++ b/docs/html/wear/css/wear.css
@@ -143,7 +143,7 @@
}
.wear-hero {
- height: calc(100% - 70px);
+ height: calc(100% - 122px);
min-height: 504px;
margin-top: 0;
padding-top: 0;
diff --git a/docs/html/wear/index.jd b/docs/html/wear/index.jd
index 659e9f2..e0a8d12 100644
--- a/docs/html/wear/index.jd
+++ b/docs/html/wear/index.jd
@@ -15,7 +15,6 @@ page.customHeadTag=<link rel="stylesheet" type="text/css" href="/wear/css/wear.c
-
<div id="video-container">
<div id="video-frame">
<div class="video-close">
@@ -397,7 +396,7 @@ $("#icon-video-close").on("click", function() {
<script>
$("a.wear-down-arrow").on("click", function(e) {
$("body").animate({
- scrollTop: $(".wear-hero").height() + 76
+ scrollTop: $(".wear-hero").height() + 128
}, 1000, "easeOutQuint");
e.preventDefault();
});