diff options
| author | stefanorigano (SRI) <sri@odoo.com> | 2020-07-31 14:55:43 +0000 |
|---|---|---|
| committer | qsm-odoo <qsm@odoo.com> | 2020-08-14 19:19:47 +0000 |
| commit | fdbcf87228a50d814a8bdf5e49b72c1faa4c3166 (patch) | |
| tree | 70c541af702902764f75c8ff4a4cfa30487d9f21 /addons/web_editor/static/src/xml/snippets.xml | |
| parent | 95cbf79325606e8f8092f2103bd85ee98e57fd11 (diff) | |
[IMP] web, web_editor: review colorpicker design
Part of https://github.com/odoo/odoo/pull/55959
task-2157252
Co-authored-by: qsm-odoo <qsm@odoo.com>
Diffstat (limited to 'addons/web_editor/static/src/xml/snippets.xml')
| -rw-r--r-- | addons/web_editor/static/src/xml/snippets.xml | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/addons/web_editor/static/src/xml/snippets.xml b/addons/web_editor/static/src/xml/snippets.xml index f62c855d6f6..41c7c6e612d 100644 --- a/addons/web_editor/static/src/xml/snippets.xml +++ b/addons/web_editor/static/src/xml/snippets.xml @@ -43,15 +43,21 @@ <!-- options --> <div t-name="web_editor.snippet.option.colorpicker" class="colorpicker"> - <div class="d-flex px-1"> - <button t-if="widget.withCombinations" type="button" class="btn flex-grow-1 o_we_colorpicker_switch_pane_btn active" data-target="color-combinations">Combinations</button> - <button type="button" t-attf-class="btn flex-grow-1 o_we_colorpicker_switch_pane_btn #{widget.withCombinations ? '' : 'active'}" data-target="theme-colors">Custom</button> - <button t-if="widget.resetButton" type="button" class="btn flex-grow-1 o_we_color_btn o_colorpicker_reset"> + <div class="o_we_colorpicker_switch_panel d-flex justify-content-end px-2"> + <t t-if="widget.withCombinations"> + <button type="button" tabindex="1" class="o_we_colorpicker_switch_pane_btn active" data-target="color-combinations"> + <span>Combinations</span> + </button> + <button type="button" tabindex="2" t-attf-class="o_we_colorpicker_switch_pane_btn #{widget.withCombinations ? '' : 'active'}" data-target="theme-colors"> + <span>Custom</span> + </button> + </t> + <button t-if="widget.resetButton" type="button" class="my-1 ml-auto o_we_color_btn o_colorpicker_reset"> <t t-if="widget.withCombinations">None</t> <t t-else="">Reset</t> </button> </div> - <div t-attf-class="o_colorpicker_sections #{widget.withCombinations ? '' : 'd-none'} px-1" data-color-tab="color-combinations"> + <div t-attf-class="o_colorpicker_sections #{widget.withCombinations ? '' : 'd-none'} pt-2 px-2 pb-3 bg-black-25" data-color-tab="color-combinations"> <!-- List all Presets --> <t t-foreach="5" t-as="i"> <t t-call="web_editor.colorpalette.combination.btn"> @@ -59,7 +65,7 @@ </t> </t> </div> - <div t-attf-class="o_colorpicker_sections #{widget.withCombinations ? 'd-none' : ''} p-1" data-color-tab="theme-colors"/> + <div t-attf-class="o_colorpicker_sections #{widget.withCombinations ? 'd-none' : ''} pt-2 px-2 pb-3 bg-black-25" data-color-tab="theme-colors"/> </div> <t t-name="web_editor.colorpalette.combination.btn"> <button type="button" class="o_we_color_btn o_we_color_combination_btn" |