Commit 4e6f237a authored by Alex Ilin's avatar Alex Ilin Committed by Chromium LUCI CQ

[cr-customize-themes] Update layout of the color picker icon

There is a couple of bugs related to the color picker <div> having
`position: relative`. This CL removes `position: relative` from the
top-level div and adds a nested div with `position: relative` to place
the color picker icon and a hidden input element on top of it.

Fixed: 1162053, 1161660
Change-Id: I1e856bb58a3508bc2deb9ce84487ea7a8cb95d34
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2611274Reviewed-by: default avatarEsmael Elmoslimany <aee@chromium.org>
Commit-Queue: Alex Ilin <alexilin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#840977}
parent 26864c19
...@@ -68,18 +68,21 @@ ...@@ -68,18 +68,21 @@
} }
#autogeneratedThemeContainer { #autogeneratedThemeContainer {
display: flex;
flex-direction: column;
position: relative; position: relative;
} }
/* colorPicker is placed on top of the theme icon to work around
https://crbug.com/1162053 */
#colorPicker { #colorPicker {
border: 0; border: 0;
height: 0; height: var(--cr-customize-themes-icon-size);
left: 0;
margin: 0; margin: 0;
padding: 0; padding: 0;
position: absolute;
top: 0;
visibility: hidden; visibility: hidden;
width: 0; width: var(--cr-customize-themes-icon-size);
} }
#colorPickerIcon { #colorPickerIcon {
...@@ -144,16 +147,17 @@ ...@@ -144,16 +147,17 @@
</div> </div>
</div> </div>
<cr-grid id="themesContainer" columns="6" role="radiogroup"> <cr-grid id="themesContainer" columns="6" role="radiogroup">
<div id="autogeneratedThemeContainer" <div aria-label="[[i18n('colorPickerLabel')]]"
aria-label="[[i18n('colorPickerLabel')]]"
tabindex="0" on-click="onAutogeneratedThemeClick_" role="radio" tabindex="0" on-click="onAutogeneratedThemeClick_" role="radio"
aria-checked$="[[getThemeIconCheckedStatus_('autogenerated', selectedTheme)]]"> aria-checked$="[[getThemeIconCheckedStatus_('autogenerated', selectedTheme)]]">
<div id="autogeneratedThemeContainer">
<cr-theme-icon id="autogeneratedTheme" <cr-theme-icon id="autogeneratedTheme"
selected$="[[isThemeIconSelected_('autogenerated', selectedTheme)]]"> selected$="[[isThemeIconSelected_('autogenerated', selectedTheme)]]">
</cr-theme-icon> </cr-theme-icon>
<div id="colorPickerIcon"></div> <div id="colorPickerIcon"></div>
<input id="colorPicker" type="color" on-change="onCustomFrameColorChange_"> <input id="colorPicker" type="color"
</input> on-change="onCustomFrameColorChange_">
</div>
<paper-tooltip offset="0" fit-to-visible-bounds> <paper-tooltip offset="0" fit-to-visible-bounds>
[[i18n('colorPickerLabel')]] [[i18n('colorPickerLabel')]]
</paper-tooltip> </paper-tooltip>
......
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