From 1545708d4e629a8d70602b25b62ade27686702f5 Mon Sep 17 00:00:00 2001 From: Ahmed Ejaz Date: Sat, 14 Sep 2024 17:18:09 +0500 Subject: [PATCH 1/4] 12852: remove fix height for the select2-choices --- app/webpacker/css/admin_v3/components/select2.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/app/webpacker/css/admin_v3/components/select2.scss b/app/webpacker/css/admin_v3/components/select2.scss index d42fc66d6b..f09a653d78 100644 --- a/app/webpacker/css/admin_v3/components/select2.scss +++ b/app/webpacker/css/admin_v3/components/select2.scss @@ -182,7 +182,6 @@ label .select2-container { .select2-container { .select2-choice, .select2-choices { - height: $btn-relaxed-height !important; // !important is needed because of vendor/assets/stylesheets/select2.css.scss padding: 10px; } } From 052e3b6380e8eca8743331423cf18ca2b24e906a Mon Sep 17 00:00:00 2001 From: Ahmed Ejaz Date: Sat, 14 Sep 2024 17:42:10 +0500 Subject: [PATCH 2/4] 12852: add remove choice icon for select2 --- app/webpacker/css/admin_v3/components/select2.scss | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/app/webpacker/css/admin_v3/components/select2.scss b/app/webpacker/css/admin_v3/components/select2.scss index f09a653d78..4ee94f6d9d 100644 --- a/app/webpacker/css/admin_v3/components/select2.scss +++ b/app/webpacker/css/admin_v3/components/select2.scss @@ -228,16 +228,14 @@ label .select2-container { display: flex; align-items: center; justify-content: center; - padding-left: 7px; .select2-search-choice-close { - position: relative; - order: -1; - width: auto; - left: 0; - top: 0; - margin: 0; - padding: 0; + background-image: none !important; + font-size: 85% !important; + @extend .icon-remove; + @extend [class^="icon-"], :before; + margin-left: 2px; + color: $color-1; } } } From 35f9c420fde9330bb1b8c7a68e24b5b452118570 Mon Sep 17 00:00:00 2001 From: Ahmed Ejaz Date: Sat, 14 Sep 2024 18:04:52 +0500 Subject: [PATCH 3/4] 12852: remove unnecessary !important --- app/webpacker/css/admin_v3/components/select2.scss | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/webpacker/css/admin_v3/components/select2.scss b/app/webpacker/css/admin_v3/components/select2.scss index 4ee94f6d9d..bb4a23a5f2 100644 --- a/app/webpacker/css/admin_v3/components/select2.scss +++ b/app/webpacker/css/admin_v3/components/select2.scss @@ -230,8 +230,7 @@ label .select2-container { justify-content: center; .select2-search-choice-close { - background-image: none !important; - font-size: 85% !important; + font-size: 85%; @extend .icon-remove; @extend [class^="icon-"], :before; margin-left: 2px; From 1550ca5da0d9bc7a442dfc1a9da58139d68295a0 Mon Sep 17 00:00:00 2001 From: Ahmed Ejaz Date: Fri, 27 Sep 2024 16:57:35 +0500 Subject: [PATCH 4/4] fix the choice drag issue - disabled width on select2-search-choice-close so that it doesn't cover whole option --- app/webpacker/css/admin_v3/components/select2.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/app/webpacker/css/admin_v3/components/select2.scss b/app/webpacker/css/admin_v3/components/select2.scss index bb4a23a5f2..1c6fc91f54 100644 --- a/app/webpacker/css/admin_v3/components/select2.scss +++ b/app/webpacker/css/admin_v3/components/select2.scss @@ -233,6 +233,7 @@ label .select2-container { font-size: 85%; @extend .icon-remove; @extend [class^="icon-"], :before; + width: 0; margin-left: 2px; color: $color-1; }