Browse Source

样式优化

jqh 5 years ago
parent
commit
6b314272e5

+ 17 - 15
resources/assets/dcat-admin/main.css

@@ -1426,12 +1426,15 @@ input.form-control {
     min-height: 30px!important;
 }
 
+.right-side-filter-container {
+    border-bottom: 1px solid #f5f5f5;margin:-25px -25px 20px;height:48px;line-height: 48px;padding: 0 10px 12px 30px;
+}
+
 pre.dump {
     border-radius: 2px;
     border: 0;
-    /*color: #eee;*/
-    box-shadow: 0 1px 3px 1px rgba(34, 25, 25, .17);
-    background: #f8f8f8;
+    box-shadow: 0 1px 3px 1px rgba(34, 25, 25, .1);
+    background: #fff;
     white-space:pre-wrap;
 }
 
@@ -1679,30 +1682,30 @@ pre.dump {
 .nav-tabs-default>.nav-tabs {
     margin: 0;
     border-bottom:1px solid #f4f4f4;
+    padding-left: 8px;
 }
 
 .nav-tabs-default > .nav-tabs > li > a{
     border:0;
-    color: #7c858e;
-    color: var(--80);
-    font-weight:bold;
-    padding: 15px 20px;
+    color: rgba(0, 0, 0, .4);
+    padding: 16px;
 }
 .nav-tabs-default > .nav-tabs > li {
-    border-bottom: 3px solid transparent;
+    border-bottom: 2px solid transparent;
     border-top:0;
 }
 .nav-tabs-default > .nav-tabs > li.active {
     top:1px;
     padding-bottom: 0;
-    border-bottom-color:#4199de;
-    border-bottom-color:var(--primary);
+    border-bottom-color:#297ec0;
+    border-bottom-color:var(--primary-dark);
 }
 .nav-tabs-default>.nav-tabs>li.active>a {
     border-left:0;
     border-right:0;
     border-top:0!important;
-    color:#444;
+    color:#297ec0;
+    color:var(--primary-dark);
 }
 .nav-tabs-default > .tab-content {
     padding:10px;
@@ -1712,11 +1715,10 @@ pre.dump {
     border-bottom:0;
 }
 .nav-tabs-custom > .nav-tabs > li > a, .nav-tabs-custom > .nav-tabs > li > a:hover {
-    color: #7c858e;
-    color: var(--80)
+    color: rgba(0, 0, 0, .4);
 }
 .nav-tabs>li>a {
-    padding: 11px 18px 11px;
+    padding: 13px 18px;
     font-weight: bold;
 }
 .nav-tabs-custom {
@@ -1735,7 +1737,7 @@ pre.dump {
     margin-bottom: -20px;
     z-index: 11;
     background: #fff;
-    margin-top:4px
+    margin-top:7px
 }
 
 .nav-tabs-custom > .nav-tabs > li.active {

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


+ 4 - 5
src/Controllers/IconController.php

@@ -25,13 +25,12 @@ class IconController extends Controller
             width: 40px;
         }');
 
-        return $content->title('Icons')->description(' ')->body(function (Row $row) {
+        return $content->title('Icon')->body(function (Row $row) {
             $tab = Tab::make()->padding('20px')->custom();
 
-            $tab->add('Themify', view('admin::helpers.themify'));
-//            $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'));
+            $tab->add(('Themify'), view('admin::helpers.themify'));
+            $tab->add(('Font Awesome'), view('admin::helpers.font-awesome'));
+            $tab->add(('Glyphicons'), view('admin::helpers.glyphicons'));
 
             $row->column(12, $tab);
         });

+ 7 - 2
src/Controllers/LogController.php

@@ -34,7 +34,12 @@ class LogController extends Controller
         $grid = new Grid(new OperationLog());
 
         $grid->id('ID')->bold()->sortable();
-        $grid->user(trans('admin.user'))->get('name')->responsive();
+        $grid->user(trans('admin.user'))
+            ->get('name')
+            ->link(function () {
+                return admin_url('auth/users/'.$this->user['id']);
+            })
+            ->responsive();
         $grid->method(trans('admin.method'))->responsive()->display(function ($method) {
             $color = Arr::get(OperationLogModel::$methodColors, $method, 'default');
 
@@ -43,7 +48,7 @@ class LogController extends Controller
         $grid->path(trans('admin.uri'))->responsive()->display(function ($v) {
             return "<code>$v</code>";
         });
-        $grid->ip('IP')->responsive()->label('default');
+        $grid->ip('IP')->responsive();
         $grid->input->responsive()->display(function ($input) {
             $input = json_decode($input, true);
             $input = Arr::except($input, ['_pjax', '_token', '_method', '_previous_']);

+ 0 - 2
src/Grid/Filter.php

@@ -672,8 +672,6 @@ 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 10px 12px 30px;}');
-
         $this->view = $this->mode === self::MODE_RIGHT_SIDE ? 'admin::filter.right-side-container' : 'admin::filter.container';
 
         return view($this->view)->with([

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