Fixes

RobiNN1 · Oct 22, 2023 · b05ef2b · b05ef2b
1 parent d6372b1
commit b05ef2b
Show file tree

Hide file tree

Showing 13 changed files with 68 additions and 26 deletions.
diff --git a/Material/css/theme-gray.css b/Material/css/theme-gray.css
@@ -72,12 +72,14 @@
             transform: rotate(360deg);
   }
 }
+.elfinder-spinner,
 .elfinder-info-spinner,
 .elfinder-navbar-spinner,
 .elfinder-button-icon-spinner {
   font-size: 16px;
   background: none;
 }
+.elfinder-spinner:before,
 .elfinder-info-spinner:before,
 .elfinder-navbar-spinner:before,
 .elfinder-button-icon-spinner:before {
@@ -1090,6 +1092,9 @@
   border: 0;
   padding: 3px 20px;
 }
+.elfinder-toolbar .elfinder-button-icon {
+  color: #ffffff;
+}
 .elfinder-buttonset {
   border-radius: 0;
   border: 0;
@@ -1111,7 +1116,6 @@
 .elfinder-button-icon {
   background: none;
   font-size: 20px !important;
-  color: #ffffff;
   overflow: unset;
 }
 .elfinder-button-text {
@@ -1273,10 +1277,6 @@
   top: 8px;
   right: 0;
 }
-.elfinder-cwd-view-icons .elfinder-cwd-file-wrapper {
-  width: unset;
-  height: unset;
-}
 .elfinder-cwd-icon {
   background-image: none;
   position: relative;
@@ -1585,6 +1585,7 @@
   border: 0;
   border-bottom: 1px solid #f2f3f5;
   padding: 0;
+  border-radius: 0;
 }
 .elfinder-dialog .ui-tabs .ui-tabs-tab {
   background: none;
@@ -1612,13 +1613,17 @@
 }
 .elfinder-dialog .elfinder-edit-editor {
   padding: 0;
+  background-color: #474d55 !important;
 }
 .elfinder-dialog .elfinder-edit-editor textarea {
   border-radius: 0;
   box-shadow: none;
   background: #484848;
   padding: unset;
 }
+.elfinder-dialog .elfinder-edit-editor .elfinder-button-icon {
+  vertical-align: unset;
+}
 .elfinder-dialog .ui-dialog-buttonpane select,
 .elfinder-dialog .ui-dialog-buttonpane .ui-button {
   margin-top: 0 !important;
@@ -1674,9 +1679,12 @@
  */
 #ace_settingsmenu {
   box-shadow: 0 1px 30px rgba(0, 0, 0, 0.6);
-  background-color: #dcdfe2;
+  background-color: #24272b;
   color: #ffffff;
 }
 .ace_optionsMenuEntry:hover {
   background-color: transparent;
 }
+.ace_optionsMenuEntry button[ace_selected_button=true] {
+  box-shadow: none;
+}
diff --git a/Material/css/theme-gray.min.css b/Material/css/theme-gray.min.css
diff --git a/Material/css/theme-light.css b/Material/css/theme-light.css
@@ -72,12 +72,14 @@
             transform: rotate(360deg);
   }
 }
+.elfinder-spinner,
 .elfinder-info-spinner,
 .elfinder-navbar-spinner,
 .elfinder-button-icon-spinner {
   font-size: 16px;
   background: none;
 }
+.elfinder-spinner:before,
 .elfinder-info-spinner:before,
 .elfinder-navbar-spinner:before,
 .elfinder-button-icon-spinner:before {
@@ -1090,6 +1092,9 @@
   border: 0;
   padding: 3px 20px;
 }
+.elfinder-toolbar .elfinder-button-icon {
+  color: #ffffff;
+}
 .elfinder-buttonset {
   border-radius: 0;
   border: 0;
@@ -1111,7 +1116,6 @@
 .elfinder-button-icon {
   background: none;
   font-size: 20px !important;
-  color: #ffffff;
   overflow: unset;
 }
 .elfinder-button-text {
@@ -1273,10 +1277,6 @@
   top: 8px;
   right: 0;
 }
-.elfinder-cwd-view-icons .elfinder-cwd-file-wrapper {
-  width: unset;
-  height: unset;
-}
 .elfinder-cwd-icon {
   background-image: none;
   position: relative;
@@ -1585,6 +1585,7 @@
   border: 0;
   border-bottom: 1px solid #1a83df;
   padding: 0;
+  border-radius: 0;
 }
 .elfinder-dialog .ui-tabs .ui-tabs-tab {
   background: none;
@@ -1612,13 +1613,17 @@
 }
 .elfinder-dialog .elfinder-edit-editor {
   padding: 0;
+  background-color: #fff !important;
 }
 .elfinder-dialog .elfinder-edit-editor textarea {
   border-radius: 0;
   box-shadow: none;
   background: #484848;
   padding: unset;
 }
+.elfinder-dialog .elfinder-edit-editor .elfinder-button-icon {
+  vertical-align: unset;
+}
 .elfinder-dialog .ui-dialog-buttonpane select,
 .elfinder-dialog .ui-dialog-buttonpane .ui-button {
   margin-top: 0 !important;
@@ -1680,3 +1685,6 @@
 .ace_optionsMenuEntry:hover {
   background-color: transparent;
 }
+.ace_optionsMenuEntry button[ace_selected_button=true] {
+  box-shadow: none;
+}
diff --git a/Material/css/theme-light.min.css b/Material/css/theme-light.min.css
diff --git a/Material/css/theme.css b/Material/css/theme.css
@@ -72,12 +72,14 @@
             transform: rotate(360deg);
   }
 }
+.elfinder-spinner,
 .elfinder-info-spinner,
 .elfinder-navbar-spinner,
 .elfinder-button-icon-spinner {
   font-size: 16px;
   background: none;
 }
+.elfinder-spinner:before,
 .elfinder-info-spinner:before,
 .elfinder-navbar-spinner:before,
 .elfinder-button-icon-spinner:before {
@@ -1090,6 +1092,9 @@
   border: 0;
   padding: 3px 20px;
 }
+.elfinder-toolbar .elfinder-button-icon {
+  color: #afcbf8;
+}
 .elfinder-buttonset {
   border-radius: 0;
   border: 0;
@@ -1111,7 +1116,6 @@
 .elfinder-button-icon {
   background: none;
   font-size: 20px !important;
-  color: #afcbf8;
   overflow: unset;
 }
 .elfinder-button-text {
@@ -1273,10 +1277,6 @@
   top: 8px;
   right: 0;
 }
-.elfinder-cwd-view-icons .elfinder-cwd-file-wrapper {
-  width: unset;
-  height: unset;
-}
 .elfinder-cwd-icon {
   background-image: none;
   position: relative;
@@ -1585,6 +1585,7 @@
   border: 0;
   border-bottom: 1px solid #93b8f5;
   padding: 0;
+  border-radius: 0;
 }
 .elfinder-dialog .ui-tabs .ui-tabs-tab {
   background: none;
@@ -1612,13 +1613,17 @@
 }
 .elfinder-dialog .elfinder-edit-editor {
   padding: 0;
+  background-color: #051837 !important;
 }
 .elfinder-dialog .elfinder-edit-editor textarea {
   border-radius: 0;
   box-shadow: none;
   background: #484848;
   padding: unset;
 }
+.elfinder-dialog .elfinder-edit-editor .elfinder-button-icon {
+  vertical-align: unset;
+}
 .elfinder-dialog .ui-dialog-buttonpane select,
 .elfinder-dialog .ui-dialog-buttonpane .ui-button {
   margin-top: 0 !important;
@@ -1680,3 +1685,6 @@
 .ace_optionsMenuEntry:hover {
   background-color: transparent;
 }
+.ace_optionsMenuEntry button[ace_selected_button=true] {
+  box-shadow: none;
+}
diff --git a/Material/css/theme.min.css b/Material/css/theme.min.css
diff --git a/src/less/core.less b/src/less/core.less
@@ -47,6 +47,7 @@
     }
 }
 
+.elfinder-spinner,
 .elfinder-info-spinner,
 .elfinder-navbar-spinner,
 .elfinder-button-icon-spinner {

diff --git a/src/less/dialogs.less b/src/less/dialogs.less
@@ -76,6 +76,7 @@
             border: 0;
             border-bottom: 1px solid @tabs-border;
             padding: 0;
+            border-radius: 0;
         }
 
         .ui-tabs-tab {
@@ -114,13 +115,18 @@
 
     .elfinder-edit-editor {
         padding: 0;
+        background-color: @dialog-bg !important;
 
         textarea {
             border-radius: 0;
             box-shadow: none;
             background: #484848;
             padding: unset;
         }
+
+        .elfinder-button-icon {
+            vertical-align: unset;
+        }
     }
 
     .ui-dialog-buttonpane {
@@ -198,7 +204,7 @@
  */
 #ace_settingsmenu {
     box-shadow: 0 1px 30px rgba(0, 0, 0, .6);
-    background-color: lighten(@workzone-bg, 2%);
+    background-color: @ace-editor-settings;
     color: @body-color;
 }
 
@@ -215,6 +221,7 @@
         }
 
         &[ace_selected_button=true] {
+            box-shadow: none;
             &:extend(.elfinder .ui-button.ui-state-active);
         }
     }

diff --git a/src/less/toolbar.less b/src/less/toolbar.less
@@ -5,6 +5,10 @@
     background: @toolbar-bg;
     .remove-borders;
     padding: 3px 20px;
+
+    .elfinder-button-icon {
+        color: lighten(@toolbar-bg, 80%);
+    }
 }
 
 .elfinder-buttonset {
@@ -33,7 +37,6 @@
 .elfinder-button-icon {
     background: none;
     font-size: 20px !important;
-    color: lighten(@toolbar-bg, 80%);
     overflow: unset;
 }
 

diff --git a/src/less/variables-darkblue.less b/src/less/variables-darkblue.less
@@ -64,3 +64,7 @@
 @tab-color: lighten(@main-color, 70%);
 @tab-color-active: lighten(@main-color, 50%);
 @quicklook-text-preview-bg: #c4c4c4;
+
+// Other
+// ----------------------------------------------
+@ace-editor-settings: lighten(@workzone-bg, 2%);
diff --git a/src/less/variables-gray.less b/src/less/variables-gray.less
@@ -64,3 +64,7 @@
 @tab-color: lighten(@main-color, 70%);
 @tab-color-active: lighten(@main-color, 50%);
 @quicklook-text-preview-bg: #c4c4c4;
+
+// Other
+// ----------------------------------------------
+@ace-editor-settings: darken(@main-color, 10%);
diff --git a/src/less/variables-light.less b/src/less/variables-light.less
@@ -65,3 +65,7 @@
 @tab-color: darken(@blue-color, 2%);
 @tab-color-active: darken(@blue-color, 1%);
 @quicklook-text-preview-bg: #fff;
+
+// Other
+// ----------------------------------------------
+@ace-editor-settings: lighten(@workzone-bg, 2%);
diff --git a/src/less/workzone.less b/src/less/workzone.less
@@ -103,11 +103,6 @@
     }
 }
 
-.elfinder-cwd-view-icons .elfinder-cwd-file-wrapper {
-    width: unset;
-    height: unset;
-}
-
 .elfinder-cwd-icon {
     background-image: none;
     position: relative;