Browse Source

样式调整

jqh 5 years ago
parent
commit
cbf08aa3e5

+ 2 - 4
resources/assets/dcat-admin/main.css

@@ -880,7 +880,7 @@ input.label {
     border: 1px solid var(--40)
 }
 .table>tbody>tr>td {
-    height:53px;
+    height:54px;
 }
 .table > thead > tr > th {
     color: #555;
@@ -918,7 +918,6 @@ input.label {
 .table-header-gray.table>thead>tr>th {
     color:#7c858e;
     color:var(--80);
-    font-weight:bold;
 }
 .table.table-bordered thead tr {
     background: transparent;
@@ -2263,11 +2262,10 @@ div.layui-layer-btn{
 }
 
 .da-box .box-header,.da-box .card-header {
-    padding: 14px;
+    padding: 13px;
     /*border-top: 2px solid #fff*/
 }
 .da-box .box-header .btn, .da-box .card-header .btn {
-    /*text-transform: uppercase;*/
     background-color: transparent !important;
     border-color: transparent !important;
     box-shadow:none!important;

File diff suppressed because it is too large
+ 0 - 0
resources/assets/dcat-admin/main.min.css


+ 3 - 3
resources/views/filter/right-side-container.blade.php

@@ -3,11 +3,11 @@
         <form action="{!! $action !!}" class="form-horizontal" pjax-container method="get">
             <div class="right-side-filter-container">
                 <div class="pull-left">
-                    <button type="submit" class=" btn btn-trans submit">
+                    <button type="submit" class=" btn btn-sm btn-primary submit">
                         <i class="fa fa-search"></i> &nbsp;{{ __('admin.search') }}
-                    </button>
+                    </button>&nbsp;
                     @if(!$disableResetButton)
-                        <a href="{!! $action !!}" class="reset btn btn-trans btn-default">
+                        <a href="{!! $action !!}" class="reset btn btn-sm btn-default">
                             <i class="fa fa-undo"></i> &nbsp;{{ __('admin.reset') }}
                         </a>
                     @endif

+ 1 - 1
src/Grid/Filter.php

@@ -672,7 +672,7 @@ class Filter implements Renderable
 
         $this->callComposing();
 
-        Admin::style('.right-side-filter-container{border-bottom: 1px solid #f5f5f5;margin:-25px -25px 20px;height:48px;line-height: 48px;padding: 0 15px 12px;}');
+        Admin::style('.right-side-filter-container{border-bottom: 1px solid #f5f5f5;margin:-25px -10px 20px;height:48px;line-height: 48px;padding: 0 15px 12px;}');
 
         $this->view = $this->mode === self::MODE_RIGHT_SIDE ? 'admin::filter.right-side-container' : 'admin::filter.container';
 

Some files were not shown because too many files changed in this diff