diff --git a/Meetio-Theme.hidden-theme b/Meetio-Theme.hidden-theme index 0db731e5..d6e505bf 100644 --- a/Meetio-Theme.hidden-theme +++ b/Meetio-Theme.hidden-theme @@ -229,40 +229,6 @@ "vcsMissing": "var(--orangish)" }, "rules": [ - { - "class": "fold_button_control", - "layer0.texture": "Meetio Theme/textures/arrow_right.png", - "layer0.tint": "var(colorAccent)", - "layer0.opacity": 0.4, - "layer0.inner_margin": 0, - "content_margin": [ - 12, - 12 - ] - }, - { - "class": "fold_button_control", - "attributes": [ - "hover" - ], - "layer0.opacity": 1, - "content_margin": [ - 12, - 12 - ] - }, - { - "class": "fold_button_control", - "attributes": [ - "expanded" - ], - "layer0.texture": "Meetio Theme/textures/arrow_down.png", - "layer0.tint": "var(colorAccent)", - "content_margin": [ - 12, - 12 - ] - }, { "class": "popup_control", "layer0.tint": [ @@ -329,7 +295,7 @@ { "class": "annotation_close_button", "content_margin": 8, - "layer0.texture": "Meetio Theme/textures/icon_close.png", + "layer0.texture": "Meetio Theme/textures/actions/icon_close.png", "layer0.tint": "var(colorAccent)", "layer0.opacity": { "target": 0.8, @@ -395,6 +361,40 @@ ], "layer0.opacity": 1 }, + { + "class": "fold_button_control", + "layer0.texture": "Meetio Theme/textures/navigation/arrow_right.png", + "layer0.tint": "var(colorAccent)", + "layer0.opacity": 0.4, + "layer0.inner_margin": 0, + "content_margin": [ + 12, + 12 + ] + }, + { + "class": "fold_button_control", + "attributes": [ + "hover" + ], + "layer0.opacity": 1, + "content_margin": [ + 12, + 12 + ] + }, + { + "class": "fold_button_control", + "attributes": [ + "expanded" + ], + "layer0.texture": "Meetio Theme/textures/navigation/arrow_down.png", + "layer0.tint": "var(colorAccent)", + "content_margin": [ + 12, + 12 + ] + }, { "class": "dropdown_button_control", "layer0.texture": "Meetio Theme/textures/actions/history.png", @@ -413,6 +413,11 @@ ], "layer0.opacity": 0.8 }, + { + "class": "grid_layout_control", + "border_color": "var(gridLayoutBorderColor)", + "border_size": "var(gridLayoutBorderSize)" + }, { "class": "disclosure_button_control", "layer0.texture": "Meetio Theme/textures/disclosure.png", @@ -556,11 +561,6 @@ ], "layer0.opacity": 1 }, - { - "class": "grid_layout_control", - "border_color": "var(gridLayoutBorderColor)", - "border_size": "var(gridLayoutBorderSize)" - }, { "class": "icon_button_group", "spacing": 8 @@ -1254,6 +1254,49 @@ "font.italic": true, "border_color": "color(var(--accent) a(0.8))" }, + { + "class": "close_button", + "layer0.texture": "Meetio Theme/textures/actions/icon_close.png", + "layer0.tint": "var(colorAccent)", + "layer0.opacity": 1, + "layer0.inner_margin": [ + 3, + 3 + ], + "content_margin": [ + 8, + 8 + ] + }, + { + "class": "close_button", + "parents": [ + { + "class": "tree_row", + "attributes": [ + "hover" + ] + } + ], + "layer0.opacity": 1 + }, + { + "class": "close_button", + "attributes": [ + "dirty" + ], + "layer0.texture": "Meetio Theme/textures/dirty_icon.png", + "layer0.tint": "var(colorAccent)" + }, + { + "class": "close_button", + "attributes": [ + "hover", + "dirty" + ], + "layer0.texture": "Meetio Theme/textures/dirty_icon.png", + "layer0.tint": "var(colorAccent)" + }, { "class": "text_line_control", "layer0.opacity": 1, @@ -1410,49 +1453,6 @@ } ] }, - { - "class": "close_button", - "layer0.texture": "Meetio Theme/textures/icon_close.png", - "layer0.tint": "var(colorAccent)", - "layer0.opacity": 1, - "layer0.inner_margin": [ - 3, - 3 - ], - "content_margin": [ - 8, - 8 - ] - }, - { - "class": "close_button", - "parents": [ - { - "class": "tree_row", - "attributes": [ - "hover" - ] - } - ], - "layer0.opacity": 1 - }, - { - "class": "close_button", - "attributes": [ - "dirty" - ], - "layer0.texture": "Meetio Theme/textures/dirty_icon.png", - "layer0.tint": "var(colorAccent)" - }, - { - "class": "close_button", - "attributes": [ - "hover", - "dirty" - ], - "layer0.texture": "Meetio Theme/textures/dirty_icon.png", - "layer0.tint": "var(colorAccent)" - }, { "class": "overlay_control", "layer0.texture": "Meetio Theme/textures/overlay_bg.png", @@ -1570,7 +1570,7 @@ }, { "class": "panel_close_button", - "layer0.texture": "Meetio Theme/textures/icon_close.png", + "layer0.texture": "Meetio Theme/textures/actions/icon_close.png", "layer0.tint": "var(colorAccent)", "layer0.opacity": { "target": 0.4, @@ -1594,6 +1594,126 @@ "interpolation": "smoothstep" } }, + { + "class": "mini_quick_panel_row", + "layer0.tint": "var(panelRowBackground)", + "layer0.inner_margin": [ + 2, + 2, + 2, + 2 + ], + "layer0.opacity": 1 + }, + { + "class": "mini_quick_panel_row", + "attributes": [ + "selected" + ], + "layer0.tint": "var(panelRowSelectedBackground)" + }, + { + "class": "quick_panel", + "row_padding": "var(panelRowPadding)", + "layer0.tint": [ + "background", + 1 + ], + "layer0.opacity": 1 + }, + { + "class": "quick_panel", + "parents": [ + { + "class": "overlay_control goto_symbol" + } + ], + "row_padding": [ + 0, + 0, + 0, + 0 + ] + }, + { + "class": "quick_panel", + "parents": [ + { + "class": "overlay_control goto_symbol_in_project" + } + ], + "row_padding": [ + 0, + 0, + 0, + 0 + ] + }, + { + "class": "quick_panel_row", + "layer0.opacity": 1 + }, + { + "class": "quick_panel_row", + "layer0.tint": "var(panelRowBackground)", + "layer0.opacity": 1 + }, + { + "class": "quick_panel_row", + "attributes": [ + "selected" + ], + "layer0.tint": "var(panelRowSelectedBackground)" + }, + { + "class": "quick_panel_entry", + "spacing": 1 + }, + { + "class": "quick_panel_label", + "font.face": "var(fontFace)", + "font.size": "var(panelRowFontSize)", + "fg": "var(panelRowColor)", + "match_fg": "var(panelRowMatchColor)", + "selected_fg": "var(panelRowSelectedColor)", + "selected_match_fg": "var(panelRowSelectedMatchColor)" + }, + { + "class": "quick_panel_path_label", + "font.face": "var(fontFace)", + "font.size": "var(panelPathRowFontSize)", + "font.italic": "var(panelPathRowFontItalic)", + "fg": "var(panelPathRowColor)", + "match_fg": "var(panelRowMatchColor)", + "selected_fg": "var(panelRowSelectedColor)", + "selected_match_fg": "var(panelRowSelectedMatchColor)" + }, + { + "class": "quick_panel_label hint", + "font.size": "var(panelPathRowFontSize)", + "font.italic": true + }, + { + "class": "quick_panel_label key_binding", + "font.size": "var(panelPathRowFontSize)" + }, + { + "class": "progress_bar_control", + "layer0.tint": [ + "background", + 0.94 + ], + "layer0.opacity": 1 + }, + { + "class": "progress_gauge_control", + "layer0.tint": "var(colorAccent)", + "layer0.opacity": 1, + "content_margin": [ + 0, + 8 + ] + }, { "class": "sidebar_container", "layer0.tint": "var(sidebarBackground)", @@ -1771,109 +1891,6 @@ ], "font.italic": false }, - { - "class": "mini_quick_panel_row", - "layer0.tint": "var(panelRowBackground)", - "layer0.inner_margin": [ - 2, - 2, - 2, - 2 - ], - "layer0.opacity": 1 - }, - { - "class": "mini_quick_panel_row", - "attributes": [ - "selected" - ], - "layer0.tint": "var(panelRowSelectedBackground)" - }, - { - "class": "quick_panel", - "row_padding": "var(panelRowPadding)", - "layer0.tint": [ - "background", - 1 - ], - "layer0.opacity": 1 - }, - { - "class": "quick_panel", - "parents": [ - { - "class": "overlay_control goto_symbol" - } - ], - "row_padding": [ - 0, - 0, - 0, - 0 - ] - }, - { - "class": "quick_panel", - "parents": [ - { - "class": "overlay_control goto_symbol_in_project" - } - ], - "row_padding": [ - 0, - 0, - 0, - 0 - ] - }, - { - "class": "quick_panel_row", - "layer0.opacity": 1 - }, - { - "class": "quick_panel_row", - "layer0.tint": "var(panelRowBackground)", - "layer0.opacity": 1 - }, - { - "class": "quick_panel_row", - "attributes": [ - "selected" - ], - "layer0.tint": "var(panelRowSelectedBackground)" - }, - { - "class": "quick_panel_entry", - "spacing": 1 - }, - { - "class": "quick_panel_label", - "font.face": "var(fontFace)", - "font.size": "var(panelRowFontSize)", - "fg": "var(panelRowColor)", - "match_fg": "var(panelRowMatchColor)", - "selected_fg": "var(panelRowSelectedColor)", - "selected_match_fg": "var(panelRowSelectedMatchColor)" - }, - { - "class": "quick_panel_path_label", - "font.face": "var(fontFace)", - "font.size": "var(panelPathRowFontSize)", - "font.italic": "var(panelPathRowFontItalic)", - "fg": "var(panelPathRowColor)", - "match_fg": "var(panelRowMatchColor)", - "selected_fg": "var(panelRowSelectedColor)", - "selected_match_fg": "var(panelRowSelectedMatchColor)" - }, - { - "class": "quick_panel_label hint", - "font.size": "var(panelPathRowFontSize)", - "font.italic": true - }, - { - "class": "quick_panel_label key_binding", - "font.size": "var(panelPathRowFontSize)" - }, { "class": "scroll_area_control", "settings": [ @@ -2025,23 +2042,6 @@ ], "layer0.tint": "var(scrollTrack)" }, - { - "class": "progress_bar_control", - "layer0.tint": [ - "background", - 0.94 - ], - "layer0.opacity": 1 - }, - { - "class": "progress_gauge_control", - "layer0.tint": "var(colorAccent)", - "layer0.opacity": 1, - "content_margin": [ - 0, - 8 - ] - }, { "class": "status_bar", "content_margin": "var(statusbarMargin)", @@ -2092,7 +2092,7 @@ }, { "class": "sidebar_button_control", - "layer0.texture": "Meetio Theme/textures/sidebar_button.png", + "layer0.texture": "Meetio Theme/textures/actions/sidebar_button.png", "content_margin": 8, "layer0.tint": "var(statusbarIconColor)", "layer0.inner_margin": 2, @@ -2138,6 +2138,17 @@ "color": "var(statusbarLabelColor)", "font.bold": "var(statusbarLabelBold)" }, + { + "class": "symbol_container", + "content_margin": 4 + }, + { + "class": "symbol_container", + "platforms": [ + "windows" + ], + "content_margin": 4 + }, { "class": "tabset_control", "layer0.opacity": 1, @@ -2487,6 +2498,11 @@ ], "layer0.opacity": 1 }, + { + "class": "title_bar", + "bg": "var(titleBarBackground)", + "fg": "var(titleBarColor)" + }, { "class": "tool_tip_control", "layer0.tint": "var(tooltipBackground)", @@ -2732,11 +2748,6 @@ 1 ] }, - { - "class": "title_bar", - "bg": "var(titleBarBackground)", - "fg": "var(titleBarColor)" - }, { "class": "minimap_control", "settings": [ @@ -2769,17 +2780,6 @@ "speed": 20, "interpolation": "smoothstep" } - }, - { - "class": "symbol_container", - "content_margin": 4 - }, - { - "class": "symbol_container", - "platforms": [ - "windows" - ], - "content_margin": 4 } ] } \ No newline at end of file diff --git a/src/theme/files/annotations.json b/src/theme/files/annotations.json index 9a74aabf..9c748edb 100644 --- a/src/theme/files/annotations.json +++ b/src/theme/files/annotations.json @@ -2,7 +2,7 @@ { "class": "annotation_close_button", "content_margin": 8, - "layer0.texture": "Meetio Theme/textures/icon_close.png", + "layer0.texture": "Meetio Theme/textures/actions/icon_close.png", "layer0.tint": "var(colorAccent)", "layer0.opacity": { "target": 0.8, "speed": 4.0, "interpolation": "smoothstep" } }, diff --git a/src/theme/files/code_folding.json b/src/theme/files/code_folding.json index d76adee3..48d5ae58 100644 --- a/src/theme/files/code_folding.json +++ b/src/theme/files/code_folding.json @@ -1,7 +1,7 @@ [ { "class": "fold_button_control", - "layer0.texture": "Meetio Theme/textures/arrow_right.png", + "layer0.texture": "Meetio Theme/textures/navigation/arrow_right.png", "layer0.tint": "var(colorAccent)", "layer0.opacity": 0.4, "layer0.inner_margin": 0, @@ -16,7 +16,7 @@ { "class": "fold_button_control", "attributes": ["expanded"], - "layer0.texture": "Meetio Theme/textures/arrow_down.png", + "layer0.texture": "Meetio Theme/textures/navigation/arrow_down.png", "layer0.tint": "var(colorAccent)", "content_margin": [12, 12] } diff --git a/src/theme/files/open_files.json b/src/theme/files/open_files.json index 2368b308..430cfc75 100644 --- a/src/theme/files/open_files.json +++ b/src/theme/files/open_files.json @@ -1,7 +1,7 @@ [ { "class": "close_button", - "layer0.texture": "Meetio Theme/textures/icon_close.png", + "layer0.texture": "Meetio Theme/textures/actions/icon_close.png", "layer0.tint": "var(colorAccent)", "layer0.opacity": 1.0, "layer0.inner_margin": [3, 3], diff --git a/src/theme/files/panels.json b/src/theme/files/panels.json index 7d87dc45..b7dbe408 100644 --- a/src/theme/files/panels.json +++ b/src/theme/files/panels.json @@ -38,7 +38,7 @@ }, { "class": "panel_close_button", - "layer0.texture": "Meetio Theme/textures/icon_close.png", + "layer0.texture": "Meetio Theme/textures/actions/icon_close.png", "layer0.tint": "var(colorAccent)", "layer0.opacity": { "target": 0.4, "speed": 4.0, "interpolation": "smoothstep" }, "layer1.opacity": 0, diff --git a/src/theme/files/statusbar.json b/src/theme/files/statusbar.json index 1f873c96..e586b458 100644 --- a/src/theme/files/statusbar.json +++ b/src/theme/files/statusbar.json @@ -41,7 +41,7 @@ }, { "class": "sidebar_button_control", - "layer0.texture": "Meetio Theme/textures/sidebar_button.png", + "layer0.texture": "Meetio Theme/textures/actions/sidebar_button.png", "content_margin": 8, "layer0.tint": "var(statusbarIconColor)", "layer0.inner_margin": 2, diff --git a/textures/arrow_down.png b/textures/arrow_down.png deleted file mode 100644 index bc8f58f6..00000000 Binary files a/textures/arrow_down.png and /dev/null differ diff --git a/textures/arrow_down@2x.png b/textures/arrow_down@2x.png deleted file mode 100644 index c0b4158d..00000000 Binary files a/textures/arrow_down@2x.png and /dev/null differ diff --git a/textures/arrow_down@3x.png b/textures/arrow_down@3x.png deleted file mode 100644 index 84a510d0..00000000 Binary files a/textures/arrow_down@3x.png and /dev/null differ diff --git a/textures/arrow_folder_closed.png b/textures/arrow_folder_closed.png deleted file mode 100644 index 4f767bae..00000000 Binary files a/textures/arrow_folder_closed.png and /dev/null differ diff --git a/textures/arrow_folder_closed@2x.png b/textures/arrow_folder_closed@2x.png deleted file mode 100644 index b83d6b7d..00000000 Binary files a/textures/arrow_folder_closed@2x.png and /dev/null differ diff --git a/textures/arrow_folder_closed@3x.png b/textures/arrow_folder_closed@3x.png deleted file mode 100644 index bfffdb93..00000000 Binary files a/textures/arrow_folder_closed@3x.png and /dev/null differ diff --git a/textures/arrow_folder_open.png b/textures/arrow_folder_open.png deleted file mode 100644 index 46ecfbbb..00000000 Binary files a/textures/arrow_folder_open.png and /dev/null differ diff --git a/textures/arrow_folder_open@2x.png b/textures/arrow_folder_open@2x.png deleted file mode 100644 index dc92cb26..00000000 Binary files a/textures/arrow_folder_open@2x.png and /dev/null differ diff --git a/textures/arrow_folder_open@3x.png b/textures/arrow_folder_open@3x.png deleted file mode 100644 index b9e819c2..00000000 Binary files a/textures/arrow_folder_open@3x.png and /dev/null differ diff --git a/textures/arrow_left.png b/textures/arrow_left.png deleted file mode 100755 index 468408eb..00000000 Binary files a/textures/arrow_left.png and /dev/null differ diff --git a/textures/arrow_left@2x.png b/textures/arrow_left@2x.png deleted file mode 100755 index 561c094a..00000000 Binary files a/textures/arrow_left@2x.png and /dev/null differ diff --git a/textures/arrow_left@3x.png b/textures/arrow_left@3x.png deleted file mode 100644 index 87dd8c87..00000000 Binary files a/textures/arrow_left@3x.png and /dev/null differ diff --git a/textures/arrow_right.png b/textures/arrow_right.png deleted file mode 100755 index f310b41e..00000000 Binary files a/textures/arrow_right.png and /dev/null differ diff --git a/textures/arrow_right@2x.png b/textures/arrow_right@2x.png deleted file mode 100755 index c131c92a..00000000 Binary files a/textures/arrow_right@2x.png and /dev/null differ diff --git a/textures/arrow_right@3x.png b/textures/arrow_right@3x.png deleted file mode 100644 index 897127cb..00000000 Binary files a/textures/arrow_right@3x.png and /dev/null differ diff --git a/textures/arrow_up.png b/textures/arrow_up.png deleted file mode 100644 index 1749dd89..00000000 Binary files a/textures/arrow_up.png and /dev/null differ diff --git a/textures/arrow_up@2x.png b/textures/arrow_up@2x.png deleted file mode 100644 index 49a76fde..00000000 Binary files a/textures/arrow_up@2x.png and /dev/null differ diff --git a/textures/arrow_up@3x.png b/textures/arrow_up@3x.png deleted file mode 100644 index 8cd6999a..00000000 Binary files a/textures/arrow_up@3x.png and /dev/null differ diff --git a/textures/icon_close.png b/textures/icon_close.png deleted file mode 100644 index bcd02a5a..00000000 Binary files a/textures/icon_close.png and /dev/null differ diff --git a/textures/icon_close@2x.png b/textures/icon_close@2x.png deleted file mode 100644 index a31b051d..00000000 Binary files a/textures/icon_close@2x.png and /dev/null differ diff --git a/textures/icon_close@3x.png b/textures/icon_close@3x.png deleted file mode 100644 index 93cabc4a..00000000 Binary files a/textures/icon_close@3x.png and /dev/null differ diff --git a/textures/navigation/arrow-left.png b/textures/navigation/arrow-left.png deleted file mode 100644 index 32cf772a..00000000 Binary files a/textures/navigation/arrow-left.png and /dev/null differ diff --git a/textures/navigation/arrow-left@2x.png b/textures/navigation/arrow-left@2x.png deleted file mode 100644 index 29a6a12b..00000000 Binary files a/textures/navigation/arrow-left@2x.png and /dev/null differ diff --git a/textures/navigation/arrow-left@3x.png b/textures/navigation/arrow-left@3x.png deleted file mode 100644 index 52acbd6a..00000000 Binary files a/textures/navigation/arrow-left@3x.png and /dev/null differ diff --git a/textures/navigation/arrow-right.png b/textures/navigation/arrow-right.png deleted file mode 100644 index 2de7d106..00000000 Binary files a/textures/navigation/arrow-right.png and /dev/null differ diff --git a/textures/navigation/arrow-right@2x.png b/textures/navigation/arrow-right@2x.png deleted file mode 100644 index 23bb608c..00000000 Binary files a/textures/navigation/arrow-right@2x.png and /dev/null differ diff --git a/textures/navigation/arrow-right@3x.png b/textures/navigation/arrow-right@3x.png deleted file mode 100644 index 246de992..00000000 Binary files a/textures/navigation/arrow-right@3x.png and /dev/null differ diff --git a/textures/navigation/arrow-small-left.png b/textures/navigation/arrow-small-left.png deleted file mode 100644 index 67d4d0c8..00000000 Binary files a/textures/navigation/arrow-small-left.png and /dev/null differ diff --git a/textures/navigation/arrow-small-left@2x.png b/textures/navigation/arrow-small-left@2x.png deleted file mode 100644 index 3591935e..00000000 Binary files a/textures/navigation/arrow-small-left@2x.png and /dev/null differ diff --git a/textures/navigation/arrow-small-left@3x.png b/textures/navigation/arrow-small-left@3x.png deleted file mode 100644 index a85f4bb4..00000000 Binary files a/textures/navigation/arrow-small-left@3x.png and /dev/null differ diff --git a/textures/navigation/arrow-small-right.png b/textures/navigation/arrow-small-right.png deleted file mode 100644 index ee18394e..00000000 Binary files a/textures/navigation/arrow-small-right.png and /dev/null differ diff --git a/textures/navigation/arrow-small-right@2x.png b/textures/navigation/arrow-small-right@2x.png deleted file mode 100644 index f9be5c1f..00000000 Binary files a/textures/navigation/arrow-small-right@2x.png and /dev/null differ diff --git a/textures/navigation/arrow-small-right@3x.png b/textures/navigation/arrow-small-right@3x.png deleted file mode 100644 index 4bba93f0..00000000 Binary files a/textures/navigation/arrow-small-right@3x.png and /dev/null differ diff --git a/textures/navigation/chevron-down.png b/textures/navigation/chevron-down.png deleted file mode 100644 index d6ba6966..00000000 Binary files a/textures/navigation/chevron-down.png and /dev/null differ diff --git a/textures/navigation/chevron-down@2x.png b/textures/navigation/chevron-down@2x.png deleted file mode 100644 index 5891d745..00000000 Binary files a/textures/navigation/chevron-down@2x.png and /dev/null differ diff --git a/textures/navigation/chevron-down@3x.png b/textures/navigation/chevron-down@3x.png deleted file mode 100644 index 97cd881a..00000000 Binary files a/textures/navigation/chevron-down@3x.png and /dev/null differ diff --git a/textures/navigation/chevron-right.png b/textures/navigation/chevron-right.png deleted file mode 100644 index 1ce47bb0..00000000 Binary files a/textures/navigation/chevron-right.png and /dev/null differ diff --git a/textures/navigation/chevron-right@2x.png b/textures/navigation/chevron-right@2x.png deleted file mode 100644 index e6ff3d13..00000000 Binary files a/textures/navigation/chevron-right@2x.png and /dev/null differ diff --git a/textures/navigation/chevron-right@3x.png b/textures/navigation/chevron-right@3x.png deleted file mode 100644 index 74128d14..00000000 Binary files a/textures/navigation/chevron-right@3x.png and /dev/null differ diff --git a/textures/sidebar_button.png b/textures/sidebar_button.png deleted file mode 100644 index 9cd220ca..00000000 Binary files a/textures/sidebar_button.png and /dev/null differ diff --git a/textures/sidebar_button@2x.png b/textures/sidebar_button@2x.png deleted file mode 100644 index 27d6f8ef..00000000 Binary files a/textures/sidebar_button@2x.png and /dev/null differ diff --git a/textures/sidebar_button@3x.png b/textures/sidebar_button@3x.png deleted file mode 100644 index a23e51af..00000000 Binary files a/textures/sidebar_button@3x.png and /dev/null differ