Skip to content

Commit

Permalink
Revert "Reland "personalization: extend two-tone background""
Browse files Browse the repository at this point in the history
This reverts commit c22757d.

Reason for revert: Scroll container is too big. 

Original change's description:
> Reland "personalization: extend two-tone background"
>
> This reverts commit 2f53e24.
>
> Reason for revert: Fixed bug with breadcrumb
>
> I scrolled all the way down and there's no gap in the wallpaper:
> https://screenshot.googleplex.com/6fKrRYPgLEuSShq.
>
> Original change's description:
> > Revert "personalization: extend two-tone background"
> >
> > This reverts commit 88acc15.
> >
> > Reason for revert: http://shortn/_6z555qKxyU
> >
> > Original change's description:
> > > personalization: extend two-tone background
> > >
> > > The content background color should extend to the bottom of the page.
> > >
> > > before: https://screenshot.googleplex.com/97MhQyhysNcf8iK.png
> > > after: https://screenshot.googleplex.com/9jfRRmAySoZLwPB.png
> > > mock: https://docs.google.com/presentation/d/1sCxNbUVFwRf-4YYOhcUcmcc0mHpwysmHrO9qNoglDwQ/edit#slide=id.g13d12115f9e_0_250
> > >
> > > BUG=b:286519658
> > > TEST=manual
> > >
> > > Change-Id: I71a0a1e8c4b343d101c3a7eecd3bfdaea6eeae3c
> > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4605994
> > > Commit-Queue: Erica Lee <ericamlee@google.com>
> > > Reviewed-by: Jerry Liu <pzliu@google.com>
> > > Reviewed-by: Jason Thai <jasontt@chromium.org>
> > > Cr-Commit-Position: refs/heads/main@{#1155755}
> >
> > BUG=b:286519658
> >
> > Change-Id: I691749a1d3971f982c06d8a08e77e828294d55da
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4609245
> > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
> > Commit-Queue: Jason Thai <jasontt@chromium.org>
> > Auto-Submit: Jason Thai <jasontt@chromium.org>
> > Commit-Queue: Jerry Liu <pzliu@google.com>
> > Reviewed-by: Jerry Liu <pzliu@google.com>
> > Quick-Run: Jason Thai <jasontt@chromium.org>
> > Cr-Commit-Position: refs/heads/main@{#1156612}
>
> BUG=b:286519658
>
> Change-Id: Id5a65689feb24c69fe51d0b935fa7eb8dc0921a8
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4609098
> Commit-Queue: Erica Lee <ericamlee@google.com>
> Reviewed-by: Jerry Liu <pzliu@google.com>
> Reviewed-by: Jason Thai <jasontt@chromium.org>
> Cr-Commit-Position: refs/heads/main@{#1158392}

BUG=b:286519658

Change-Id: I105318a98f1c87dcf99bb67e306a2f484479c00f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4621600
Reviewed-by: Jason Thai <jasontt@chromium.org>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Commit-Queue: Erica Lee <ericamlee@google.com>
Cr-Commit-Position: refs/heads/main@{#1159123}
  • Loading branch information
Erica Lee authored and Chromium LUCI CQ committed Jun 16, 2023
1 parent 8830860 commit fa707c8
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 10 deletions.
2 changes: 0 additions & 2 deletions ash/webui/personalization_app/resources/css/common.css
Expand Up @@ -17,8 +17,6 @@
}

:host {
--personalization-app-breadcrumb-height: 56px;
--personalization-app-subpage-container-min-height: calc(100vh - var(--personalization-app-breadcrumb-height));
--personalization-app-grid-item-background-color: var(--google-grey-100);
--personalization-app-grid-item-border-radius: 12px;
--personalization-app-grid-item-height: 120px;
Expand Down
Expand Up @@ -18,7 +18,6 @@
grid-template-columns: 1fr 16px minmax(568px, 920px) 16px 1fr;
grid-template-rows: auto minmax(0, 1fr);
margin-block-end: 0;
min-height: var(--personalization-app-subpage-container-min-height);
}
#mainSettings {
display: flex;
Expand Down
Expand Up @@ -11,12 +11,12 @@
grid-template-areas:
'. . breadcrumb . .';
grid-template-columns: 1fr 16px minmax(568px, 920px) 16px 1fr;
grid-template-rows: var(--personalization-app-breadcrumb-height);
grid-template-rows: 56px;
position: sticky;
top: 0;
width: 100%;
/* z-index for breadcrumb should be higher than other elements
(such as preview-image-border) so that it won't be overlapped
/* z-index for breadcrumb should be higher than other elements
(such as preview-image-border) so that it won't be overlapped
during scrolling in hub subpages */
z-index: 3;
}
Expand Down
Expand Up @@ -5,8 +5,7 @@
'. leftspacertop userpreview rightspacertop .'
'. leftspacerbottom avatars rightspacerbottom .';
grid-template-columns: 1fr 24px minmax(568px, 920px) 24px 1fr;
grid-template-rows: auto 1fr;
min-height: var(--personalization-app-subpage-container-min-height);
grid-template-rows: auto auto;
}
user-preview {
grid-area: userpreview;
Expand Down
Expand Up @@ -41,7 +41,7 @@
#albumsContent,
#photosByAlbumIdContent,
#photosContent,
:host-context(body:not(.jelly-enabled)) #zeroState {
#zeroState {
flex: 1 1 auto;
height: 100%;
overflow: hidden;
Expand Down
Expand Up @@ -7,7 +7,6 @@
grid-template-columns: 1fr 16px minmax(568px, 920px) 16px 1fr;
grid-template-rows: 172px minmax(0, 1fr);
height: 100%;
min-height: var(--personalization-app-subpage-container-min-height);
position: relative;
width: 100%;
}
Expand Down

0 comments on commit fa707c8

Please sign in to comment.