Commit cee65dca authored by Kristi Park's avatar Kristi Park Committed by Commit Bot

Revert "[NTP] Position richer picker elements using flexbox"

This reverts commit 371290bf.

Reason for revert: Flexbox does not play well with the colors menu

Original change's description:
> [NTP] Position richer picker elements using flexbox
> 
> Position elements with flexbox instead of inline-block. This allows us
> to remove the "font-size: 0" hack that fixed the extra space between
> inline-block elements.
> 
> Change-Id: Ie3b6f02281795e60806259a00b2ee948df3b0959
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1725334
> Commit-Queue: Kristi Park <kristipark@chromium.org>
> Reviewed-by: Kyle Milka <kmilka@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#688355}

TBR=kristipark@chromium.org,kmilka@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Change-Id: I4a5a2a70e58e2d1d03d15505d9c5be5b866fe959
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1763340
Commit-Queue: Kristi Park <kristipark@chromium.org>
Reviewed-by: default avatarKristi Park <kristipark@chromium.org>
Cr-Commit-Position: refs/heads/master@{#689196}
parent cb8550aa
...@@ -698,6 +698,7 @@ html[dir=rtl] #error-notice.has-link #error-notice-msg { ...@@ -698,6 +698,7 @@ html[dir=rtl] #error-notice.has-link #error-notice-msg {
box-shadow: 0 1px 3px 0 rgba(var(--GG800-rgb), .3), box-shadow: 0 1px 3px 0 rgba(var(--GG800-rgb), .3),
0 4px 8px 3px rgba(var(--GG800-rgb), .15); 0 4px 8px 3px rgba(var(--GG800-rgb), .15);
color: rgb(var(--GG700-rgb)); color: rgb(var(--GG700-rgb));
font-size: 0; /* Remove extra spacing between inline-block elements. */
height: 528px; height: 528px;
min-width: 800px; min-width: 800px;
padding: 0; padding: 0;
...@@ -712,6 +713,10 @@ html[dir=rtl] #error-notice.has-link #error-notice-msg { ...@@ -712,6 +713,10 @@ html[dir=rtl] #error-notice.has-link #error-notice-msg {
} }
} }
#customization-menu > div {
font-size: 13px;
}
#menu-nav-panel { #menu-nav-panel {
display: inline-block; display: inline-block;
height: 384px; height: 384px;
...@@ -880,11 +885,8 @@ html[dir=rtl] .menu-option { ...@@ -880,11 +885,8 @@ html[dir=rtl] .menu-option {
margin-inline-end: 8px; margin-inline-end: 8px;
} }
#menu-inner {
display: flex;
}
#menu-contents { #menu-contents {
display: inline-block;
height: 464px; height: 464px;
margin-inline-start: 40px; margin-inline-start: 40px;
position: relative; position: relative;
...@@ -892,8 +894,6 @@ html[dir=rtl] .menu-option { ...@@ -892,8 +894,6 @@ html[dir=rtl] .menu-option {
} }
.menu-panel { .menu-panel {
display: flex;
flex-flow: wrap;
height: 384px; height: 384px;
left: 0; left: 0;
/* Pad the content by 5px top/left. This will prevent the focus outline on /* Pad the content by 5px top/left. This will prevent the focus outline on
...@@ -916,7 +916,6 @@ html[dir=rtl] .menu-option { ...@@ -916,7 +916,6 @@ html[dir=rtl] .menu-option {
#backgrounds-menu .bg-sel-tile-bg, #backgrounds-menu .bg-sel-tile-bg,
#backgrounds-image-menu .bg-sel-tile-bg { #backgrounds-image-menu .bg-sel-tile-bg {
border-radius: 4px; border-radius: 4px;
display: block;
height: 176px; height: 176px;
margin-bottom: 45px; margin-bottom: 45px;
margin-inline-end: 8px; margin-inline-end: 8px;
...@@ -1002,6 +1001,12 @@ html[dir=rtl] .menu-option { ...@@ -1002,6 +1001,12 @@ html[dir=rtl] .menu-option {
} }
} }
#backgrounds-menu,
#colors-menu {
/* Remove extra spacing between inline-block elements. */
font-size: 0;
}
#backgrounds-upload.bg-sel-tile-bg { #backgrounds-upload.bg-sel-tile-bg {
background-color: transparent; background-color: transparent;
vertical-align: top; vertical-align: top;
...@@ -1569,7 +1574,6 @@ input:checked + .toggle .highlight { ...@@ -1569,7 +1574,6 @@ input:checked + .toggle .highlight {
border-radius: 50%; border-radius: 50%;
box-sizing: border-box; box-sizing: border-box;
cursor: pointer; cursor: pointer;
display: block;
height: var(--tile-size); height: var(--tile-size);
margin-bottom: var(--tile-margin); margin-bottom: var(--tile-margin);
margin-inline-end: var(--tile-margin); margin-inline-end: var(--tile-margin);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment