summaryrefslogtreecommitdiffstats
path: root/web/sass-files/sass/partials
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2015-08-17 09:37:16 -0400
committerJoram Wilander <jwawilander@gmail.com>2015-08-17 09:37:16 -0400
commit738e53af95fd712e682fae0cad7af0b47b733acf (patch)
treef0a5c49824012823c855a301a8fdca27c32ca0d8 /web/sass-files/sass/partials
parent2fbc92af108316c0952e4509f5e7a2a9d3305045 (diff)
parent156682e3dec71f672118a04377aa5a367f00c4ee (diff)
downloadchat-738e53af95fd712e682fae0cad7af0b47b733acf.tar.gz
chat-738e53af95fd712e682fae0cad7af0b47b733acf.tar.bz2
chat-738e53af95fd712e682fae0cad7af0b47b733acf.zip
Merge pull request #369 from nickago/MM-1703
MM 1703 Closing access history or activity log returns user to security menu
Diffstat (limited to 'web/sass-files/sass/partials')
-rw-r--r--web/sass-files/sass/partials/_responsive.scss3
-rw-r--r--web/sass-files/sass/partials/_settings.scss6
2 files changed, 0 insertions, 9 deletions
diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss
index 47b2b6bd7..f28df1f89 100644
--- a/web/sass-files/sass/partials/_responsive.scss
+++ b/web/sass-files/sass/partials/_responsive.scss
@@ -431,9 +431,6 @@
}
}
}
- #user_settings {
- border-right: none;
- }
body {
&.white {
.inner__wrap {
diff --git a/web/sass-files/sass/partials/_settings.scss b/web/sass-files/sass/partials/_settings.scss
index 1fb078bb9..0262ef60c 100644
--- a/web/sass-files/sass/partials/_settings.scss
+++ b/web/sass-files/sass/partials/_settings.scss
@@ -143,12 +143,6 @@
}
}
-#user_settings {
- padding: 0 0.5em;
- border-right: 1px solid #ddd;
- max-width: 800px;
-}
-
.channel-settings {
padding: 0 10px;
}