Merge branch 'develop' into feature/djangoconf-sprint

2018-05-26 10:48:33 +02:00
parent 5b8d578493 3a86c189dc
commit 5536adc3ec
35 changed files with 1400 additions and 106 deletions
--- a/frontend/scss/dashboard.scss
+++ b/frontend/scss/dashboard.scss
@@ -86,6 +86,11 @@
    padding: 0;
    margin: 0;
    list-style: none;
+    .stat_card {
+        display: inline-block;
+        margin-bottom: 5px;
+        margin-right: 10px;
+    }
 }

    .block_container .block span.icon::before {
@@ -93,11 +98,6 @@
        vertical-align: bottom;
    }

-    .block_container .block .inspect_container .inspect li {
-        display: inline-block;
-        margin-bottom: 5px;
-    }
-
    .block_container .block .inspect_container .inspect li span {
        display: block;
        font-size: 20px;