diff options
author | Asaad Mahmood <asaad@spinpunch.com> | 2016-02-15 20:25:28 +0500 |
---|---|---|
committer | Asaad Mahmood <asaad@spinpunch.com> | 2016-02-15 20:25:28 +0500 |
commit | 22aa2c8c07075f603a1408b7185c01b49d92fc7f (patch) | |
tree | 208c89341f8c9680bd4c5a1b5d616c594547a088 /web | |
parent | 522ff67c638512ad92df74fd7faddf1da7c37d6a (diff) | |
download | chat-22aa2c8c07075f603a1408b7185c01b49d92fc7f.tar.gz chat-22aa2c8c07075f603a1408b7185c01b49d92fc7f.tar.bz2 chat-22aa2c8c07075f603a1408b7185c01b49d92fc7f.zip |
Fixing custom theme header click event
Diffstat (limited to 'web')
-rw-r--r-- | web/react/components/user_settings/custom_theme_chooser.jsx | 9 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_settings.scss | 7 |
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; } |