Fixing custom theme header click event

2 files changed, 10 insertions, 6 deletions

diff --git a/web/react/components/user_settings/custom_theme_chooser.jsx b/web/react/components/user_settings/custom_theme_chooser.jsx
index 242615bc0..1e724bb6e 100644
--- a/web/react/components/user_settings/custom_theme_chooser.jsx
+++ b/web/react/components/user_settings/custom_theme_chooser.jsx
@@ -156,8 +156,13 @@ class CustomThemeChooser extends React.Component {
     }
     toggleContent(e) {
         e.stopPropagation();
-        $(e.target).next().slideToggle();
-        $(e.target).toggleClass('open');
+        if ($(e.target).hasClass('theme-elements__header')) {
+            $(e.target).next().slideToggle();
+            $(e.target).toggleClass('open');
+        } else {
+            $(e.target).closest('.theme-elements__header').next().slideToggle();
+            $(e.target).closest('.theme-elements__header').toggleClass('open');
+        }
     }
     render() {
         const {formatMessage} = this.props.intl;
diff --git a/web/sass-files/sass/partials/_settings.scss b/web/sass-files/sass/partials/_settings.scss
index acec24231..c79b54922 100644
--- a/web/sass-files/sass/partials/_settings.scss
+++ b/web/sass-files/sass/partials/_settings.scss
@@ -144,6 +144,9 @@
                     select {
                         padding-right: 25px;
                     }
+                    select::-ms-expand {
+                        display: none;
+                    }
                     &:before {
                         pointer-events: none;
                         position: absolute;
@@ -201,10 +204,6 @@
                 font-weight: 600;
                 cursor: pointer;
 
-                div, span {
-                    pointer-events: none;
-                }
-
                 .fa-minus {
                     display: none;
                 }