From a809ff88625e0fbaab8d14e2d35e85abd8fe6111 Mon Sep 17 00:00:00 2001
From: Asaad Mahmood <Unknowngi@live.com>
Date: Thu, 5 Nov 2015 11:06:47 +0500
Subject: [PATCH] Updating UI for access history and access log modals

---
 web/react/components/activity_log_modal.jsx       | 2 +-
 web/sass-files/sass/partials/_access-history.scss | 4 ----
 web/sass-files/sass/partials/_activity-log.scss   | 4 ++--
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/web/react/components/activity_log_modal.jsx b/web/react/components/activity_log_modal.jsx
index 6a24870f67..ef30774700 100644
--- a/web/react/components/activity_log_modal.jsx
+++ b/web/react/components/activity_log_modal.jsx
@@ -167,8 +167,8 @@ export default class ActivityLogModal extends React.Component {
                 <Modal.Header closeButton={true}>
                     <Modal.Title>{'Active Sessions'}</Modal.Title>
                 </Modal.Header>
-                <p className='session-help-text'>{'Sessions are created when you log in with your email and password to a new browser on a device. Sessions let you use Mattermost for up to 30 days without having to log in again. If you want to log out sooner, use the \'Logout\' button below to end a session.'}</p>
                 <Modal.Body ref='modalBody'>
+                    <p className='session-help-text'>{'Sessions are created when you log in with your email and password to a new browser on a device. Sessions let you use Mattermost for up to 30 days without having to log in again. If you want to log out sooner, use the \'Logout\' button below to end a session.'}</p>
                     {content}
                 </Modal.Body>
             </Modal>
diff --git a/web/sass-files/sass/partials/_access-history.scss b/web/sass-files/sass/partials/_access-history.scss
index a3289ecc05..c8a0b28bdd 100644
--- a/web/sass-files/sass/partials/_access-history.scss
+++ b/web/sass-files/sass/partials/_access-history.scss
@@ -19,10 +19,6 @@
         border-bottom: 1px solid #ddd;
         padding-bottom: 15px;
     }
-    .report__time {
-        font-weight: 600;
-        font-size: 15px;
-    }
     .report__info {
         @include opacity(0.8);
     }
diff --git a/web/sass-files/sass/partials/_activity-log.scss b/web/sass-files/sass/partials/_activity-log.scss
index 2fb37a3bb9..f61c35a281 100644
--- a/web/sass-files/sass/partials/_activity-log.scss
+++ b/web/sass-files/sass/partials/_activity-log.scss
@@ -36,7 +36,7 @@
         text-align: right;
     }
     .report__platform {
-        font-size: 16px;
+        font-size: 15px;
         font-weight: 600;
         .fa {
             margin-right: 6px;
@@ -47,5 +47,5 @@
     }
 }
 .session-help-text {
-    padding: 20px 20px 5px 20px;
+    padding: 0 0 20px;
 }
\ No newline at end of file