Ver código fonte

Dark theme tweaks and improvements

n1474335 8 anos atrás
pai
commit
280f1ee2df

+ 0 - 2
src/core/config/OperationConfig.js

@@ -921,7 +921,6 @@ const OperationConfig = {
                 type: "toggleString",
                 value: "",
                 toggleValues: Cipher.IO_FORMAT1
-
             },
             {
                 name: "Salt",
@@ -968,7 +967,6 @@ const OperationConfig = {
                 type: "toggleString",
                 value: "",
                 toggleValues: Cipher.IO_FORMAT1
-
             },
             {
                 name: "Salt",

+ 1 - 1
src/web/OptionsWaiter.js

@@ -137,7 +137,7 @@ OptionsWaiter.prototype.setWordWrap = function() {
  * Changes the theme by setting the class of the <html> element.
  */
 OptionsWaiter.prototype.themeChange = function (e) {
-    var themeClass = e.target.value;
+    const themeClass = e.target.value;
 
     document.querySelector(":root").className = themeClass;
 };

+ 1 - 1
src/web/stylesheets/components/_pane.css

@@ -16,7 +16,7 @@
     border-bottom: 1px solid var(--primary-border-colour);
     font-weight: var(--title-weight);
     color: var(--title-colour);
-    background-color: var(--secondary-background-colour);
+    background-color: var(--title-background-colour);
 }
 
 .list-area {

+ 1 - 0
src/web/stylesheets/layout/_operations.css

@@ -16,6 +16,7 @@
     border-radius: 0;
     border: none;
     border-bottom: 1px solid var(--primary-border-colour);
+    color: var(--primary-font-colour);
 }
 
 #edit-favourites {

Diferenças do arquivo suprimidas por serem muito extensas
+ 1 - 1
src/web/stylesheets/layout/_structure.css


+ 1 - 4
src/web/stylesheets/themes/_classic.css

@@ -27,6 +27,7 @@
 
     --title-colour: #424242;
     --title-weight: bold;
+    --title-background-colour: #eee;
 
     --banner-font-colour: #468847;
     --banner-bg-colour: #dff0d8;
@@ -49,10 +50,6 @@
     --breakpoint-bg-colour: #f2dede;
     --breakpoint-border-colour: #eed3d7;
 
-    --breakpoint-font-colour: #b94a48;
-    --breakpoint-bg-colour: #f2dede;
-    --breakpoint-border-colour: #eed3d7;
-
     --disabled-font-colour: #999;
     --disabled-bg-colour: #dfdfdf;
     --disabled-border-colour: #cdcdcd;

+ 29 - 32
src/web/stylesheets/themes/_dark.css

@@ -34,13 +34,14 @@ option text for inputs is invisible
     --secondary-background-colour: #252525;
 
     --primary-border-colour: #444;
-    --secondary-border-colour: #3c3c3c; /*todo*/
+    --secondary-border-colour: #3c3c3c;
 
     --title-colour: #fff;
     --title-weight: bold;
+    --title-background-colour: #333;
 
     --banner-font-colour: #c5c5c5;
-    --banner-bg-colour: #333;
+    --banner-bg-colour: #252525;
 
 
     /* Operation colours */
@@ -48,50 +49,46 @@ option text for inputs is invisible
     --op-list-operation-bg-colour: #333;
     --op-list-operation-border-colour: #444;
 
-    --rec-list-operation-font-colour: #c5c5c5; /*todo*/
-    --rec-list-operation-bg-colour: #333;
+    --rec-list-operation-font-colour: #c5c5c5;
+    --rec-list-operation-bg-colour: #252525;
     --rec-list-operation-border-colour: #444;
 
-    --selected-operation-font-color: #c09853; /*todo*/
-    --selected-operation-bg-colour: #fcf8e3;
-    --selected-operation-border-colour: #fbeed5;
+    --selected-operation-font-color: #c5c5c5;
+    --selected-operation-bg-colour: #3f3f3f;
+    --selected-operation-border-colour: #444;
 
-    --breakpoint-font-colour: #b94a48; /*todo*/
-    --breakpoint-bg-colour: #f2dede;
-    --breakpoint-border-colour: #eed3d7;
+    --breakpoint-font-colour: #ddd;
+    --breakpoint-bg-colour: #073655;
+    --breakpoint-border-colour: #444;
 
-    --breakpoint-font-colour: #b94a48; /*todo*/
-    --breakpoint-bg-colour: #f2dede;
-    --breakpoint-border-colour: #eed3d7;
+    --disabled-font-colour: #666;
+    --disabled-bg-colour: #444;
+    --disabled-border-colour: #444;
 
-    --disabled-font-colour: #999; /*todo*/
-    --disabled-bg-colour: #dfdfdf;
-    --disabled-border-colour: #cdcdcd;
+    --fc-operation-font-colour: #c5c5c5;
+    --fc-operation-bg-colour: #2d2d2d;
+    --fc-operation-border-colour: #444;
 
-    --fc-operation-font-colour: #396f3a; /*todo*/
-    --fc-operation-bg-colour: #c7e4ba;
-    --fc-operation-border-colour: #b3dba2;
-
-    --fc-breakpoint-operation-font-colour: #94312f; /*todo*/
-    --fc-breakpoint-operation-bg-colour: #eabfbf;
-    --fc-breakpoint-operation-border-colour: #e2aeb5;
+    --fc-breakpoint-operation-font-colour: #ddd;
+    --fc-breakpoint-operation-bg-colour: #072b49;
+    --fc-breakpoint-operation-border-colour: #444;
 
 
     /* Operation arguments */
-    --arg-title-font-weight: bold; /*todo*/
+    --arg-title-font-weight: bold;
     --arg-input-height: 34px;
     --arg-input-line-height: 20px;
     --arg-input-font-size: 15px;
     --arg-font-colour: #bbb;
-    --arg-background: #252525;
-    --arg-border-colour: #205375;
-    --arg-disabled-background: #eee; /*todo*/
+    --arg-background: #3c3c3c;
+    --arg-border-colour: #3c3c3c;
+    --arg-disabled-background: #4f4f4f;
 
 
     /* Buttons */
     --btn-default-font-colour: #c5c5c5;
-    --btn-default-bg-colour: #3c3c3c;
-    --btn-default-border-colour: #205375;
+    --btn-default-bg-colour: #2d2d2d;
+    --btn-default-border-colour: #3c3c3c;
 
     --btn-default-hover-font-colour: #c5c5c5;
     --btn-default-hover-bg-colour: #2d2d2d;
@@ -107,8 +104,8 @@ option text for inputs is invisible
 
 
     /* Highlighter colours */
-    --hl1: #fff000; /*todo*/
-    --hl2: #95dfff;
+    --hl1: #264f78;
+    --hl2: #675351;
     --hl3: #ffb6b6;
     --hl4: #fcf8e3;
     --hl5: #8de768;
@@ -121,7 +118,7 @@ option text for inputs is invisible
 
 
     /* Misc. */
-    --drop-file-border-colour: #3a87ad; /*todo*/
+    --drop-file-border-colour: #0e639c;
     --popover-background: #444;
     --popover-border-colour: #666; /* still working on this */
 }

+ 5 - 5
src/web/stylesheets/utils/_general.css

@@ -66,8 +66,8 @@ body {
 }
 
 /* Highlighters */
-.hl1, { background-color: var(--hl1); }
-.hl2, { background-color: var(--hl2); }
-.hl3, { background-color: var(--hl3); } /* Half-Life 3 confirmed :O */
-.hl4, { background-color: var(--hl4); }
-.hl5, { background-color: var(--hl5); }
+.hl1 { background-color: var(--hl1); }
+.hl2 { background-color: var(--hl2); }
+.hl3 { background-color: var(--hl3); } /* Half-Life 3 confirmed :O */
+.hl4 { background-color: var(--hl4); }
+.hl5 { background-color: var(--hl5); }

+ 4 - 0
src/web/stylesheets/utils/_overrides.css

@@ -61,6 +61,10 @@ a:focus {
     border-radius: 0 !important;
 }
 
+.btn.dropdown-toggle {
+    height: 34px;
+}
+
 input[type="search"] {
     -webkit-appearance: searchfield;
     box-shadow: none;

Alguns arquivos não foram mostrados porque muitos arquivos mudaram nesse diff