feat: Revisited contrast mode and code refactoring

SublimeText · Sep 28, 2016 · ffd375f · ffd375f
1 parent f96b101
commit ffd375f
Show file tree

Hide file tree

Showing 14 changed files with 112 additions and 369 deletions.
diff --git a/.src/themes/Material-Theme-Darker.json b/.src/themes/Material-Theme-Darker.json
@@ -19,6 +19,6 @@
   //=include "darker/widgets.json"
   //=include "darker/buttons.json"
   //=include "commons/accent.json"
-  //=include "darker/options.json"
+  //=include "commons/options.json"
   //
 ]
diff --git a/.src/themes/Material-Theme-Lighter.json b/.src/themes/Material-Theme-Lighter.json
@@ -19,6 +19,6 @@
   //=include "lighter/widgets.json"
   //=include "lighter/buttons.json"
   //=include "commons/accent.json"
-  //=include "lighter/options.json"
+  //=include "commons/options.json"
   //
 ]
diff --git a/.src/themes/Material-Theme.json b/.src/themes/Material-Theme.json
@@ -19,6 +19,6 @@
   //=include "default/widgets.json"
   //=include "default/buttons.json"
   //=include "commons/accent.json"
-  //=include "default/options.json"
+  //=include "commons/options.json"
   //
 ]
diff --git a/.src/themes/lighter/options.json → .src/themes/commons/options.json b/.src/themes/lighter/options.json → .src/themes/commons/options.json
@@ -1,7 +1,7 @@
 
-/* @ THEME OPTIONS
- * Options override
-========================================================================= */
+// @ THEME OPTIONS
+// Options override
+// =========================================================================
 
   // Tabs size Settings
 
@@ -50,6 +50,7 @@
     "content_margin": [0, 0]
   },
 
+
     // Folder animation
 
   {
@@ -244,13 +245,12 @@
     "layer1.opacity": 0.0
   },
 
-    // Status bar panel
-
+  // Status bar panel
   {
     "class": "panel_control",
     "settings": ["material_theme_panel_separator"],
     "layer1.texture": "Material Theme/assets/commons/panel_separator.png",
-    "layer1.opacity": 0.1,
+    "layer1.opacity": 0.2,
     "layer1.inner_margin": [2, 2, 2, 2],
   },
 
@@ -259,20 +259,23 @@
   {
     "class": "sidebar_container",
     "settings": ["material_theme_contrast_mode"],
-    "layer0.tint": [240, 240, 240]
+    "layer1.opacity": 0.2
   },
+
   {
     "class": "sidebar_tree",
     "settings": ["material_theme_contrast_mode"],
-    "layer0.tint": [240, 240, 240]
+    "layer1.opacity": 0.2
   },
+
   {
     "class": "status_bar",
     "settings": ["material_theme_contrast_mode"],
-    "layer1.tint": [240, 240, 240]
+    "layer1.opacity": 0.2
   },
 
-  // Compact mode
+    // Compact mode
+
   {
     "class": "sidebar_tree",
     "settings": ["material_theme_compact_sidebar"],

diff --git a/.src/themes/darker/options.json b/.src/themes/darker/options.json
diff --git a/.src/themes/darker/sidebar.json b/.src/themes/darker/sidebar.json
@@ -9,7 +9,9 @@
     "layer0.opacity": 1.0,
     "layer0.draw_center": false,
     "layer0.inner_margin": [0, 24, 12, 24],
-    "content_margin": [0, 12, 0, 0]
+    "content_margin": [0, 12, 0, 0],
+    "layer1.tint": [0,0,0],
+    "layer1.opacity": 0.0
   },
   {
     "class": "sidebar_tree",
@@ -18,7 +20,9 @@
     "indent_offset": 0,
     "indent_top_level": false,
     "layer0.tint": [33, 33, 33],
-    "layer0.opacity": 1.0
+    "layer0.opacity": 1.0,
+    "layer1.tint": [0,0,0],
+    "layer1.opacity": 0.0
   },
 
   {