From 67ed4710b6b2ed35c62d235c6f5fcd7e756658f8 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 6 Apr 2019 17:43:44 +0100
Subject: [PATCH] Cleaned up old toolbar usage

---
 resources/assets/sass/_header.scss            | 10 -------
 resources/assets/sass/_pages.scss             |  4 +--
 resources/assets/sass/print-styles.scss       |  4 ---
 .../views/components/image-manager.blade.php  |  2 +-
 resources/views/pages/form.blade.php          |  2 +-
 .../views/partials/custom-styles.blade.php    |  2 +-
 .../views/search/entity-search-list.blade.php | 28 -------------------
 resources/views/sidebar-layout.blade.php      | 28 -------------------
 resources/views/simple-layout.blade.php       |  7 -----
 resources/views/tri-layout.blade.php          |  5 ----
 10 files changed, 4 insertions(+), 88 deletions(-)
 delete mode 100644 resources/views/search/entity-search-list.blade.php
 delete mode 100644 resources/views/sidebar-layout.blade.php

diff --git a/resources/assets/sass/_header.scss b/resources/assets/sass/_header.scss
index 8452b0667..ce5ab8c6c 100644
--- a/resources/assets/sass/_header.scss
+++ b/resources/assets/sass/_header.scss
@@ -284,13 +284,6 @@ header .search-box {
   padding: $-s;
 }
 
-.faded-small {
-  color: #000;
-  fill: #000;
-  font-size: 0.9em;
-  background-color: $primary-faded;
-}
-
 .toolbar {
   position: relative;
   > .grid > div {
@@ -360,7 +353,4 @@ header .search-box {
       border-bottom: 2px solid $primary;
     }
   }
-}
-.faded-small .nav-tabs a {
-  padding: $-s $-m;
 }
\ No newline at end of file
diff --git a/resources/assets/sass/_pages.scss b/resources/assets/sass/_pages.scss
index 427b98c26..6e8370a97 100755
--- a/resources/assets/sass/_pages.scss
+++ b/resources/assets/sass/_pages.scss
@@ -4,9 +4,7 @@
   align-items: stretch;
   overflow: hidden;
   background-color: #FFF;
-  .faded-small {
-    height: auto;
-  }
+
   .edit-area {
     flex: 1;
     flex-direction: column;
diff --git a/resources/assets/sass/print-styles.scss b/resources/assets/sass/print-styles.scss
index c67f98642..44107f2d4 100644
--- a/resources/assets/sass/print-styles.scss
+++ b/resources/assets/sass/print-styles.scss
@@ -8,10 +8,6 @@ body {
   font-size: 12px;
 }
 
-.faded-small {
-  display: none;
-}
-
 .page-content {
   margin: 0 auto;
 }
diff --git a/resources/views/components/image-manager.blade.php b/resources/views/components/image-manager.blade.php
index eca35b8aa..2d1755e46 100644
--- a/resources/views/components/image-manager.blade.php
+++ b/resources/views/components/image-manager.blade.php
@@ -11,7 +11,7 @@
 
                 <div class="image-manager-content">
                     <div v-if="imageType === 'gallery'" class="container">
-                        <div class="image-manager-header row faded-small nav-tabs">
+                        <div class="image-manager-header primary-background-light row nav-tabs">
                             <div class="col-xs-4 tab-item" title="{{ trans('components.image_all_title') }}" :class="{selected: (view=='all')}" @click="setView('all')">@icon('images') {{ trans('components.image_all') }}</div>
                             <div class="col-xs-4 tab-item" title="{{ trans('components.image_book_title') }}" :class="{selected: (view=='book')}" @click="setView('book')">@icon('book', ['class' => 'text-book svg-icon']) {{ trans('entities.book') }}</div>
                             <div class="col-xs-4 tab-item" title="{{ trans('components.image_page_title') }}" :class="{selected: (view=='page')}" @click="setView('page')">@icon('page', ['class' => 'text-page svg-icon']) {{ trans('entities.page') }}</div>
diff --git a/resources/views/pages/form.blade.php b/resources/views/pages/form.blade.php
index 516f9fac8..20152895a 100644
--- a/resources/views/pages/form.blade.php
+++ b/resources/views/pages/form.blade.php
@@ -11,7 +11,7 @@
     {{ csrf_field() }}
 
     {{--Header Bar--}}
-    <div class="faded-small toolbar">
+    <div class="primary-background-light toolbar">
         <div class="grid third v-center">
 
             <div class="action-buttons text-left px-m py-xs">
diff --git a/resources/views/partials/custom-styles.blade.php b/resources/views/partials/custom-styles.blade.php
index 0b9382f59..bbe79cf84 100644
--- a/resources/views/partials/custom-styles.blade.php
+++ b/resources/views/partials/custom-styles.blade.php
@@ -2,7 +2,7 @@
     header, [back-to-top], .primary-background {
         background-color: {{ setting('app-color') }} !important;
     }
-    .faded-small, .primary-background-light {
+    .primary-background-light {
         background-color: {{ setting('app-color-light') }};
     }
     .button-base, .button, input[type="button"], input[type="submit"] {
diff --git a/resources/views/search/entity-search-list.blade.php b/resources/views/search/entity-search-list.blade.php
deleted file mode 100644
index b60ca6f7e..000000000
--- a/resources/views/search/entity-search-list.blade.php
+++ /dev/null
@@ -1,28 +0,0 @@
-@extends('base')
-
-@section('content')
-
-    <div class="faded-small toolbar">
-        <div class="container">
-            <div class="row">
-                <div class="col-sm-12 faded">
-                    <div class="breadcrumbs">
-                        <a href="{{ baseUrl("/search/all?term={$searchTerm}") }}" class="text-button">@icon('search'){{ $searchTerm }}</a>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <div class="container">
-        <div class="row">
-
-            <div class="col-sm-7">
-                <h1>{{ $title }}</h1>
-                @include('partials.entity-list', ['entities' => $entities, 'style' => 'detailed'])
-                {!! $entities->links() !!}
-            </div>
-
-        </div>
-    </div>
-@stop
\ No newline at end of file
diff --git a/resources/views/sidebar-layout.blade.php b/resources/views/sidebar-layout.blade.php
deleted file mode 100644
index 512b64e91..000000000
--- a/resources/views/sidebar-layout.blade.php
+++ /dev/null
@@ -1,28 +0,0 @@
-@extends('base')
-
-@section('body-class', 'sidebar-layout')
-
-@section('content')
-
-    <div class="toolbar px-xl py-m">
-        @yield('toolbar')
-    </div>
-
-
-    <div class="flex-fill flex" @yield('container-attrs') >
-
-        <div sidebar class="sidebar flex print-hidden" id="sidebar">
-            <div class="sidebar-toggle primary-background-light">@icon('caret-right-circle')
-            </div>
-            <div class="scroll-body px-xl">
-                @yield('sidebar')
-            </div>
-        </div>
-
-        <div class="mr-xl flex @yield('body-wrap-classes')">
-            @yield('body')
-        </div>
-    </div>
-
-
-@stop
diff --git a/resources/views/simple-layout.blade.php b/resources/views/simple-layout.blade.php
index 27ba07965..a57aaebef 100644
--- a/resources/views/simple-layout.blade.php
+++ b/resources/views/simple-layout.blade.php
@@ -1,13 +1,7 @@
 @extends('base')
 
-@section('body-class', 'shaded')
-
 @section('content')
 
-    <div class="toolbar-container">
-        @yield('toolbar')
-    </div>
-
     <div class="flex-fill flex">
         <div class="content flex">
             <div class="scroll-body">
@@ -16,5 +10,4 @@
         </div>
     </div>
 
-
 @stop
diff --git a/resources/views/tri-layout.blade.php b/resources/views/tri-layout.blade.php
index bb734da8e..879fce140 100644
--- a/resources/views/tri-layout.blade.php
+++ b/resources/views/tri-layout.blade.php
@@ -4,11 +4,6 @@
 
 @section('content')
 
-    {{--<div class="toolbar px-xl">--}}
-        {{--@yield('toolbar')--}}
-    {{--</div>--}}
-    {{--TODO - Cleanup toolbar usage--}}
-
     <div class="tri-layout-container" tri-layout @yield('container-attrs') >
 
         <div class="tri-layout-left print-hidden pt-m" id="sidebar">