summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoramWilander <jwawilander@gmail.com>2015-06-22 14:51:20 -0400
committerJoramWilander <jwawilander@gmail.com>2015-06-29 07:52:12 -0400
commitffe1e36a55035298ee5b5b7401347d2abdf2bcec (patch)
treee36492def071e8e7d4873538c53ee980fd439c39
parentd090f5698addecf5e6a0380601ee5550563071c5 (diff)
downloadchat-ffe1e36a55035298ee5b5b7401347d2abdf2bcec.tar.gz
chat-ffe1e36a55035298ee5b5b7401347d2abdf2bcec.tar.bz2
chat-ffe1e36a55035298ee5b5b7401347d2abdf2bcec.zip
make channel notifications modal visible in mobile mode
-rw-r--r--web/react/components/team_settings_modal.jsx2
-rw-r--r--web/sass-files/sass/partials/_responsive.scss4
2 files changed, 5 insertions, 1 deletions
diff --git a/web/react/components/team_settings_modal.jsx b/web/react/components/team_settings_modal.jsx
index 08a952d2e..e50378b7f 100644
--- a/web/react/components/team_settings_modal.jsx
+++ b/web/react/components/team_settings_modal.jsx
@@ -45,7 +45,7 @@ module.exports = React.createClass({
updateTab={this.updateTab}
/>
</div>
- <div className="settings-content">
+ <div className="settings-content minimize-settings">
<TeamSettings
activeTab={this.state.active_tab}
activeSection={this.state.active_section}
diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss
index 509c764b3..d28d23f67 100644
--- a/web/sass-files/sass/partials/_responsive.scss
+++ b/web/sass-files/sass/partials/_responsive.scss
@@ -258,11 +258,13 @@
.settings-table {
display: block;
.settings-content {
+ &.minimize-settings {
display: block;
.section-edit {
text-align: left;
}
}
+ }
.settings-links {
display: none;
}
@@ -284,12 +286,14 @@
}
.settings-table {
.settings-content {
+ &.minimize-settings {
padding: 0;
display: none;
.user-settings {
padding: 70px 20px 30px;
}
}
+ }
.settings-links {
background: #fff;
}