From d870da7e05ca1ed359a77feb298ebb093c666721 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Hru=C5=A1ka?= <ondra@ondrovo.com>
Date: Mon, 6 Aug 2018 22:09:42 +0200
Subject: [PATCH] Simplify dark scss, some fixes, more convenient dark_mode()

---
 app/helpers.php                               |  4 +--
 resources/assets/sass/_block-collapse.scss    |  9 ++++++
 resources/assets/sass/app-dark.scss           | 28 +------------------
 .../sass/bootstrap-customizations/_card.scss  |  2 +-
 resources/views/layouts/app.blade.php         |  2 +-
 resources/views/layouts/main-nav.blade.php    |  4 +--
 6 files changed, 16 insertions(+), 33 deletions(-)

diff --git a/app/helpers.php b/app/helpers.php
index 7eaafe0..002aed8 100644
--- a/app/helpers.php
+++ b/app/helpers.php
@@ -32,8 +32,8 @@ function faker() {
     return $fac = Faker\Factory::create();
 }
 
-function dark_mode() {
-    return isset($_COOKIE["dark_mode"]);
+function dark_mode($ifDark=true, $ifLight=false) {
+    return isset($_COOKIE["dark_mode"]) ? $ifDark : $ifLight;
 }
 
 /**
diff --git a/resources/assets/sass/_block-collapse.scss b/resources/assets/sass/_block-collapse.scss
index f9bae95..dde16f0 100644
--- a/resources/assets/sass/_block-collapse.scss
+++ b/resources/assets/sass/_block-collapse.scss
@@ -37,3 +37,12 @@
 	}
 }
 
+.card .block-collapse::after{
+	background: linear-gradient(170deg, rgba($card-bg, 0) 30%, $card-bg 90%),
+				linear-gradient(to bottom, rgba($card-bg, 0) 80%, $card-bg 100%);
+}
+
+.infobox .block-collapse::after{
+	background: linear-gradient(170deg, rgba($body-bg, 0) 30%, $body-bg 90%),
+	linear-gradient(to bottom, rgba($body-bg, 0) 80%, $body-bg 100%);
+}
diff --git a/resources/assets/sass/app-dark.scss b/resources/assets/sass/app-dark.scss
index 89453ca..24e858a 100644
--- a/resources/assets/sass/app-dark.scss
+++ b/resources/assets/sass/app-dark.scss
@@ -1,30 +1,4 @@
 // Variables
 $theme: dark;
 
-@import "bootstrap";
-
-html {
-    overflow-y: scroll;
-}
-
-@import "helpers";
-@import "fa-utils";
-@import "block-collapse";
-@import "form-help";
-
-@import "bootstrap-customizations/paginate";
-@import "bootstrap-customizations/card";
-@import "bootstrap-customizations/tooltip";
-@import "bootstrap-customizations/navbar";
-@import "bootstrap-customizations/footer";
-@import "bootstrap-customizations/link";
-@import "bootstrap-customizations/border";
-@import "bootstrap-customizations/button";
-@import "bootstrap-customizations/responsive";
-@import "bootstrap-customizations/typography";
-
-.bio-table {
-    td {
-        padding-top: dist(2);
-    }
-}
+@import "app";
diff --git a/resources/assets/sass/bootstrap-customizations/_card.scss b/resources/assets/sass/bootstrap-customizations/_card.scss
index 368ba99..64a1403 100644
--- a/resources/assets/sass/bootstrap-customizations/_card.scss
+++ b/resources/assets/sass/bootstrap-customizations/_card.scss
@@ -41,5 +41,5 @@
 }
 
 .card .auth-footer {
-	background-color: $body-bg;
+	background-color: transparent; // see through at the card bg
 }
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index ab5a257..9a53fe7 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -17,7 +17,7 @@
   <link
     rel="stylesheet"
     id="theme-style"
-    href="{{ dark_mode() ? asset('css/app-dark.css') : asset('css/app.css') }}"
+    href="{{ asset(dark_mode('css/app-dark.css', 'css/app.css')) }}"
     data-light-url="{{ asset('css/app.css') }}"
     data-dark-url="{{ asset('css/app-dark.css') }}">
   <link href="{{ asset('fonts/fa-dtbl-1.css') }}" rel="stylesheet">
diff --git a/resources/views/layouts/main-nav.blade.php b/resources/views/layouts/main-nav.blade.php
index 74df2e6..2afe37f 100644
--- a/resources/views/layouts/main-nav.blade.php
+++ b/resources/views/layouts/main-nav.blade.php
@@ -1,11 +1,11 @@
 {{-- Global navbar --}}
 
-<nav class="navbar navbar-expand-md navbar-{{ dark_mode() ? 'dark' : 'light' }} page-navbar">
+<nav class="navbar navbar-expand-md navbar-{{ dark_mode('dark', 'light') }} page-navbar">
   <div class="container">
     <a class="navbar-brand" href="{{ route('dash') }}" aria-label="Go to Dashboard">
       <img
         id="navbar-logo"
-        src="/images/logo{{ dark_mode() ? '-dark' : '' }}.svg"
+        src="/images/logo{{ dark_mode('-dark', '') }}.svg"
         data-src-light="/images/logo.svg"
         data-src-dark="/images/logo-dark.svg"
         aria-hidden=true