Browse Source

样式优化

jqh 5 năm trước cách đây
mục cha
commit
2b51b690d2

+ 1 - 1
LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 Jiang qinghua
+Copyright (c) 2019 Jiang qinghua, Jens Segers
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

+ 16 - 6
resources/assets/dcat-admin/main.css

@@ -1079,6 +1079,16 @@ code {
     border-radius: 0;
 }
 
+.btn-group .btn:first-child {
+    border-top-left-radius: 2px;
+    border-bottom-left-radius: 2px;
+}
+
+.btn-group .btn:last-child {
+    border-top-right-radius: 2px;
+    border-bottom-right-radius: 2px;
+}
+
 .box, .panel {
     transition: .3s cubic-bezier(.25, .8, .5, 1);
 }
@@ -2232,11 +2242,11 @@ div.layui-layer-btn{
     content:"\f107"!important;
 }
 
-.material .box-header,.material .card-header {
+.da-box .box-header,.da-box .card-header {
     padding: 13px;
     /*border-top: 2px solid #fff*/
 }
-.material .box-header .btn, .material .card-header .btn {
+.da-box .box-header .btn, .da-box .card-header .btn {
     /*text-transform: uppercase;*/
     background-color: transparent !important;
     border-color: transparent !important;
@@ -2246,21 +2256,21 @@ div.layui-layer-btn{
     font-weight: bold;
     font-size: 13px;
 }
-.material .box-header .btn:hover,.material .card-header .btn:hover {
+.da-box .box-header .btn:hover,.da-box .card-header .btn:hover {
     background-color: #ebf0f3!important;
     background-color:var(--40)!important;
     border-radius:2px!important;
 }
-.material .box-header .btn-group, .material .card-header .btn-group {
+.da-box .box-header .btn-group, .da-box .card-header .btn-group {
     box-shadow:none!important;
 }
 
-.material .box-header .btn.btn-danger, .material .card-header .btn.btn-danger {
+.da-box .box-header .btn.btn-danger, .da-box .card-header .btn.btn-danger {
     color:#bd4147!important;
     color:var(--danger-dark)!important;
 }
 
-.material .dropdown-btn-group .btn.btn-primary,.material .open .dropdown-toggle.btn {
+.da-box .dropdown-btn-group .btn.btn-primary,.da-box .open .dropdown-toggle.btn {
     background-color: #ebf0f3!important;
     background-color: var(--40) !important;
     border-color: #ebf0f3!important;

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
resources/assets/dcat-admin/main.min.css


+ 1 - 1
resources/views/grid/table.blade.php

@@ -1,6 +1,6 @@
 {!! $grid->renderQuickSearch() !!}
 
-<div class="card material">
+<div class="card da-box">
 
     @if ($grid->allowToolbar())
         <div class="box-header">

+ 1 - 1
src/Controllers/IconController.php

@@ -29,7 +29,7 @@ class IconController extends Controller
             $tab = Tab::make()->padding('20px')->custom();
 
             $tab->add('Themify', view('admin::helpers.themify'));
-//            $tab->add('Material Design', view('admin::helpers.material'));
+//            $tab->add('da-box Design', view('admin::helpers.da-box'));
             $tab->add('Font Awesome', view('admin::helpers.font-awesome'));
             $tab->add('Glyphicons', view('admin::helpers.glyphicons'));
 

+ 1 - 1
src/Controllers/MenuController.php

@@ -51,7 +51,7 @@ class MenuController extends Controller
 
                     $form->width(9, 2);
 
-                    $column->append(Card::make(trans('admin.new'), $form)->class('card material'));
+                    $column->append(Card::make(trans('admin.new'), $form)->class('card da-box'));
                 });
             });
     }

+ 1 - 1
src/Form/Builder.php

@@ -826,7 +826,7 @@ EOF;
             return $wrapper($view);
         }
 
-        return "<div class='card material'>{$view->render()}</div>";
+        return "<div class='card da-box'>{$view->render()}</div>";
     }
 
     /**

+ 1 - 1
src/Show/Panel.php

@@ -210,7 +210,7 @@ class Panel implements Renderable
         $view = view($this->view, $this->data);
 
         if (! $wrapper = $this->wrapper) {
-            return "<div class='card material'>{$view->render()}</div>";
+            return "<div class='card da-box'>{$view->render()}</div>";
         }
 
         return $wrapper($view);

+ 1 - 1
src/Tree.php

@@ -558,7 +558,7 @@ JS;
         $view = view($this->view['tree'], $this->variables());
 
         if (! $wrapper = $this->wrapper) {
-            return "<div class='card material'>{$view->render()}</div>";
+            return "<div class='card da-box'>{$view->render()}</div>";
         }
 
         return $wrapper($view);

Một số tệp đã không được hiển thị bởi vì quá nhiều tập tin thay đổi trong này khác