Home Explore Help
Register Sign In
wangjunyun
/
Dcat-Admin
mirror of https://gitee.com/jqhph/dcat-admin.git
1
0
Fork 0
Files Issues 0 Wiki
Browse Source

btn css

jqh 5 years ago
parent
856d7e66b6
commit
f277f60925
9 changed files with 39 additions and 19 deletions
Unified View Show Diff Stats
  1. 3 0
      resources/assets/dcat/sass/_variables.scss
  2. 13 5
      resources/assets/dcat/sass/components/_button.scss
  3. 14 5
      resources/dist/dcat/css/app.css
  4. 2 2
      src/Controllers/PermissionController.php
  5. 1 1
      src/Form/Tools.php
  6. 1 1
      src/Show/Field.php
  7. 1 1
      src/Show/Tools.php
  8. 3 3
      src/Tree.php
  9. 1 1
      src/Widgets/Dropdown.php

+ 3 - 0
resources/assets/dcat/sass/_variables.scss
View File 

@@ -52,6 +52,9 @@ $font-color: #414750;
 
 // 常用阴影颜色

 // 常用阴影颜色

 $shadow: 0 2px 4px 0 rgba(0,0,0,.08);

 $shadow: 0 2px 4px 0 rgba(0,0,0,.08);

 

 

+$btn-shadow: 0 3px 1px -2px rgba(0,0,0,.1), 0 2px 2px 0 rgba(0,0,0,.1), 0 1px 5px 1px rgba(0,0,0,.1);

+$btn-shadow-hover: 0 3px 1px -2px rgba(0,0,0,.05), 0 2px 2px 0 rgba(0,0,0,.05), 0 1px 5px 1px rgba(0,0,0,.05);

+

 

 

 // body背景颜色

 // body背景颜色

 //$body-background: #f9fafc;

 //$body-background: #f9fafc;

+ 13 - 5
resources/assets/dcat/sass/components/_button.scss
View File 

@@ -1,15 +1,16 @@
 
 .btn {

 .btn {

-  padding: .75rem 1.4rem!important;

+  padding: .75rem 1.45rem!important;

   font-size: .95rem;

   font-size: .95rem;

   height: 36px;

   height: 36px;

   line-height: .7;

   line-height: .7;

-  border-radius: 0.4rem;

+  border-radius: 0.35rem;

 }

 }

 

 

 .btn-sm, .btn-group-sm > .btn {

 .btn-sm, .btn-group-sm > .btn {

-  padding: 0.5rem 1rem;

-  font-size: 0.7rem;

-  line-height: 1.4;

+  padding: 0.7rem 1.3rem!important;;

+  font-size: 0.6rem;

+  line-height: 12px;

+  height: 32px;

 }

 }

 

 

 

 

@@ -34,3 +35,10 @@
 
   background: rgba($custom, .15);

   background: rgba($custom, .15);

   color: $custom;

   color: $custom;

 }

 }

+

+.btn-shadow {

+  box-shadow: $btn-shadow;

+}

+.btn-shadow:hover {

+  box-shadow: $btn-shadow-hover;

+}

+ 14 - 5
resources/dist/dcat/css/app.css
View File 

@@ -1739,18 +1739,19 @@ html body .content .content-wrapper {
 
 }
 
 }
 
 
 
 .btn {
 
 .btn {
 
-  padding: 0.75rem 1.4rem !important;
 
+  padding: 0.75rem 1.45rem !important;
 
   font-size: 0.95rem;
 
   font-size: 0.95rem;
 
   height: 36px;
 
   height: 36px;
 
   line-height: 0.7;
 
   line-height: 0.7;
 
-  border-radius: 0.4rem;
 
+  border-radius: 0.35rem;
 
 }
 
 }
 
 
 
 .btn-sm,
 
 .btn-sm,
 
 .btn-group-sm > .btn {
 
 .btn-group-sm > .btn {
 
-  padding: 0.5rem 1rem;
 
-  font-size: 0.7rem;
 
-  line-height: 1.4;
 
+  padding: 0.7rem 1.3rem !important;
 
+  font-size: 0.6rem;
 
+  line-height: 12px;
 
+  height: 32px;
 
 }
 
 }
 
 
 
 .btn-custom {
 
 .btn-custom {
 
@@ -1775,6 +1776,14 @@ html body .content .content-wrapper {
 
   color: #59a9f8;
 
   color: #59a9f8;
 
 }
 
 }
 
 
 
+.btn-shadow {
 
+  box-shadow: 0 3px 1px -2px rgba(0, 0, 0, 0.1), 0 2px 2px 0 rgba(0, 0, 0, 0.1), 0 1px 5px 1px rgba(0, 0, 0, 0.1);
 
+}
 
+
 
+.btn-shadow:hover {
 
+  box-shadow: 0 3px 1px -2px rgba(0, 0, 0, 0.05), 0 2px 2px 0 rgba(0, 0, 0, 0.05), 0 1px 5px 1px rgba(0, 0, 0, 0.05);
 
+}
 
+
 
 .pagination .page-item .page-link {
 
 .pagination .page-item .page-link {
 
   font-weight: 600;
 
   font-weight: 600;
 
 }
 
 }

+ 2 - 2
src/Controllers/PermissionController.php
View File 

@@ -79,7 +79,7 @@ class PermissionController extends AdminController
 
         $tree->tools(function (Tree\Tools $tools) {
 
         $tree->tools(function (Tree\Tools $tools) {
 
             $label = trans('admin.table');
 
             $label = trans('admin.table');
 
             $url = url(request()->getPathInfo()).'?_layout=1';
 
             $url = url(request()->getPathInfo()).'?_layout=1';
 
-            $tools->add("<a class='btn btn-sm btn-default' href='{$url}'>$label</a>");
 
+            $tools->add("<a class='btn btn-sm btn-white btn-shadow' href='{$url}'>$label</a>");
 
         });
 
         });
 
 
 
         $tree->branch(function ($branch) {
 
         $tree->branch(function ($branch) {
 
@@ -184,7 +184,7 @@ class PermissionController extends AdminController
 
 
 
             $label = trans('admin.default');
 
             $label = trans('admin.default');
 
             $url = url(request()->getPathInfo());
 
             $url = url(request()->getPathInfo());
 
-            $tools->append("<a class='btn btn-sm btn-default' href='{$url}'>$label</a>");
 
+            $tools->append("<a class='btn btn-sm btn-white btn-shadow' href='{$url}'>$label</a>");
 
         });
 
         });
 
 
 
         $grid->filter(function (Grid\Filter $filter) {
 
         $grid->filter(function (Grid\Filter $filter) {

+ 1 - 1
src/Form/Tools.php
View File 

@@ -182,7 +182,7 @@ class Tools implements Renderable
 
 
 
         return <<<EOT
 
         return <<<EOT
 
 <div class="btn-group pull-right" style="margin-right: 5px">
 
 <div class="btn-group pull-right" style="margin-right: 5px">
 
-    <a href="{$this->getListPath()}" class="btn btn-sm btn-default"><i class=" ti-view-list-alt"></i><span class="hidden-xs">&nbsp;$text</span></a>
 
+    <a href="{$this->getListPath()}" class="btn btn-sm btn-white btn-shadow"><i class=" ti-view-list-alt"></i><span class="hidden-xs">&nbsp;$text</span></a>
 
 </div>
 
 </div>
 
 EOT;
 
 EOT;
 
     }
 
     }

+ 1 - 1
src/Show/Field.php
View File 

@@ -300,7 +300,7 @@ class Field implements Renderable
 
             </div>
 
             </div>
 
             <span class="mailbox-attachment-size">
 
             <span class="mailbox-attachment-size">
 
               {$size}&nbsp;
 
               {$size}&nbsp;
 
-              <a href="{$url}" class="btn btn-default btn-xs pull-right" target="_blank"><i class="fa fa-cloud-download"></i></a>
 
+              <a href="{$url}" class="btn btn-white btn-shadow btn-xs pull-right" target="_blank"><i class="fa fa-cloud-download"></i></a>
 
             </span>
 
             </span>
 
       </div>
 
       </div>
 
     </li>
 
     </li>

+ 1 - 1
src/Show/Tools.php
View File 

@@ -256,7 +256,7 @@ class Tools implements Renderable
 
 
 
         return <<<HTML
 
         return <<<HTML
 
 <div class="btn-group pull-right btn-mini" style="margin-right: 5px">
 
 <div class="btn-group pull-right btn-mini" style="margin-right: 5px">
 
-    <a href="{$this->getListPath()}" class="btn btn-sm btn-default">
 
+    <a href="{$this->getListPath()}" class="btn btn-sm btn-white btn-shadow">
 
         <i class=" ti-view-list-alt"></i><span class="hidden-xs"> {$list}</span>
 
         <i class=" ti-view-list-alt"></i><span class="hidden-xs"> {$list}</span>
 
     </a>
 
     </a>
 
 </div>
 
 </div>

+ 3 - 3
src/Tree.php
View File 

@@ -479,15 +479,15 @@ JS;
 
 
 
         $quickBtn = $btn = '';
 
         $quickBtn = $btn = '';
 
         if ($this->useCreate) {
 
         if ($this->useCreate) {
 
-            $btn = "<a href='{$url}' class='btn btn-sm btn-success'><i class='feather icon-plus'></i><span class='hidden-xs'>&nbsp;{$new}</span></a>";
 
+            $btn = "<button href='{$url}' class='btn btn-sm btn-success'><i class='feather icon-plus'></i><span class='hidden-xs'>&nbsp;{$new}</span></button>";
 
         }
 
         }
 
 
 
         if ($this->useQuickCreate) {
 
         if ($this->useQuickCreate) {
 
             $text = $this->useCreate ? '<i class=\' fa fa-clone\'></i>' : "<i class='feather icon-plus'></i><span class='hidden-xs'>&nbsp; $new</span>";
 
             $text = $this->useCreate ? '<i class=\' fa fa-clone\'></i>' : "<i class='feather icon-plus'></i><span class='hidden-xs'>&nbsp; $new</span>";
 
-            $quickBtn = "<a data-url='$url' class='btn btn-sm btn-success tree-quick-create'>$text</a>";
 
+            $quickBtn = "<button data-url='$url' class='btn btn-sm btn-success tree-quick-create'>$text</button>";
 
         }
 
         }
 
 
 
-        return "<div class='btn-group pull-right' style='margin-right:3px'>{$btn}{$quickBtn}</div>";
 
+        return "&nbsp;<div class='btn-group pull-right' style='margin-right:3px'>{$btn}{$quickBtn}</div>";
 
     }
 
     }
 
 
 
     /**
 
     /**

+ 1 - 1
src/Widgets/Dropdown.php
View File 

@@ -27,7 +27,7 @@ class Dropdown extends Widget
 
      */
 
      */
 
     protected $button = [
 
     protected $button = [
 
         'text'  => null,
 
         'text'  => null,
 
-        'class' => 'btn btn-sm btn-default',
 
+        'class' => 'btn btn-sm btn-white btn-shadow',
 
         'style' => null,
 
         'style' => null,
 
     ];
 
     ];