瀏覽代碼

默认字体设置为14px

jqh 5 年之前
父節點
當前提交
932893050c

+ 2 - 2
config/admin.php

@@ -22,7 +22,7 @@ return [
     | `img` tag, eg '<img src="http://logo-url" alt="Admin logo">'.
     |
     */
-    'logo' => '<span>Dcat</span> Admin',
+    'logo' => '<img src="/vendors/dcat-admin/images/logo.png" width="35"> &nbsp;Dcat Admin',
 
     /*
     |--------------------------------------------------------------------------
@@ -34,7 +34,7 @@ return [
     | '<img src="http://logo-url" alt="Admin logo">'.
     |
     */
-    'logo-mini' => 'Da',
+    'logo-mini' => '<img src="/vendors/dcat-admin/images/logo.png">',
 
     /*
     |--------------------------------------------------------------------------

+ 2 - 1
resources/assets/dcat/sass/components/_box.scss

@@ -13,7 +13,7 @@
 }
 
 .box-header {
-  padding: 14px;
+  padding: 1rem;
   display: inherit;
   justify-content: space-between;
   align-items: center;
@@ -21,6 +21,7 @@
   h3, .h3 {
     font-size: 1.15rem;
     margin-bottom: 0;
+    padding: .1rem;
   }
 }
 

+ 0 - 1
resources/assets/dcat/sass/components/_button.scss

@@ -1,6 +1,5 @@
 .btn {
   padding: 0.54rem 1.2rem !important;
-  font-size: 0.9rem;
   height: 38px;
   line-height: 1.2;
   border-radius: 0.2rem;

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

@@ -11,6 +11,6 @@
   }
 }
 .vs-checkbox-con input:checked ~ .vs-checkbox .vs-checkbox--check .vs-icon {
-  font-size: .85rem;
+  font-size: .95rem;
   margin-top: -1px;
 }

+ 10 - 1
resources/assets/dcat/sass/components/_form.scss

@@ -34,7 +34,7 @@ select.form-control:not([multiple=multiple]) {
   padding-top: 7px;
   padding-right: 5px;
   margin-bottom: 0;
-  //font-size: 1rem;
+  font-size: 1rem;
   text-transform: capitalize;
 }
 
@@ -120,6 +120,15 @@ select.form-control:not([multiple=multiple]) {
   }
 }
 
+.select2-container--classic .select2-selection--single, .select2-container--default .select2-selection--single {
+  min-height: 35px;
+  padding: 5px;
+  border: 1px solid rgba(0,0,0,.2);
+}
+.select2-container--default .select2-selection--single .select2-selection__arrow {
+  height: 32px!important;
+}
+
 .select2-dropdown {
   border: 1px solid rgba(0, 0, 0, 0.03)!important;
   box-shadow: $shadow;

+ 4 - 0
resources/assets/dcat/sass/components/_modal.scss

@@ -0,0 +1,4 @@
+.modal-content {
+  border: 0;
+  border-radius: 0;
+}

+ 6 - 2
resources/assets/dcat/sass/components/_sidebar.scss

@@ -1,3 +1,7 @@
-.navigation {
-  font-size: 1.1rem;
+.main-sidebar {
+  .nav-sidebar .nav-item > .nav-link {
+    font-size: 1.1rem;
+
+    margin-bottom: 0;
+  }
 }

+ 0 - 1
resources/assets/dcat/sass/components/_table.scss

@@ -29,7 +29,6 @@ table.dataTable {
   padding: .55rem;
   height: 62px;
   line-height: 1.42857;
-  font-size: .9rem;
 }
 
 .table tr td:first-child, .table tr th:first-child {

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

@@ -15,10 +15,15 @@
 // sweetalert弹窗
 @import "./sweetalert/sweetalert2";
 
+html {
+  font-size: 14px;
+  height: 100%;
+  letter-spacing: .01rem;
+}
+
 html body {
   background-color: $body-bg;
   color: $font-color;
-  font-size: .95rem;
 }
 
 // 字体
@@ -194,4 +199,8 @@ ol, ul, dl {
 @import "./components/popover";
 // datetime picker
 @import "./components/datetime-picker";
+// 菜单
+@import "./components/sidebar";
+// 模态窗
+@import "./components/modal";
 

+ 0 - 1
resources/assets/sass/bootstrap-extended/_nav.scss

@@ -39,7 +39,6 @@
         border-radius: .357rem;
         padding: .2rem 1rem;
         padding-top: .3rem;
-        font-size: 0.98rem;
         margin-right: 0.5rem;
         color: $pure-black;
         &.active {

+ 1 - 1
src/Controllers/PermissionController.php

@@ -71,7 +71,7 @@ class PermissionController extends AdminController
         $tree->disableCreateButton();
 
         $tree->branch(function ($branch) {
-            $payload = "<div class='pull-left' style='min-width:310px'><b>{$branch['name']}</b>&nbsp;&nbsp;[<span class='text-blue'>{$branch['slug']}</span>]";
+            $payload = "<div class='pull-left' style='min-width:310px'><b>{$branch['name']}</b>&nbsp;&nbsp;[<span class='text-primary'>{$branch['slug']}</span>]";
 
             $path = array_filter($branch['http_path']);