From b3b01339306a93d227c4f29337750c4730dd25f1 Mon Sep 17 00:00:00 2001
From: Reed Garmsen <rgarmsen2295@gmail.com>
Date: Wed, 1 Jul 2015 18:40:20 -0700
Subject: Adding back Access History and Active Devices

---
 web/sass-files/sass/partials/_settings.scss | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'web/sass-files/sass/partials/_settings.scss')

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
-- 
cgit v1.2.3-1-g7c22