jqh 5 years ago
parent
commit
ef15f8fd43

+ 6 - 6
resources/assets/adminlte/scss/_cards.scss

@@ -199,16 +199,16 @@ html.maximized-card {
 }
 
 // Add clearfix to header, body and footer
-.card-header,
-.card-body,
-.card-footer {
-  @include clearfix;
-}
+//.card-header,
+//.card-body,
+//.card-footer {
+//  @include clearfix;
+//}
 
 // Box header
 .card-header {
   background-color: transparent;
-  border-bottom: 1px solid $card-border-color;
+  border-bottom: 0;
   padding: (($card-spacer-y / 2) * 2) $card-spacer-x;
   position: relative;
 

+ 3 - 0
resources/assets/dcat/sass/components/_card.scss

@@ -1,5 +1,6 @@
 .card {
   box-shadow: $shadow;
+  margin-bottom: 2rem;
 }
 
 .card.dcat-box {
@@ -12,6 +13,8 @@
 .card .card-header {
   padding: 1.1rem 1.1rem 0;
   align-items: center;
+  display: flex;
+  justify-content: space-between;
 }
 
 .card-header.with-border {

+ 1 - 1
resources/assets/dcat/sass/components/_custom-data-table.scss

@@ -2,7 +2,7 @@
   display: flex;
   justify-content: space-between;
   padding: 0 1rem;
-  margin-bottom: 1rem
+  margin-bottom: .5rem
 }
 
 .custom-data-table-header .table-responsive .top .action-btns {

+ 1 - 1
resources/assets/dcat/sass/nprogress/NProgress.scss

@@ -9,7 +9,7 @@
   //background: $primary-linear-gradient;
   background: rgba($primary, .8);
   position: fixed;
-  z-index: 1031;
+  z-index: 999999;
   top: 0;
   left: 0;
   width: 100%;

+ 2 - 2
resources/views/filter/button.blade.php

@@ -1,6 +1,6 @@
 <div class="btn-group filter-button-group btn-no-shadow dropdown" style="margin-right:3px">
     <button
-            class="btn btn-outline-primary {{ $btn_class }}"
+            class="btn btn-primary {{ $btn_class }}"
             @if($only_scopes)data-toggle="dropdown"@endif
             @if($scopes->isNotEmpty()) style="border-right: 0" @endif
     >
@@ -14,7 +14,7 @@
             <li role="separator" class="dropdown-divider"></li>
             <li class="dropdown-item"><a href="{{ $url_no_scopes }}">{{ trans('admin.cancel') }}</a></li>
         </ul>
-        <button type="button" class="btn btn-outline-primary" data-toggle="dropdown" style="padding: 0.75rem 1rem !important;border-left: 0">
+        <button type="button" class="btn btn-primary" data-toggle="dropdown" style="padding: 0.75rem 1rem !important;border-left: 0">
             @if($current_label) <span>{{ $current_label }}&nbsp;</span>@endif <i class="feather icon-chevron-down"></i>
         </button>
     @endif

+ 1 - 1
src/Grid/Tools/RefreshButton.php

@@ -16,7 +16,7 @@ class RefreshButton implements Renderable
         $refresh = trans('admin.refresh');
 
         return <<<EOT
-<button data-action="refresh" class="btn btn-outline-primary grid-refresh btn-mini" style="margin-right:3px">
+<button data-action="refresh" class="btn btn-primary grid-refresh btn-mini" style="margin-right:3px">
     <i class="feather icon-refresh-cw"></i><span class="d-none d-sm-inline">&nbsp; $refresh</span>
 </button>
 EOT;