From 41dd4a311c4c683367201bfe876a2d6f220e5319 Mon Sep 17 00:00:00 2001 From: "aa@chromium.org" Date: Mon, 18 Oct 2010 19:50:55 +0000 Subject: Reserve right-most column of apps grid for web store icon. When there is less than one complete row of apps, position the web store icon naturally in the grid, to the right of the other apps. Once there is at least one complete row, position the web store icon at the top of the right-most column. BUG=58857 TEST=Install a few apps. Web store icon should be in top row directly to the right of the other apps. Install more apps. Once you have more than one row, web store icon should stay in top right corner by itself. No other apps should go below it. Review URL: http://codereview.chromium.org/3747007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62962 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/resources/ntp/apps.css | 44 +++++++++++++++++++++++++++++++++-- 1 file changed, 42 insertions(+), 2 deletions(-) (limited to 'chrome/browser/resources/ntp/apps.css') diff --git a/chrome/browser/resources/ntp/apps.css b/chrome/browser/resources/ntp/apps.css index c92c7a9..3e2f8f9 100644 --- a/chrome/browser/resources/ntp/apps.css +++ b/chrome/browser/resources/ntp/apps.css @@ -1,5 +1,27 @@ /* Apps */ +#apps-content { + position: relative; + width: intrinsic; + max-width: 780px; /* (124 + margin * 2) * 6 */ +} + +html.apps-promo-visible #apps-content { + max-width: 650px; /* (124 + margin * 2) * 5 */ +} + +/* small */ +@media (max-width: 940px) { + /* + We don't need to do anything for html.apps-promo-visible because there is + enough extra space in the small grid layout. + */ + #apps-content, + html.apps-promo-visible #apps-content { + max-width: 520px; /* (124 + margin * 2) * 4 */ + } +} + .app, .app[new=installed] { -webkit-box-sizing: border-box; @@ -133,14 +155,32 @@ html[dir=rtl] #apps-promo-hide { } html.apps-promo-visible .app[app-id=web-store-entry] { - left: 25px; + position: absolute; + left: 100%; + top: 0; + -webkit-margin-start: 22px; } html.apps-promo-visible[dir=rtl] .app[app-id=web-store-entry] { - right: 25px; + right: 100%; } html.apps-promo-visible .app[app-id=web-store-entry] a { font-weight: bold; } +/* +We position the web store entry all by its lonesome in the top of the rightmost +column when there is at least one full row of apps. Note that this is similar, +but different than its position during promo (html.apps-promo-visible), so we +never set .loner while the promo is running. +*/ +.app[app-id=web-store-entry].loner { + position: absolute; + left: 100%; + top: 0; +} + +html[dir=rtl] .app[app-id=web-store-entry].loner { + right: 100%; +} -- cgit v1.1