summaryrefslogtreecommitdiffstats
path: root/web/sass-files/sass/partials/_settings.scss
diff options
context:
space:
mode:
authorReed Garmsen <rgarmsen2295@gmail.com>2015-07-01 18:40:20 -0700
committerAsaad Mahmood <Unknowngi@live.com>2015-07-22 20:11:40 +0500
commitb3b01339306a93d227c4f29337750c4730dd25f1 (patch)
tree250c25d059bdabaef8c803b03735d14924c1c16e /web/sass-files/sass/partials/_settings.scss
parenteb7c08ab00a6c1a72e367586fb853c08478f3afa (diff)
downloadchat-b3b01339306a93d227c4f29337750c4730dd25f1.tar.gz
chat-b3b01339306a93d227c4f29337750c4730dd25f1.tar.bz2
chat-b3b01339306a93d227c4f29337750c4730dd25f1.zip
Adding back Access History and Active Devices
Diffstat (limited to 'web/sass-files/sass/partials/_settings.scss')
-rw-r--r--web/sass-files/sass/partials/_settings.scss11
1 files changed, 10 insertions, 1 deletions
diff --git a/web/sass-files/sass/partials/_settings.scss b/web/sass-files/sass/partials/_settings.scss
index e60bc290e..b8dc9e997 100644
--- a/web/sass-files/sass/partials/_settings.scss
+++ b/web/sass-files/sass/partials/_settings.scss
@@ -1,3 +1,6 @@
+@import "access-history";
+@import "activity-log";
+
.user-settings {
background: #fff;
min-height:300px;
@@ -32,6 +35,12 @@
display: table-cell;
vertical-align: top;
}
+ .security-links {
+ margin-right: 20px;
+ .fa {
+ margin-right: 6px;
+ }
+ }
.settings-links {
width: 180px;
background: #FAFAFA;
@@ -223,4 +232,4 @@
.color-btn {
margin:4px;
-}
+} \ No newline at end of file