fix: Fix selected folder/arrow icon

Close #1073
material-theme · Jan 6, 2017 · 955b400 · 955b400
1 parent 2016a3e
commit 955b400
Show file tree

Hide file tree

Showing 8 changed files with 1,244 additions and 20 deletions.
diff --git a/Material-Theme-Darker.sublime-theme b/Material-Theme-Darker.sublime-theme
diff --git a/Material-Theme-Lighter.sublime-theme b/Material-Theme-Lighter.sublime-theme
diff --git a/Material-Theme-Palenight.sublime-theme b/Material-Theme-Palenight.sublime-theme
diff --git a/Material-Theme.sublime-theme b/Material-Theme.sublime-theme
diff --git a/package.json b/package.json
@@ -33,9 +33,9 @@
     "gulp-replace": "^0.5.4",
     "gulp-stats": "0.0.4",
     "gulp-template": "^4.0.0",
-    "lodash": "^4.15.0",
+    "lodash": "^4.17.4",
     "run-sequence": "^1.1.5",
-    "yargs": "^6.2.0"
+    "yargs": "^6.6.0"
   },
   "repository": {
     "type": "git",

diff --git a/sources/themes/commons/accent.json b/sources/themes/commons/accent.json
@@ -156,6 +156,16 @@
     },
   },
 
+  {
+    "class": "icon_folder",
+    "settings": ["material_theme_accent_<%= ui.accents[i].id %>"],
+    "parents":
+    [
+      { "class": "tree_row", "attributes": ["selected"] }
+    ],
+    "layer1.texture": "Material Theme/assets/accent-<%= ui.accents[i].id %>/folder--hover.png",
+  },
+
     // Arrow icon folder
   {
     "class": "icon_folder",
@@ -196,6 +206,16 @@
     "layer3.opacity": 1.0
   },
 
+  {
+    "class": "icon_folder",
+    "settings": ["material_theme_arrow_folders", "material_theme_accent_<%= ui.accents[i].id %>"],
+    "parents":
+    [
+      { "class": "tree_row", "attributes": ["selected"] }
+    ],
+    "layer1.texture": "Material Theme/assets/accent-<%= ui.accents[i].id %>/arrow_folder--hover.png",
+  },
+
     // tab set scroll left | scroll right
 
   {

diff --git a/sources/themes/palenight/sidebar.json b/sources/themes/palenight/sidebar.json
@@ -206,6 +206,16 @@
     "layer3.opacity": 0.0,
   },
 
+  {
+    "class": "icon_folder",
+    "parents":
+    [
+      { "class": "tree_row", "attributes": ["selected"] }
+    ],
+    "layer1.texture": "Material Theme/assets/commons/folder--hover.png",
+    "layer1.opacity": 1.0
+  },
+
   {
     "class": "icon_folder",
     "parents":
@@ -247,15 +257,6 @@
     "layer3.texture": "Material Theme/assets/commons/arrow_folder--opened.png",
   },
 
-  {
-    "class": "icon_folder",
-    "parents":
-    [
-      { "class": "tree_row", "attributes": ["selected"] }
-    ],
-    "layer1.texture": "Material Theme/assets/commons/folder--hover.png",
-  },
-
     // Folder loading
 
   {

diff --git a/sources/themes/palenight/tabs.json b/sources/themes/palenight/tabs.json
@@ -5,6 +5,7 @@
 
   {
     "class": "tabset_control",
+    "attributes": ["file_medium_dark"],
     "layer0.opacity": 1.0,
     "layer0.tint": [<%= ui.background.primary.rgb %>],
     "tint_index": 1,