From 8d591ee3e21311801e017eea0c2b147e8b1e40b7 Mon Sep 17 00:00:00 2001 From: qsm-odoo Date: Thu, 17 Feb 2022 16:04:31 +0000 Subject: [PATCH] [REF] web, *: move the openhand.cur file to the right folder *: point_of_sale, pos_restaurant With [1], we introduced a cursor file for the grab icon in 13.0. It was then forward-ported up to master... but it should have been adapted starting from 15.0 as the 'img' folder of web moved around at [2]. This commit fixes that to not have two 'img' folders in web. Unfortunately, [1] was not merged yesterday so we cannot really "fix" the stable 15.0 version whose custo may already rely on that wrong image location. So this fixes only master. [1]: https://github.com/odoo/odoo/commit/c8e4e1e90322a652b01fa0eb1e6612b9c244f744 [2]: https://github.com/odoo/odoo/commit/ecfe85db84fb5649aaeb48ba3b221386e61a57bc closes odoo/odoo#84837 Related: odoo/enterprise#24484 Signed-off-by: Romain Derie (rde) --- addons/point_of_sale/static/src/css/pos.css | 2 +- addons/pos_restaurant/static/src/css/restaurant.css | 2 +- addons/web/static/{src => }/img/openhand.cur | Bin addons/web/static/src/legacy/scss/utils.scss | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename addons/web/static/{src => }/img/openhand.cur (100%) diff --git a/addons/point_of_sale/static/src/css/pos.css b/addons/point_of_sale/static/src/css/pos.css index 3a91bc84c79..6befd2b1997 100644 --- a/addons/point_of_sale/static/src/css/pos.css +++ b/addons/point_of_sale/static/src/css/pos.css @@ -2849,7 +2849,7 @@ td { .drag-handle { /* See o-grab-cursor mixin */ - cursor: url(/web/static/src/img/openhand.cur), grab; + cursor: url(/web/static/img/openhand.cur), grab; } .drag-handle:active { diff --git a/addons/pos_restaurant/static/src/css/restaurant.css b/addons/pos_restaurant/static/src/css/restaurant.css index a99beb01c0e..5f7cc549522 100644 --- a/addons/pos_restaurant/static/src/css/restaurant.css +++ b/addons/pos_restaurant/static/src/css/restaurant.css @@ -223,7 +223,7 @@ background: white; box-shadow: 0px 2px 3px rgba(0,0,0,0.2); /* See o-grab-cursor mixin */ - cursor: url(/web/static/src/img/openhand.cur), grab; + cursor: url(/web/static/img/openhand.cur), grab; transition: all 150ms linear; z-index: 100; transform: translate(-50%, -50%); diff --git a/addons/web/static/src/img/openhand.cur b/addons/web/static/img/openhand.cur similarity index 100% rename from addons/web/static/src/img/openhand.cur rename to addons/web/static/img/openhand.cur diff --git a/addons/web/static/src/legacy/scss/utils.scss b/addons/web/static/src/legacy/scss/utils.scss index 112f7086ac9..61a66ffb0e9 100644 --- a/addons/web/static/src/legacy/scss/utils.scss +++ b/addons/web/static/src/legacy/scss/utils.scss @@ -173,7 +173,7 @@ @mixin o-grab-cursor() { // Use a custom cursor for the open hand icon as "grab" is not properly // working on Chrome Linux (at least) - cursor: url(/web/static/src/img/openhand.cur), grab; + cursor: url(/web/static/img/openhand.cur), grab; } // ------------------------------------------------------------------