diff options
author | csilv@chromium.org <csilv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-03 00:18:06 +0000 |
---|---|---|
committer | csilv@chromium.org <csilv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-03 00:18:06 +0000 |
commit | 0fb27399730a596e01cd221d13602f28086b5781 (patch) | |
tree | bff1d04f8da390e53297707f490c48ca2e3e1ae0 | |
parent | 6998a66de5bb5889f5a31732236bdc9205ca200b (diff) | |
download | chromium_src-0fb27399730a596e01cd221d13602f28086b5781.zip chromium_src-0fb27399730a596e01cd221d13602f28086b5781.tar.gz chromium_src-0fb27399730a596e01cd221d13602f28086b5781.tar.bz2 |
[ntp4] Fix incorrect scrollbar behavior on bookmarks page.
BUG=94263
TEST=Verify that bookmarks page does not show a scrollbar when there is no scrollable content.
Review URL: http://codereview.chromium.org/7828049
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99485 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | chrome/browser/resources/ntp4/bookmarks_page.css | 5 | ||||
-rw-r--r-- | chrome/browser/resources/ntp4/tile_page.css | 4 | ||||
-rw-r--r-- | chrome/browser/resources/ntp4/tile_page.js | 12 |
3 files changed, 9 insertions, 12 deletions
diff --git a/chrome/browser/resources/ntp4/bookmarks_page.css b/chrome/browser/resources/ntp4/bookmarks_page.css index 273233e..9181b97 100644 --- a/chrome/browser/resources/ntp4/bookmarks_page.css +++ b/chrome/browser/resources/ntp4/bookmarks_page.css @@ -120,11 +120,6 @@ html[dir=rtl] .bookmark .close-button { white-space: nowrap; } -/* Add padding to tile page content to adjust for title wrapper. */ -.bookmarks-page .tile-page-content { - /* padding-bottom: 48px; */ -} - #bookmarks-title-wrapper .title-crumb { cursor: pointer; margin: 0 25px; diff --git a/chrome/browser/resources/ntp4/tile_page.css b/chrome/browser/resources/ntp4/tile_page.css index 3cee0fbe..fd65072 100644 --- a/chrome/browser/resources/ntp4/tile_page.css +++ b/chrome/browser/resources/ntp4/tile_page.css @@ -4,9 +4,11 @@ */ .tile-page { + display: -webkit-box; height: 100%; position: relative; width: 100%; + -webkit-box-orient: vertical; } .tile-page-scrollbar { @@ -20,7 +22,6 @@ } .tile-page-content { - height: 100%; overflow-y: scroll; padding-top: 100px; position: relative; @@ -37,6 +38,7 @@ /* Scrollbar width(13px) + balance right padding. */ padding-left: 93px; padding-right: 80px; + -webkit-box-flex: 1; /* Don't apply clip mask to padding. */ -webkit-mask-clip: content-box; } diff --git a/chrome/browser/resources/ntp4/tile_page.js b/chrome/browser/resources/ntp4/tile_page.js index 6ed9a57..b188ca5 100644 --- a/chrome/browser/resources/ntp4/tile_page.js +++ b/chrome/browser/resources/ntp4/tile_page.js @@ -706,7 +706,7 @@ cr.define('ntp4', function() { var usedHeight = layout.rowHeight * numRows; // 100 matches the top padding of tile-page. var newMargin = document.documentElement.clientHeight / 3 - - usedHeight / 2 - 100; + usedHeight / 2 - 100 - this.content_.offsetTop; newMargin = Math.max(newMargin, 0); // |newMargin| is the final margin we actually want to show. However, @@ -821,10 +821,10 @@ cr.define('ntp4', function() { var content = this.content_; - // Adjust height to account for possible header-bar. - var adjustedClientHeight = content.clientHeight - content.offsetTop; + // Adjust scroll-height to account for possible header-bar. + var adjustedScrollHeight = content.scrollHeight - content.offsetTop; - if (content.scrollHeight == adjustedClientHeight) { + if (adjustedScrollHeight <= content.clientHeight) { this.scrollbar_.hidden = true; return; } else { @@ -832,8 +832,8 @@ cr.define('ntp4', function() { } var thumbTop = content.offsetTop + - content.scrollTop / content.scrollHeight * adjustedClientHeight; - var thumbHeight = adjustedClientHeight / content.scrollHeight * + content.scrollTop / adjustedScrollHeight * content.clientHeight; + var thumbHeight = content.clientHeight / adjustedScrollHeight * this.clientHeight; this.scrollbar_.style.top = thumbTop + 'px'; |