Skip to content

Commit

Permalink
fix: Fix folder animation with some settings
Browse files Browse the repository at this point in the history 
Fix the folder animation color when `material_theme_disable_folder_animation` is active.

Close #943
  • Loading branch information
@equinusocio
equinusocio committed Aug 9, 2016
1 parent b07626e commit b7446c2
Show file tree
Hide file tree
Showing 7 changed files with 4 additions and 753 deletions.
2 changes: 1 addition & 1 deletion .src/themes/Material-Theme.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// >
// >
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// The most epic theme for Sublime Text 3
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Expand Down
111 changes: 0 additions & 111 deletions .src/themes/darker/options.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,117 +50,6 @@
"content_margin": [0, 0]
},

// Folder animation

{
"class": "icon_folder",
"settings": ["material_theme_disable_folder_animation"],
"parents": [{ "class": "tree_row", "attributes": ["expanded", "hover"] }],
"layer1.opacity": 0.0,
"layer2.opacity": 0.0,
"layer3.texture": "Material Theme/assets/commons/folder--hover.png",
},

// Folder animation Lime

{
"class": "icon_folder",
"settings": ["material_theme_disable_folder_animation", "material_theme_accent_lime"],
"parents": [{ "class": "tree_row", "attributes": ["expanded", "hover"] }],
"layer1.opacity": 0.0,
"layer2.opacity": 0.0,
"layer3.texture": "Material Theme/assets/accent-lime/folder--hover.png",
},

// Folder animation Purple

{
"class": "icon_folder",
"settings": ["material_theme_disable_folder_animation", "material_theme_accent_purple"],
"parents": [{ "class": "tree_row", "attributes": ["expanded", "hover"] }],
"layer1.opacity": 0.0,
"layer2.opacity": 0.0,
"layer3.texture": "Material Theme/assets/accent-purple/folder--hover.png",
},

// Folder animation Red

{
"class": "icon_folder",
"settings": ["material_theme_disable_folder_animation", "material_theme_accent_red"],
"parents": [{ "class": "tree_row", "attributes": ["expanded", "hover"] }],
"layer1.opacity": 0.0,
"layer2.opacity": 0.0,
"layer3.texture": "Material Theme/assets/accent-red/folder--hover.png",
},

// Folder animation Orange

{
"class": "icon_folder",
"settings": ["material_theme_disable_folder_animation", "material_theme_accent_orange"],
"parents": [{ "class": "tree_row", "attributes": ["expanded", "hover"] }],
"layer1.opacity": 0.0,
"layer2.opacity": 0.0,
"layer3.texture": "Material Theme/assets/accent-orange/folder--hover.png",
},

// Folder animation Yellow

{
"class": "icon_folder",
"settings": ["material_theme_disable_folder_animation", "material_theme_accent_yellow"],
"parents": [{ "class": "tree_row", "attributes": ["expanded", "hover"] }],
"layer1.opacity": 0.0,
"layer2.opacity": 0.0,
"layer3.texture": "Material Theme/assets/accent-yellow/folder--hover.png",
},


// Folder animation Indigo

{
"class": "icon_folder",
"settings": ["material_theme_disable_folder_animation", "material_theme_accent_indigo"],
"parents": [{ "class": "tree_row", "attributes": ["expanded", "hover"] }],
"layer1.opacity": 0.0,
"layer2.opacity": 0.0,
"layer3.texture": "Material Theme/assets/accent-indigo/folder--hover.png",
},

// Folder animation Pink

{
"class": "icon_folder",
"settings": ["material_theme_disable_folder_animation", "material_theme_accent_pink"],
"parents": [{ "class": "tree_row", "attributes": ["expanded", "hover"] }],
"layer1.opacity": 0.0,
"layer2.opacity": 0.0,
"layer3.texture": "Material Theme/assets/accent-pink/folder--hover.png",
},

// Folder animation Blue

{
"class": "icon_folder",
"settings": ["material_theme_disable_folder_animation", "material_theme_accent_blue"],
"parents": [{ "class": "tree_row", "attributes": ["expanded", "hover"] }],
"layer1.opacity": 0.0,
"layer2.opacity": 0.0,
"layer3.texture": "Material Theme/assets/accent-blue/folder--hover.png",
},

// Folder animation Cyan

{
"class": "icon_folder",
"settings": ["material_theme_disable_folder_animation", "material_theme_accent_cyan"],
"parents": [{ "class": "tree_row", "attributes": ["expanded", "hover"] }],
"layer1.opacity": 0.0,
"layer2.opacity": 0.0,
"layer3.texture": "Material Theme/assets/accent-cyan/folder--hover.png",
},

// Small status bar

{
Expand Down
101 changes: 1 addition & 100 deletions .src/themes/default/options.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,105 +62,6 @@
"layer3.texture": "Material Theme/assets/commons/folder--hover.png",
},

// Folder animation Lime

{
"class": "icon_folder",
"settings": ["material_theme_disable_folder_animation", "material_theme_accent_lime"],
"parents": [{ "class": "tree_row", "attributes": ["expanded", "hover"] }],
"layer1.opacity": 0.0,
"layer2.opacity": 0.0,
"layer3.texture": "Material Theme/assets/accent-lime/folder--hover.png",
},

// Folder animation Purple

{
"class": "icon_folder",
"settings": ["material_theme_disable_folder_animation", "material_theme_accent_purple"],
"parents": [{ "class": "tree_row", "attributes": ["expanded", "hover"] }],
"layer1.opacity": 0.0,
"layer2.opacity": 0.0,
"layer3.texture": "Material Theme/assets/accent-purple/folder--hover.png",
},

// Folder animation Red

{
"class": "icon_folder",
"settings": ["material_theme_disable_folder_animation", "material_theme_accent_red"],
"parents": [{ "class": "tree_row", "attributes": ["expanded", "hover"] }],
"layer1.opacity": 0.0,
"layer2.opacity": 0.0,
"layer3.texture": "Material Theme/assets/accent-red/folder--hover.png",
},

// Folder animation Orange

{
"class": "icon_folder",
"settings": ["material_theme_disable_folder_animation", "material_theme_accent_orange"],
"parents": [{ "class": "tree_row", "attributes": ["expanded", "hover"] }],
"layer1.opacity": 0.0,
"layer2.opacity": 0.0,
"layer3.texture": "Material Theme/assets/accent-orange/folder--hover.png",
},

// Folder animation Yellow

{
"class": "icon_folder",
"settings": ["material_theme_disable_folder_animation", "material_theme_accent_yellow"],
"parents": [{ "class": "tree_row", "attributes": ["expanded", "hover"] }],
"layer1.opacity": 0.0,
"layer2.opacity": 0.0,
"layer3.texture": "Material Theme/assets/accent-yellow/folder--hover.png",
},

// Folder animation Indigo

{
"class": "icon_folder",
"settings": ["material_theme_disable_folder_animation", "material_theme_accent_indigo"],
"parents": [{ "class": "tree_row", "attributes": ["expanded", "hover"] }],
"layer1.opacity": 0.0,
"layer2.opacity": 0.0,
"layer3.texture": "Material Theme/assets/accent-indigo/folder--hover.png",
},

// Folder animation Pink

{
"class": "icon_folder",
"settings": ["material_theme_disable_folder_animation", "material_theme_accent_pink"],
"parents": [{ "class": "tree_row", "attributes": ["expanded", "hover"] }],
"layer1.opacity": 0.0,
"layer2.opacity": 0.0,
"layer3.texture": "Material Theme/assets/accent-pink/folder--hover.png",
},

// Folder animation Blue

{
"class": "icon_folder",
"settings": ["material_theme_disable_folder_animation", "material_theme_accent_blue"],
"parents": [{ "class": "tree_row", "attributes": ["expanded", "hover"] }],
"layer1.opacity": 0.0,
"layer2.opacity": 0.0,
"layer3.texture": "Material Theme/assets/accent-blue/folder--hover.png",
},

// Folder animation Cyan

{
"class": "icon_folder",
"settings": ["material_theme_disable_folder_animation", "material_theme_accent_cyan"],
"parents": [{ "class": "tree_row", "attributes": ["expanded", "hover"] }],
"layer1.opacity": 0.0,
"layer2.opacity": 0.0,
"layer3.texture": "Material Theme/assets/accent-cyan/folder--hover.png",
},

// Small status bar

{
Expand Down Expand Up @@ -219,4 +120,4 @@
"class": "panel_control",
"settings": ["material_theme_compact_panel"],
"content_margin": [0, 0, 0, 0],
}
}
Loading

0 comments on commit b7446c2

Please sign in to comment.