Home Esplora Aiuto
Registrati Accedi
wangjunyun
/
Dcat-Admin
mirror da https://gitee.com/jqhph/dcat-admin.git
1
0
Forka 0
File Problemi 0 Wiki
Sfoglia il codice sorgente

暗黑模式细节优化

jqh 4 anni fa
parent
1f0acebb67
commit
5d87f2ce54
18 ha cambiato i file con 47 aggiunte e 18 eliminazioni
Visualizzazione separata Mostra Diff Stats
  1. 19 4
      resources/assets/dcat/sass/components/_form.scss
  2. 22 6
      resources/assets/dcat/sass/theme/_dark.scss
  3. 0 0
      resources/dist/adminlte/adminlte-blue-light.css
  4. 0 0
      resources/dist/adminlte/adminlte-blue.css
  5. 0 0
      resources/dist/adminlte/adminlte-green.css
  6. 0 0
      resources/dist/adminlte/adminlte.css
  7. 0 0
      resources/dist/adminlte/adminlte.js.map
  8. 0 0
      resources/dist/dcat/css/dcat-app-blue-light.css
  9. 0 0
      resources/dist/dcat/css/dcat-app-blue.css
  10. 0 0
      resources/dist/dcat/css/dcat-app-green.css
  11. 0 0
      resources/dist/dcat/css/dcat-app.css
  12. 0 0
      resources/dist/dcat/extra/action.js.map
  13. 0 0
      resources/dist/dcat/extra/select-table.js.map
  14. 0 0
      resources/dist/dcat/extra/upload.js
  15. 0 0
      resources/dist/dcat/extra/upload.js.map
  16. 0 0
      resources/dist/dcat/js/dcat-app.js.map
  17. 2 4
      src/Form/Field/Divide.php
  18. 4 4
      src/Form/Field/Fieldset.php

+ 19 - 4
resources/assets/dcat/sass/components/_form.scss
Vedi File 

@@ -75,9 +75,12 @@ select.form-control:not([multiple=multiple]) {
 
   margin-bottom: 4px;

 }

 

-.form-control:disabled, .form-control[readonly] {

-  background-color: #F7F7F9;

-  cursor: not-allowed;

+.form-control:disabled,

+.form-control[readonly],

+.select2-container--default.select2-container--disabled .select2-selection--single,

+.select2-container--default.select2-container--disabled .select2-selection--multiple {

+  background-color: #F7F7F9!important;

+  cursor: not-allowed!important;

 }

 

 .has-error .checkbox,

@@ -203,7 +206,7 @@ select.form-control:not([multiple=multiple]) {
 
 }

 

 .select2-container--default .select2-selection--single .select2-selection__rendered {

-  line-height: 31px!important;

+  line-height: 30px!important;

 }

 

 .input-group-sm {

@@ -272,4 +275,16 @@ select.form-control:not([multiple=multiple]) {
 
 .has-icon-left .form-control {

   padding-right: 2rem;

   padding-left: 3rem;

+}

+

+// divider

+.form-divider {

+  height: 20px;

+  border-bottom: 1px solid #eee;

+

+  span {

+    font-size: 16px;

+    background-color: #ffffff;

+    padding: 0 10px;

+  }

 }

+ 22 - 6
resources/assets/dcat/sass/theme/_dark.scss
Vedi File 

@@ -517,19 +517,19 @@ body.dark-mode {
 
   }

 

   input::-webkit-input-placeholder{

-    color: darken($body-dark-font-color, 1.2%)!important;

+    color: darken($body-dark-font-color, 5%)!important;

   }

-  input:-moz-placeholder{

-    color: darken($body-dark-font-color, 1.2%)!important;

+  input::-moz-placeholder{

+    color: darken($body-dark-font-color, 5%)!important;

   }

   input::-moz-placeholder{

-    color: darken($body-dark-font-color, 1.2%)!important;

+    color: darken($body-dark-font-color, 5%)!important;

   }

   input:-ms-input-placeholder {

-    color: darken($body-dark-font-color, 1.2%)!important;

+    color: darken($body-dark-font-color, 5%)!important;

   }

   .help-block {

-    color: darken($body-dark-font-color, 1.2%)!important;

+    color: darken($body-dark-font-color, 1.3%)!important;

   }

   .has-error .checkbox, .has-error .checkbox-inline, .has-error.checkbox label, .has-error .control-label, .has-error .form-control-position i, .has-error .form-control:focus~.form-control-position i, .has-error .help-block, .has-error .radio, .has-error .radio-inline, .has-error.radio label

   {

@@ -579,6 +579,22 @@ body.dark-mode {
 
     color: $body-dark-font-color;

   }

 

+  // form divider

+  .form-divider {

+    border-color: $body-dark-border-color;

+

+    span {

+      background-color: $body-dark-card-bg;

+    }

+  }

+

+  .form-control:disabled,

+  .form-control[readonly],

+  .select2-container--default.select2-container--disabled .select2-selection--single,

+  .select2-container--default.select2-container--disabled .select2-selection--multiple {

+    background-color: darken($body-dark-bg, 2%)!important;

+  }

+

   // ------ layer

   // 滚动条

   @include dark-scrollbar('.layui-layer-page .layui-layer-content');

File diff suppressed because it is too large
+ 0 - 0
resources/dist/adminlte/adminlte-blue-light.css


File diff suppressed because it is too large
+ 0 - 0
resources/dist/adminlte/adminlte-blue.css


File diff suppressed because it is too large
+ 0 - 0
resources/dist/adminlte/adminlte-green.css


File diff suppressed because it is too large
+ 0 - 0
resources/dist/adminlte/adminlte.css


File diff suppressed because it is too large
+ 0 - 0
resources/dist/adminlte/adminlte.js.map


File diff suppressed because it is too large
+ 0 - 0
resources/dist/dcat/css/dcat-app-blue-light.css


File diff suppressed because it is too large
+ 0 - 0
resources/dist/dcat/css/dcat-app-blue.css


File diff suppressed because it is too large
+ 0 - 0
resources/dist/dcat/css/dcat-app-green.css


File diff suppressed because it is too large
+ 0 - 0
resources/dist/dcat/css/dcat-app.css


File diff suppressed because it is too large
+ 0 - 0
resources/dist/dcat/extra/action.js.map


File diff suppressed because it is too large
+ 0 - 0
resources/dist/dcat/extra/select-table.js.map


File diff suppressed because it is too large
+ 0 - 0
resources/dist/dcat/extra/upload.js


File diff suppressed because it is too large
+ 0 - 0
resources/dist/dcat/extra/upload.js.map


File diff suppressed because it is too large
+ 0 - 0
resources/dist/dcat/js/dcat-app.js.map


+ 2 - 4
src/Form/Field/Divide.php
Vedi File 

@@ -18,10 +18,8 @@ class Divide extends Field
 
         }
 
 
         return <<<HTML
 
-<div class="mt-2 text-center" style="height: 20px; border-bottom: 1px solid #eee; margin-bottom: 25px">
 
-  <span style="font-size: 16px; background-color: #ffffff; padding: 0 10px;">
 
-    {$this->label}
 
-  </span>
 
+<div class="mt-2 text-center mb-2 form-divider">
 
+  <span>{$this->label}</span>
 
 </div>
 
 HTML;
 
     }

+ 4 - 4
src/Form/Field/Fieldset.php
Vedi File 

@@ -25,14 +25,14 @@ JS;
 
 
         return <<<HTML
 
 <div>
 
-    <div class="mt-2 text-center" style="height: 20px; border-bottom: 1px solid #eee; margin-bottom: 25px">
 
-      <span style="font-size: 16px; background-color: #ffffff; padding: 0 10px;">
 
+    <div class="mt-2 text-center mb-2 form-divider">
 
+      <span>
 
         <a data-toggle="collapse" href="#{$this->name}" class="{$this->name}-title">
 
           <i class="fa fa-angle-double-up"></i>&nbsp;&nbsp;{$title}
 
         </a>
 
       </span>
 
-    </div>
 
-    <div class="collapse show" id="{$this->name}">
 
+</div>
 
+<div class="collapse show" id="{$this->name}">
 
 HTML;
 
     }

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