jqh hace 5 años
padre
commit
573a4ae894

+ 6 - 0
resources/assets/dcat/js/dcat-app.js

@@ -90,6 +90,12 @@ function listen(Dcat) {
         // layer弹窗设置
         layer.config({maxmin: true, moveOut: true, shade: false});
 
+        // 滚动条优化
+        if ($('.full-page .wrapper').length) {
+            new PerfectScrollbar('.full-page .wrapper');
+        }
+        new PerfectScrollbar('html');
+
         //////////////////////////////////////////////////////////
 
         // 菜单点击选中效果

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

@@ -28,7 +28,7 @@
 .btn-sm, .btn-group-sm > .btn {
   padding: 0.45rem 1rem !important;
   font-size: 0.65rem;
-  line-height: 1;
+  line-height: 1.4;
   height: 30px;
 }
 

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

@@ -26,6 +26,10 @@
   font-size: 1.1rem;
 }
 
+.card-title {
+  font-size: 1.2rem;
+}
+
 .card-footer {
   padding: 1.1rem;
   background: transparent;

+ 1 - 1
resources/assets/dcat/sass/components/_slider-panel.scss

@@ -34,7 +34,7 @@
     z-index: 10;
     color: #626262;
     i{
-      font-size: 1.71rem;
+      font-size: 1.35rem;
     }
   }
 

+ 17 - 0
resources/assets/dcat/sass/components/scroll-bar.scss

@@ -0,0 +1,17 @@
+
+.ps__thumb-y {
+  background-color: lighten($primary, 5%);
+  background-image: linear-gradient(45deg,
+          rgba(255,255,255,.15) 25%,
+          transparent 25%,
+          rgba(255,255,255,.15) 25%,
+          transparent 25%,
+          rgba(255,255,255,.15) 25%,
+          transparent 25%,
+          rgba(255,255,255,.15) 25%,
+          transparent 25%,
+          rgba(255,255,255,.15) 25%,
+          transparent 25%,
+          transparent
+  );
+}

+ 3 - 2
resources/assets/dcat/sass/dcat-app.scss

@@ -32,7 +32,7 @@ body, .header-navbar, .navigation, .breadcrumb, h1, h2, h3, h4, h5, h6, .h1, .h2
 }
 
 h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
-  line-height: 1.1
+  line-height: 1.3
 }
 
 .content .content-wrapper {
@@ -204,4 +204,5 @@ ol, ul, dl {
 @import "./components/sidebar";
 // 模态窗
 @import "./components/modal";
-
+// 滚动条
+@import "./components/scroll-bar";

+ 0 - 64
resources/assets/vendors/css/documentation.css

@@ -1,64 +0,0 @@
-/*================================================================================================
-  File Name: documentation.scss
-  Description: This is only documentation related css file, this is theme related css.
-  ----------------------------------------------------------------------------------------------
-  Item name: Vuexy  - Vuejs, HTML & Laravel Admin Dashboard Template
-  Author: PIXINVENT
-  Author URL: http://www.themeforest.net/user/pixinvent
-================================================================================================*/
-
-body {
-  position: relative;
-}
-/* Right Sidebar */
-.affix {
-    position: fixed;
-    margin: 0 1.5rem 0 0;
-    width: 240px;
-}
-/* navbar buttons */
-.btn-doc-header{
-    margin-right: 1rem;
-}
-
-ul#page-navigation-list{
-  display: block !important;
-}
-ul#page-navigation-list li ul.nav{
-  display:none;
-}
-ul#page-navigation-list li ul.nav{
-  display:none;
-}
-ul#page-navigation-list li a.active + ul.nav{
-  display:block;
-}
-ul#page-navigation-list li a.nav-link{
-  padding:0;
-  padding-left:10px;
-  line-height: 1.8;
-  color: #626262;
-}
-ul#page-navigation-list li a{
-  border-left:2px solid #fff;
-}
-ul#page-navigation-list li a.active{
-  border-left:2px solid black;
-}
-ul#page-navigation-list li ul li a{
-  border-left:1px solid #fff;
-  padding-left:30px;
-  font-size: 85%;
-}
-ul#page-navigation-list li ul li a.active{
-  border-left:1px solid black;
-}
-
-.token.footer, .token.content{
-  margin:0 !important;
-}
-.sidebar-right .component-sidebar .card-content{
-  position: relative;
-  height: calc(100vh - 230px);
-  overflow-y: auto;
-}

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

@@ -14,7 +14,7 @@
                         @endif
                     </div>
 
-                    <a href="#" class="close-slider customizer-close" style="top: 12px;right: 10px;">
+                    <a href="#" class="slider-close" style="top: 12px;right: 10px;">
                         <i class="feather icon-x"></i>
                     </a>
                 </div>

+ 1 - 8
resources/views/layouts/full-page.blade.php

@@ -44,14 +44,7 @@
 
 {!! Dcat\Admin\Admin::asset()->jsToHtml() !!}
 
-<script>
-    if ($('.full-page .wrapper').length) {
-        // 滚动条优化
-        new PerfectScrollbar('.full-page .wrapper');
-    }
-
-    Dcat.boot();
-</script>
+<script>Dcat.boot();</script>
 
 </body>
 </html>

+ 1 - 1
src/Console/stubs/metrics/NewUsers.stub

@@ -99,7 +99,7 @@ class NewUsers extends Line
         return $this->content(
             <<<HTML
 <div class="d-flex justify-content-between align-items-center mt-1" style="margin-bottom: 2px">
-    <h2 class="ml-1 font-large-1">{$content}</h2>
+    <h2 class="ml-1 font-lg-1">{$content}</h2>
     <span class="mb-0 mr-1 text-80">{$this->title}</span>
 </div>
 HTML

+ 1 - 1
src/Console/stubs/metrics/Sessions.stub

@@ -102,7 +102,7 @@ class Sessions extends Bar
             <<<HTML
 <div class="d-flex p-1 flex-column justify-content-between" style="padding-top: 0;width: 100%;height: 100%;min-height: {$minHeight}">
     <div class="text-left">
-        <h1 class="font-large-2 mt-2 mb-0">{$title}</h1>
+        <h1 class="font-lg-2 mt-2 mb-0">{$title}</h1>
         <h5 class="font-medium-2" style="margin-top: 10px;">
             <span class="text-{$style}">{$value} </span>
             <span>vs {$label}</span>

+ 4 - 4
src/Console/stubs/metrics/Tickets.stub

@@ -76,7 +76,7 @@ class Tickets extends RadialBar
         return $this->content(
             <<<HTML
 <div class="d-flex flex-column flex-wrap text-center">
-    <h1 class="font-large-2 mt-2 mb-0">{$content}</h1>
+    <h1 class="font-lg-2 mt-2 mb-0">{$content}</h1>
     <small>Tickets</small>
 </div>
 HTML
@@ -99,15 +99,15 @@ HTML
 <div class="d-flex justify-content-between p-1" style="padding-top: 0!important;">
     <div class="text-center">
         <p>New Tickets</p>
-        <span class="font-large-1">{$new}</span>
+        <span class="font-lg-1">{$new}</span>
     </div>
     <div class="text-center">
         <p>Open Tickets</p>
-        <span class="font-large-1">{$open}</span>
+        <span class="font-lg-1">{$open}</span>
     </div>
     <div class="text-center">
         <p>Response Time</p>
-        <span class="font-large-1">{$response}</span>
+        <span class="font-lg-1">{$response}</span>
     </div>
 </div>
 HTML

+ 1 - 1
src/Console/stubs/metrics/TotalUsers.stub

@@ -109,7 +109,7 @@ class TotalUsers extends Card
 
         return <<<HTML
 <div class="d-flex justify-content-between align-items-center mt-1" style="margin-bottom: 2px">
-    <h2 class="ml-1 font-large-1">{$content}</h2>
+    <h2 class="ml-1 font-lg-1">{$content}</h2>
 </div>
 <div class="ml-1 mt-1 font-weight-bold text-80">
     {$this->renderFooter()}

+ 1 - 1
src/Grid/Tools/FilterButton.php

@@ -80,7 +80,7 @@ class FilterButton extends AbstractTool
         return false
     });
     
-    $('#{$id} .close-slider').on('click', function () {
+    $('#{$id} .slider-close').on('click', function () {
         slider.close()
     })
 })();