From 1d96d77e5a0046ce590c5f9c3ef67b5f7e106611 Mon Sep 17 00:00:00 2001
From: Arno Kaimbacher <arno.kaimbacher@geologie.ac.at>
Date: Tue, 23 Apr 2019 17:15:48 +0200
Subject: [PATCH] remove "hieu-le/active", better admin style

---
 composer.json                                 |  1 -
 composer.lock                                 | 65 +------------------
 public/backend/style.css                      | 18 +++--
 .../views/settings/layouts/app.blade.php      |  8 +--
 4 files changed, 17 insertions(+), 75 deletions(-)

diff --git a/composer.json b/composer.json
index 0aeaf44..747809c 100755
--- a/composer.json
+++ b/composer.json
@@ -13,7 +13,6 @@
 		"dimsav/laravel-translatable": "9.*",
 		"felixkiss/uniquewith-validator": "^3.1",
 		"fideloper/proxy": "^4.0",
-		"hieu-le/active": "^3.5",
 		"laravel/framework": "5.6.*",
 		"laravel/tinker": "^1.0",
 		"laravelcollective/html": "^5.6",
diff --git a/composer.lock b/composer.lock
index b5928bf..c43bd51 100755
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "35e771d8a4e73ec0c3768490092f9391",
+    "content-hash": "de1a156be429662930ce19e40e833c5f",
     "packages": [
         {
             "name": "davejamesmiller/laravel-breadcrumbs",
@@ -543,69 +543,6 @@
             ],
             "time": "2019-01-10T14:06:47+00:00"
         },
-        {
-            "name": "hieu-le/active",
-            "version": "3.5.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/letrunghieu/active.git",
-                "reference": "42d0f50be74b89d730bb4c0ee8c32447630506c6"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/letrunghieu/active/zipball/42d0f50be74b89d730bb4c0ee8c32447630506c6",
-                "reference": "42d0f50be74b89d730bb4c0ee8c32447630506c6",
-                "shasum": ""
-            },
-            "require": {
-                "laravel/framework": "^5.5",
-                "php": ">=7.0"
-            },
-            "require-dev": {
-                "codeclimate/php-test-reporter": "dev-master",
-                "orchestra/testbench": "^3.1",
-                "phpunit/phpunit": "~6.0"
-            },
-            "type": "library",
-            "extra": {
-                "laravel": {
-                    "providers": [
-                        "HieuLe\\Active\\ActiveServiceProvider"
-                    ],
-                    "aliases": {
-                        "Active": "HieuLe\\Active\\Facades\\Active"
-                    }
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "HieuLe\\Active\\": "src/",
-                    "HieuLe\\ActiveTest\\": "tests/"
-                },
-                "files": [
-                    "src/helpers.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Hieu Le",
-                    "email": "letrunghieu.cse09@gmail.com",
-                    "homepage": "https://www.hieule.info"
-                }
-            ],
-            "description": "The helper class for Laravel (4/5) applications to get active class base on current route",
-            "homepage": "https://www.hieule.info/tag/laravel-active/",
-            "keywords": [
-                "active",
-                "laravel",
-                "routing"
-            ],
-            "time": "2017-09-07T02:36:51+00:00"
-        },
         {
             "name": "jakub-onderka/php-console-color",
             "version": "v0.2",
diff --git a/public/backend/style.css b/public/backend/style.css
index 01e287e..10a005c 100644
--- a/public/backend/style.css
+++ b/public/backend/style.css
@@ -129,8 +129,12 @@ The content `<div>` is where all your content goes.
      margin: 0;
      color: #333;
      text-align: left;
-     padding: 0.4em 2em 0;
+     padding: 0.4em 2em;
      border-bottom: 1px solid #eee;
+ }
+ #main > .header {
+    background: #202b33;   
+    color: #fff;
  }
     .header h1 {
         margin: 0.2em 0;
@@ -216,9 +220,11 @@ The content `<div>` is where all your content goes.
 }
 
 .site-logo{
+   
     color: #fff;
-    font-size: 1.4em;
-    padding: 0.6em 0.4em;
+    font-size: 1.0em;
+    padding: 0.4em 0.4em;
+    margin: 0;
 }
 
 .site-logo strong{
@@ -229,9 +235,9 @@ The content `<div>` is where all your content goes.
     text-align: right;
 }
 
-.user-info{
-    padding: 1.6em 0.4em;
-}
+/* .user-info{    
+    padding: 0.6em 0.4em;
+} */
 
 .user-info a{
     text-decoration: none;
diff --git a/resources/views/settings/layouts/app.blade.php b/resources/views/settings/layouts/app.blade.php
index 9dee68a..d705eb5 100644
--- a/resources/views/settings/layouts/app.blade.php
+++ b/resources/views/settings/layouts/app.blade.php
@@ -31,7 +31,7 @@
     <div id="menu">
         <nav class="pure-menu sidebar-menu">
             <h1 class="site-logo">Admin<strong>Rdr</strong></h1>
-            <div class="menu-item-divided"></div>
+            {{-- <div class="menu-item-divided"></div> --}}
             
             {{-- <h2 class="pure-menu-heading">Home</h2> --}}
             <ul class=" pure-menu-list sidebar-menu">
@@ -42,7 +42,7 @@
                 </li>	 --}}
                
                 
-                <li class="pure-menu-item {{ active_class(Route::is('settings.dashboard')) }}">
+                <li class="pure-menu-item {{ Route::is('settings.dashboard') ? 'active' : '' }}">
                     <a href="{{ route('settings.dashboard') }}">
                         <i class="fa fa-tachometer-alt"></i>
                         <span>Reports</span>
@@ -52,7 +52,7 @@
                 @permission('settings')
                 <li class="treeview">
                     <h2 class="pure-menu-heading">Settings  <span class="fas fa-angle-down"></h2>
-                    <ul class="pure-menu-list treeview-menu {{ active_class(Route::is('settings.*'), 'menu-open') }}" style="display: none; {{ active_class(Route::is('settings.*'), 'display: block;') }}">				
+                    <ul class="pure-menu-list treeview-menu {{ Route::is('settings.*') ? 'menu-open' : '' }} style="display: none; {{ Route::is('settings.*') ? 'display: block;' : '' }}">				
                         <li class="pure-menu-item {{ Route::is('settings.document*') ? 'active' : '' }}">
                             <a class="pure-menu-link" href="{{ route('settings.document') }}"><i class="fa fa-database"></i> Datasets</a>
                         </li>
@@ -141,7 +141,7 @@
                         <span>{{ trans('menus.backend.access.title') }}</span>
                         <i class="fa fa-angle-left pull-right"></i>
                     </a>              --}}
-                    <ul class="pure-menu-list treeview-menu {{ active_class(Route::is('access.*'), 'menu-open') }}" style="display: none; {{ active_class(Route::is('access.*'), 'display: block;') }}">
+                    <ul class="pure-menu-list treeview-menu {{ Route::is('access.*') ? 'menu-open' : '' }}" style="display: none; {{ Route::is('access.*') ? 'display: block;' : '' }}">
                         @if (Auth::guest())
                         <li class="pure-menu-item {{ Route::currentRouteName() == 'login' ? 'active' : '' }}">
                             <a class="pure-menu-link" href="{{ route('login') }}">LOGIN</a>