فهرست منبع

样式调整优化

jqh 5 سال پیش
والد
کامیت
54c42fdf64

+ 1 - 1
resources/assets/dcat/extra/upload.js

@@ -770,7 +770,7 @@
             $info = $statusBar.find('.info');
 
             // 上传按钮
-            $upload = $wrap.find('.uploadBtn');
+            $upload = $wrap.find('.upload-btn');
 
             // 没选择文件之前的内容。
             $placeHolder = $wrap.find('.placeholder');

+ 3 - 3
resources/assets/dcat/sass/components/_button.scss

@@ -1,8 +1,8 @@
 .btn {
-  padding: 0.5rem 1.2rem !important;
+  padding: 0.54rem 1.2rem !important;
   font-size: 0.9rem;
   height: 38px;
-  line-height: 0.1;
+  line-height: 1.2;
   border-radius: 0.2rem;
   box-shadow: $btn-shadow;
   cursor: pointer;
@@ -28,7 +28,7 @@
 
 .btn-sm, .btn-group-sm > .btn {
   padding: 0.45rem 1rem !important;
-  font-size: 0.6rem;
+  font-size: 0.65rem;
   line-height: 1;
   height: 30px;
 }

+ 12 - 0
resources/assets/dcat/sass/components/_datetime-picker.scss

@@ -7,4 +7,16 @@
   background-color: $light!important;
   color: $primary-darker!important;
   font-weight: bold;
+}
+
+.bootstrap-datetimepicker-widget table td {
+  width: 0 !important;
+
+  .btn {
+    padding: 0.5rem .5rem !important;
+  }
+}
+
+.bootstrap-datetimepicker-widget table td, .bootstrap-datetimepicker-widget table th {
+  padding: .5em .1em!important;
 }

+ 1 - 1
resources/assets/dcat/sass/components/_layer.scss

@@ -62,7 +62,7 @@
   height: 30px!important;
   line-height: 20px!important;
   padding: 4px 15px!important;
-  font-size: .9rem;
+  font-size: .85rem;
   box-shadow: $shadow-100;
   border-color: $white!important;
 }

+ 5 - 1
resources/assets/dcat/sass/dcat-app.scss

@@ -22,10 +22,14 @@ html body {
 }
 
 // 字体
-body, .header-navbar, .navigation, .breadcrumb, h1, h2, h3, h4, h5 {
+body, .header-navbar, .navigation, .breadcrumb, h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
   font-family: $font-family-sans-serif;
 }
 
+h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
+  line-height: 1.1
+}
+
 .content .content-wrapper {
   padding: calc(2.2rem - 0.4rem) 2.1rem 0;
   margin-top: 5rem;

+ 4 - 4
resources/views/dashboard/title.blade.php

@@ -25,6 +25,8 @@
     .dashboard-title .avatar {
         background: #fff;
         border: 2px solid #fff;
+        width: 70px;
+        height: 70px;
     }
 </style>
 
@@ -32,12 +34,10 @@
     <div class="card-body">
         <div class="text-center ">
 
-            <div class="avatar avatar-xl shadow mt-1">
-                <img class="avatar-content" src="{{ admin_asset('@admin/images/logo.png') }}">
-            </div>
+                <img class="avatar img-circle shadow mt-1" src="{{ admin_asset('@admin/images/logo.png') }}">
 
             <div class="text-center mb-1">
-                <h1 class="mb-3 mt-2 white">Dcat Admin</h1>
+                <h1 class="mb-3 mt-2 text-white">Dcat Admin</h1>
                 <div class="links">
                     <a href="https://github.com/jqhph/dcat-admin" target="_blank">Github</a>
                     <a href="https://jqhph.github.io/dcat-admin/docs.html" id="doc-link" target="_blank">{{ __('admin.documentation') }}</a>

+ 1 - 1
resources/views/form/file.blade.php

@@ -23,7 +23,7 @@
                 <div class="info"></div>
                 <div class="btns">
                     <div class="add-file-button"></div> &nbsp;
-                    <div class="uploadBtn btn btn-primary"><i class="feather icon-upload"></i> &nbsp;{{trans('admin.upload')}}</div>
+                    <div class="upload-btn btn btn-primary"><i class="feather icon-upload"></i> &nbsp;{{trans('admin.upload')}}</div>
                 </div>
             </div>
         </div>

+ 1 - 1
src/Form/Field/Number.php

@@ -23,7 +23,7 @@ $('{$this->getElementClassSelector()}:not(.initialized)')
     });
 JS;
 
-        $this->prepend('')->defaultAttribute('style', 'width: 200px');
+        $this->prepend('')->defaultAttribute('style', 'width: 200px')->default(0);
 
         return parent::render();
     }