Merge branch 'master' into PLT-340

1 files changed, 57 insertions, 0 deletions

diff --git a/web/sass-files/sass/partials/_admin-console.scss b/web/sass-files/sass/partials/_admin-console.scss
index 14f1d9c2f..d0241f795 100644
--- a/web/sass-files/sass/partials/_admin-console.scss
+++ b/web/sass-files/sass/partials/_admin-console.scss
@@ -5,6 +5,63 @@
     .table {
         background: #fff;
     }
+
+    .total-count {
+        width: 175px;
+        height: 100px;
+        border: 1px solid #ddd;
+        padding: 22px 10px 10px 10px;
+        margin: 10px 10px 10px 10px;
+        background: #fff;
+        float: left;
+
+        > div {
+            font-size: 18px;
+            font-weight: 300;
+        }
+    }
+
+    .total-count-by-day {
+        width: 760px;
+        height: 275px;
+        border: 1px solid #ddd;
+        padding: 5px 10px 10px 10px;
+        margin: 10px 10px 10px 10px;
+        background: #fff;
+        clear: both;
+
+        > div {
+            font-size: 18px;
+            font-weight: 300;
+        }
+    }
+
+    .recent-active-users {
+        width: 365px;
+        height: 375px;
+        border: 1px solid #ddd;
+        padding: 5px 10px 10px 10px;
+        margin: 10px 10px 10px 10px;
+        background: #fff;
+        float: left;
+
+        > div {
+            font-size: 18px;
+            font-weight: 300;
+        }
+
+        > table {
+            margin: 10px 10px 10px 10px;
+        }
+
+        .recent-active-users-td {
+            font-size: 14px;
+            font-weight: 300;
+            border: 1px solid #ddd;
+            padding: 3px 3px 3px 5px;
+        }
+    }
+
     .sidebar--left {
         &.sidebar--collapsable {
             background: #333;