Etusivu Tutki Apua
Rekisteröidy Kirjaudu sisään
dcatadmin2
/
dcat-admin2
2
0
Fork 0
Tiedostot Ongelmat 0 Pull-pyynnöt 0 Wiki
Selaa lähdekoodia

样式兼容

jqh 5 vuotta sitten
vanhempi
54c42fdf64
commit
1573637094
5 muutettua tiedostoa jossa 17 lisäystä ja 9 poistoa
Yhdistetty näkymä Näytä diff tilastot
  1. 4 0
      resources/assets/dcat/js/bootstrappers/Menu.js
  2. 1 1
      resources/assets/dcat/sass/components/_slider-panel.scss
  3. 8 3
      resources/assets/dcat/sass/dcat-app.scss
  4. 1 2
      resources/views/layouts/full-page.blade.php
  5. 3 3
      resources/views/layouts/vertical.blade.php

+ 4 - 0
resources/assets/dcat/js/bootstrappers/Menu.js
Näytä tiedosto 

@@ -6,6 +6,10 @@ export default class Menu {
 
 

 

     // 菜单点击选中效果

     // 菜单点击选中效果

     bindClick() {

     bindClick() {

+        if (! $('.main-sidebar .sidebar').length) {

+            return;

+        }

+

         // 滚动条优化

         // 滚动条优化

         new PerfectScrollbar('.main-sidebar .sidebar');

         new PerfectScrollbar('.main-sidebar .sidebar');

+ 1 - 1
resources/assets/dcat/sass/components/_slider-panel.scss
Näytä tiedosto 

@@ -13,7 +13,7 @@
 
 

 

   width: 450px;

   width: 450px;

   right: -450px;

   right: -450px;

-  z-index: 100;

+  z-index: 998;

 

 

   &.open{

   &.open{

     right: 0;

     right: 0;

+ 8 - 3
resources/assets/dcat/sass/dcat-app.scss
Näytä tiedosto 

@@ -31,13 +31,12 @@ h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
 
 }

 }

 

 

 .content .content-wrapper {

 .content .content-wrapper {

-  padding: calc(2.2rem - 0.4rem) 2.1rem 0;

-  margin-top: 5rem;

+  padding: 7rem 2rem 0;

 }

 }

 

 

 .navbar-fixed-top {

 .navbar-fixed-top {

   .content-wrapper {

   .content-wrapper {

-    margin-top: 4rem;

+    padding-top: 6rem;

   }

   }

 }

 }

 

 

@@ -45,6 +44,12 @@ h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
 
   padding: 0 0 2px;

   padding: 0 0 2px;

 }

 }

 

 

+.full-page {

+  .content .content-wrapper {

+    padding: 0;

+  }

+}

+

 ol, ul, dl {

 ol, ul, dl {

   margin-bottom: 0;

   margin-bottom: 0;

 }

 }

+ 1 - 2
resources/views/layouts/full-page.blade.php
Näytä tiedosto 

@@ -26,8 +26,7 @@
 
 </head>

 </head>

 

 

 <body

 <body

-      class="dcat-admin-body 1-column  {{ $configData['body_class'] }}"

-         data-col="1-column">

+      class="dcat-admin-body full-page {{ $configData['body_class'] }}">

 

 

 <script>

 <script>

     var Dcat = CreateDcat({!! Dcat\Admin\Admin::jsVariables() !!});

     var Dcat = CreateDcat({!! Dcat\Admin\Admin::jsVariables() !!});

+ 3 - 3
resources/views/layouts/vertical.blade.php
Näytä tiedosto 

@@ -14,14 +14,14 @@
 
         @include('admin::partials.navbar')

         @include('admin::partials.navbar')

 

 

         <div class="app-content content">

         <div class="app-content content">

-            <div class="content-wrapper" id="{{ $pjaxContainerId }}" style="top: 0;">

+            <div class="content-wrapper" id="{{ $pjaxContainerId }}" style="top: 0;min-height: 900px;">

                 @yield('app')

                 @yield('app')

             </div>

             </div>

         </div>

         </div>

     </div>

     </div>

 

 

     <footer class="main-footer">

     <footer class="main-footer">

-        <p class="clearfix blue-grey lighten-2 mb-0">

+        <p class="clearfix blue-grey lighten-2 mb-0 text-center">

             <span class="text-center d-block d-md-inline-block mt-25">

             <span class="text-center d-block d-md-inline-block mt-25">

                 Powered by

                 Powered by

                 <a target="_blank" href="https://github.com/jqhph/dcat-admin">Dcat Admin</a>

                 <a target="_blank" href="https://github.com/jqhph/dcat-admin">Dcat Admin</a>

@@ -29,7 +29,7 @@
 
                 v{{ Dcat\Admin\Admin::VERSION }}

                 v{{ Dcat\Admin\Admin::VERSION }}

             </span>

             </span>

 

 

-            <button class="btn btn-primary btn-icon scroll-top pull-right" style="bottom: 2%">

+            <button class="btn btn-primary btn-icon scroll-top pull-right" style="bottom: 2%;display: none">

                 <i class="feather icon-arrow-up"></i>

                 <i class="feather icon-arrow-up"></i>

             </button>

             </button>

         </p>

         </p>