From 87f28adaacbf06f34f2426e7011832983de3e405 Mon Sep 17 00:00:00 2001 From: fja-odoo Date: Thu, 27 Feb 2020 14:11:57 +0000 Subject: [PATCH] [IMP] web: make ColorpickerDialog smaller Remove HSL from the color picker and make the dialog smaller. Part of https://github.com/odoo/odoo/pull/46088 task-2195313 --- .../src/js/widgets/colorpicker_dialog.js | 2 +- .../web/static/src/xml/colorpicker_dialog.xml | 48 +++++++------------ 2 files changed, 17 insertions(+), 33 deletions(-) diff --git a/addons/web/static/src/js/widgets/colorpicker_dialog.js b/addons/web/static/src/js/widgets/colorpicker_dialog.js index 6982f9c6349..f7238cceb2a 100644 --- a/addons/web/static/src/js/widgets/colorpicker_dialog.js +++ b/addons/web/static/src/js/widgets/colorpicker_dialog.js @@ -29,7 +29,7 @@ var ColorpickerDialog = Dialog.extend({ options = options || {}; this._super(parent, _.extend({ - size: 'medium', + size: 'small', title: _t('Pick a color'), buttons: [ {text: _t('Choose'), classes: 'btn-primary', close: true, click: this._onFinalPick.bind(this)}, diff --git a/addons/web/static/src/xml/colorpicker_dialog.xml b/addons/web/static/src/xml/colorpicker_dialog.xml index edcb9376026..dab882595db 100644 --- a/addons/web/static/src/xml/colorpicker_dialog.xml +++ b/addons/web/static/src/xml/colorpicker_dialog.xml @@ -4,7 +4,7 @@
-
+
@@ -15,7 +15,7 @@
-
+
@@ -23,38 +23,22 @@
-
-
- - -
-
- - -
-
- - -
+
+ +
-
-
- - -
-
- - -
-
- - -
+
+ + +
+
+ + +
+
+ +
-
-
- -