update

resources/assets/adminlte/scss/_layout.scss

@@ -610,6 +610,7 @@ body:not(.sidebar-mini-md) {
     line-height: 1.8rem;
     margin-bottom: 0;
     padding: 0;
+    font-size: 97%;
 
     .text-sm & {
       line-height: 1.5rem;

resources/assets/dcat/sass/components/_header-navbar.scss

@@ -2,5 +2,5 @@
   box-shadow: $shadow;
 }
 .header-navbar.floating-nav {
-  margin: 1.3rem 2.35rem 0;
+  margin: 1.3rem 2.2rem 0;
 }

resources/assets/sass/bootstrap-extended.scss

@@ -17,7 +17,6 @@
 //@import "bootstrap-extended/reboot";
 //@import "bootstrap-extended/type";
 @import "bootstrap-extended/code";
-@import "bootstrap-extended/grid";
 @import "bootstrap-extended/tables";
 @import "bootstrap-extended/forms";
 @import "bootstrap-extended/buttons";
@@ -39,7 +38,6 @@
 @import 'bootstrap-extended/pagination';
 
 // // Components w/ JavaScript
-//@import "bootstrap-extended/modal";
 //@import "bootstrap-extended/popover";
 
 // // Utility classes

resources/assets/sass/bootstrap-extended/_grid.scss

@@ -1,86 +0,0 @@
-// .bs-example{
-// 	[class^="col-"]{
-// 		span{
-// 			padding: .75rem;
-// 			background-color: rgba(86, 61, 124, 0.15);
-// 			border: 1px solid rgba(86, 61, 124, 0.2);
-// 			display: block;
-// 		}
-// 		margin-bottom: 1rem;
-// 	}
-// 	.row + .row {
-// 		margin-top: 1rem;
-// 	}
-// }
-
-
-//
-// Grid examples
-//
-
-.bd-example-row {
-  .row + .row {
-    margin-top: 1rem;
-  }
-
-  .row {
-    > .col,
-    > [class^="col-"] {
-      padding-top: .75rem;
-      padding-bottom: .75rem;
-      background-color: rgba(86,61,124,.15);
-      border: 1px solid rgba(86,61,124,.2);
-    }
-  }
-
-  .flex-items-top,
-  .flex-items-middle,
-  .flex-items-bottom {
-    min-height: 6rem;
-    background-color: rgba(255,0,0,.1);
-  }
-}
-
-.bd-example-row-flex-cols .row {
-  min-height: 10rem;
-  background-color: rgba(255,0,0,.1);
-}
-
-.bd-highlight {
-  background-color: rgba(86, 61, 124, .15);
-  border: 1px solid rgba(86, 61, 124, .15);
-}
-
-// Grid mixins
-.example-container {
-  width: 800px;
-  @include make-container();
-}
-
-.example-row {
-  @include make-row();
-}
-
-.example-content-main {
-  @include make-col-ready();
-
-  @include media-breakpoint-up(sm) {
-    @include make-col(6);
-  }
-
-  @include media-breakpoint-up(lg) {
-    @include make-col(8);
-  }
-}
-
-.example-content-secondary {
-  @include make-col-ready();
-
-  @include media-breakpoint-up(sm) {
-    @include make-col(6);
-  }
-
-  @include media-breakpoint-up(lg) {
-    @include make-col(4);
-  }
-}

src/Grid/Column.php

@@ -20,7 +20,6 @@ use Illuminate\Support\Traits\Macroable;
  * @method $this switchGroup($columns = [], string $color = '')
  * @method $this image($server = '', int $width = 200, int $height = 200)
  * @method $this label($style = 'primary', int $max = null)
- * @method $this chip($style = 'primary', int $max = null)
  * @method $this button($style = 'success');
  * @method $this link($href = '', $target = '_blank');
  * @method $this badge($style = 'primary', int $max = null);
@@ -88,7 +87,6 @@ class Column
         'downloadable'     => Displayers\Downloadable::class,
         'copyable'         => Displayers\Copyable::class,
         'orderable'        => Displayers\Orderable::class,
-        'chip'             => Displayers\Chip::class,
     ];
 
     /**

src/Grid/Displayers/Chip.php

@@ -1,61 +0,0 @@
-<?php
-
-namespace Dcat\Admin\Grid\Displayers;
-
-use Dcat\Admin\Admin;
-use Dcat\Admin\Support\Helper;
-
-class Chip extends AbstractDisplayer
-{
-    public function display($style = 'primary', $max = null)
-    {
-        if (! $value = $this->value($max)) {
-            return;
-        }
-
-        $original = $this->column->getOriginal();
-        $defaultStyle = is_array($style) ? ($style['default'] ?? 'primary') : 'primary';
-
-        [$background, $textColor] = $this->formatStyle(
-            is_array($style) ?
-                (is_scalar($original) ? ($style[$original] ?? $defaultStyle) : current($style))
-                : $style
-        );
-
-        return collect($value)->map(function ($name) use ($background, $textColor) {
-            return <<<HTML
-<div class="chip" {$background}>
-  <div class="chip-body">
-    <div class="chip-text {$textColor}">{$name}</div>
-  </div>
-</div>
-HTML;
-        })->implode('&nbsp;');
-    }
-
-    protected function formatStyle($style)
-    {
-        $background = '';
-        $textColor = '';
-
-        if ($style !== 'default') {
-            $style = Admin::color()->get($style);
-            $background = "style='background:{$style}'";
-            $textColor = 'text-white';
-        }
-
-        return [$background, $textColor];
-    }
-
-    protected function value($max)
-    {
-        $values = Helper::array($this->value);
-
-        if ($max && count($values) > $max) {
-            $values = array_slice($values, 0, $max);
-            $values[] = '...';
-        }
-
-        return $values;
-    }
-}

src/Show/Field.php

@@ -353,35 +353,6 @@ HTML;
         });
     }
 
-    /**
-     * @param string $style
-     *
-     * @return $this
-     */
-    public function chip($style = 'primary')
-    {
-        return $this->unescape()->as(function ($value) use ($style) {
-            $background = '';
-            $textColor = '';
-
-            if ($style !== 'default') {
-                $style = Admin::color()->get($style);
-                $background = "style='background:{$style}'";
-                $textColor = 'text-white';
-            }
-
-            return collect($value)->map(function ($name) use ($background, $textColor) {
-                return <<<HTML
-<div class="chip" {$background}>
-  <div class="chip-body">
-    <div class="chip-text {$textColor}">{$name}</div>
-  </div>
-</div>
-HTML;
-            })->implode('&nbsp;');
-        });
-    }
-
     /**
      * @param $style
      *