From 7f8571e60d27b2bd55bdef212080fd01b8b8da8c Mon Sep 17 00:00:00 2001 From: James Brooks Date: Wed, 10 Aug 2016 20:52:11 +0100 Subject: [PATCH] Sidebar and no-select changes --- resources/assets/sass/_helpers.scss | 9 +++++++++ resources/assets/sass/pages/_dashboard.scss | 6 +++--- resources/assets/sass/partials/_sidebar.scss | 7 ++++++- resources/views/dashboard/index.blade.php | 2 +- resources/views/dashboard/partials/sub-sidebar.blade.php | 1 + 5 files changed, 20 insertions(+), 5 deletions(-) diff --git a/resources/assets/sass/_helpers.scss b/resources/assets/sass/_helpers.scss index ace84e4f..716ae134 100644 --- a/resources/assets/sass/_helpers.scss +++ b/resources/assets/sass/_helpers.scss @@ -9,3 +9,12 @@ .margin-bottom { margin-bottom: 20px; } + +.no-select { + -webkit-touch-callout: none; + -webkit-user-select: none; + -khtml-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; +} diff --git a/resources/assets/sass/pages/_dashboard.scss b/resources/assets/sass/pages/_dashboard.scss index f8be49b6..c102e17d 100644 --- a/resources/assets/sass/pages/_dashboard.scss +++ b/resources/assets/sass/pages/_dashboard.scss @@ -8,12 +8,12 @@ } .component-group-name{ - font-size: 18px; - padding-left: 10px; + font-size: 18px; + padding-left: 10px; } .component-group-other{ - font-size: 18px; + font-size: 18px; } @import "modules/stats"; diff --git a/resources/assets/sass/partials/_sidebar.scss b/resources/assets/sass/partials/_sidebar.scss index bb42a979..e9cb0db1 100644 --- a/resources/assets/sass/partials/_sidebar.scss +++ b/resources/assets/sass/partials/_sidebar.scss @@ -218,7 +218,12 @@ body.dashboard { margin: 0; text-align: center; font-size: 19px; - padding: 30px 0; + padding: 30px 15px 15px 15px; + } + + hr { + margin-top: 5px; + margin-bottom: 5px; } ul.menu { diff --git a/resources/views/dashboard/index.blade.php b/resources/views/dashboard/index.blade.php index 93f73c3c..0067debe 100644 --- a/resources/views/dashboard/index.blade.php +++ b/resources/views/dashboard/index.blade.php @@ -18,7 +18,7 @@
-
+
@if(!$component_groups->isEmpty() || !$ungrouped_components->isEmpty()) @include('dashboard.partials.components') @else diff --git a/resources/views/dashboard/partials/sub-sidebar.blade.php b/resources/views/dashboard/partials/sub-sidebar.blade.php index 411940b4..4c14701c 100644 --- a/resources/views/dashboard/partials/sub-sidebar.blade.php +++ b/resources/views/dashboard/partials/sub-sidebar.blade.php @@ -3,6 +3,7 @@

{{ $sub_title }}

+