From 7e00be3e3c75a5ae82bd4ed95a6b5c989a5ae3fc Mon Sep 17 00:00:00 2001 From: Mauro Reis Vieira Date: Wed, 9 Jan 2019 12:27:52 +0000 Subject: [PATCH] feat: updated icon branch. --- Meetio-Darker.sublime-theme | 1268 +++++++++-------- Meetio-Lighter.sublime-theme | 358 ++--- Meetio-Palenight.sublime-theme | 1170 +++++++-------- MT.py => Meetio.py | 0 Preferences.sublime-settings | 4 +- README.md | 2 +- assets/default/icon_branch.png | Bin 0 -> 204 bytes assets/default/icon_branch@2x.png | Bin 0 -> 284 bytes assets/default/icon_branch@3x.png | Bin 0 -> 406 bytes schemes/Meetio-Lighter.sublime-color-scheme | 10 + schemes/Meetio-Palenight.sublime-color-scheme | 50 + src/icons/svg/icon_branch.svg | 3 + src/themes/default/sidebar.json | 10 +- src/themes/default/status_bar.json | 23 +- utils/activation.py | 2 +- utils/changelog.py | 3 +- utils/links.py | 9 +- 17 files changed, 1494 insertions(+), 1418 deletions(-) rename MT.py => Meetio.py (100%) create mode 100644 assets/default/icon_branch.png create mode 100644 assets/default/icon_branch@2x.png create mode 100644 assets/default/icon_branch@3x.png create mode 100644 src/icons/svg/icon_branch.svg diff --git a/Meetio-Darker.sublime-theme b/Meetio-Darker.sublime-theme index ef609bb2..739a56e1 100644 --- a/Meetio-Darker.sublime-theme +++ b/Meetio-Darker.sublime-theme @@ -1,4 +1,44 @@ [ + { + "class": "fold_button_control", + "layer0.texture": "Meetio/assets/default/arrow_right.png", + "layer0.tint": [ + "accent", + 1 + ], + "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/assets/default/arrow_down.png", + "layer0.tint": [ + "accent", + 1 + ], + "content_margin": [ + 12, + 12 + ] + }, { "class": "popup_control", "layer0.tint": [ @@ -42,6 +82,170 @@ 1 ] }, + { + "class": "disclosure_button_control", + "layer0.texture": "Meetio/assets/default/disclosure_unexpanded.png", + "layer0.tint": [ + "accent", + 1 + ], + "layer0.opacity": { + "target": 0.3, + "speed": 4, + "interpolation": "smoothstep" + }, + "content_margin": [ + 0, + 0, + 0, + 0 + ] + }, + { + "class": "disclosure_button_control", + "attributes": [ + "expanded" + ], + "layer0.texture": "Meetio/assets/default/disclosure_expanded.png", + "layer0.tint": [ + "accent", + 1 + ] + }, + { + "class": "disclosure_button_control", + "attributes": [ + "hover" + ], + "layer0.opacity": { + "target": 0.5, + "speed": 4, + "interpolation": "smoothstep" + } + }, + { + "class": "icon_folder", + "layer0.texture": "Meetio/assets/default/folder_closed.png", + "layer0.tint": [ + "accent", + 1 + ], + "layer0.opacity": 1, + "content_margin": [ + 10, + 10 + ] + }, + { + "class": "icon_folder", + "parents": [ + { + "class": "tree_row", + "attributes": [ + "expanded" + ] + } + ], + "layer0.texture": "Meetio/assets/default/folder_open.png", + "layer0.tint": [ + "accent", + 1 + ], + "layer0.opacity": 1, + "content_margin": [ + 10, + 10 + ] + }, + { + "class": "icon_folder", + "layer0.texture": "Meetio/assets/default/arrow_folder_closed.png", + "layer0.tint": [ + "accent", + 1 + ], + "content_margin": [ + 12, + 12 + ], + "settings": [ + "meetio_arrow_folders" + ] + }, + { + "class": "icon_folder", + "parents": [ + { + "class": "tree_row", + "attributes": [ + "expanded" + ] + } + ], + "layer0.texture": "Meetio/assets/default/arrow_folder_open.png", + "layer0.tint": [ + "accent", + 1 + ], + "content_margin": [ + 12, + 12 + ], + "settings": [ + "meetio_arrow_folders" + ] + }, + { + "class": "icon_folder_loading", + "layer0.texture": { + "keyframes": [ + "Meetio/assets/default/spinner11.png", + "Meetio/assets/default/spinner10.png", + "Meetio/assets/default/spinner9.png", + "Meetio/assets/default/spinner8.png", + "Meetio/assets/default/spinner7.png", + "Meetio/assets/default/spinner6.png", + "Meetio/assets/default/spinner5.png", + "Meetio/assets/default/spinner4.png", + "Meetio/assets/default/spinner3.png", + "Meetio/assets/default/spinner2.png", + "Meetio/assets/default/spinner1.png", + "Meetio/assets/default/spinner.png" + ], + "loop": true, + "frame_time": 0.08 + }, + "layer0.tint": [ + "accent", + 1 + ], + "layer0.opacity": 1, + "content_margin": [ + 9, + 9 + ] + }, + { + "class": "icon_folder_dup", + "layer0.texture": "Meetio/assets/default/folder_dup.png", + "layer0.tint": [ + "accent", + 1 + ], + "layer0.opacity": 1, + "content_margin": [ + 9, + 9 + ] + }, + { + "class": "icon_file_type", + "layer0.opacity": 1, + "content_margin": [ + 9, + 9 + ] + }, { "class": "button_control", "layer0.tint": [ @@ -489,46 +693,6 @@ ], "layer0.opacity": 1 }, - { - "class": "fold_button_control", - "layer0.texture": "Meetio/assets/default/arrow_right.png", - "layer0.tint": [ - "accent", - 1 - ], - "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/assets/default/arrow_down.png", - "layer0.tint": [ - "accent", - 1 - ], - "content_margin": [ - 12, - 12 - ] - }, { "class": "dialog", "layer0.tint": [ @@ -558,167 +722,101 @@ ] }, { - "class": "disclosure_button_control", - "layer0.texture": "Meetio/assets/default/disclosure_unexpanded.png", + "class": "close_button", + "layer0.texture": "Meetio/assets/default/icon_close.png", "layer0.tint": [ "accent", 1 ], - "layer0.opacity": { - "target": 0.3, - "speed": 4, - "interpolation": "smoothstep" - }, + "layer0.opacity": 1, "content_margin": [ - 0, - 0, - 0, - 0 + 8, + 8 ] }, { - "class": "disclosure_button_control", + "class": "close_button", "attributes": [ - "expanded" + "hover" ], - "layer0.texture": "Meetio/assets/default/disclosure_expanded.png", + "layer0.texture": "Meetio/assets/default/icon_close.png", "layer0.tint": [ "accent", 1 - ] + ], + "layer0.opacity": 1 }, { - "class": "disclosure_button_control", + "class": "close_button", "attributes": [ - "hover" + "dirty" ], - "layer0.opacity": { - "target": 0.5, - "speed": 4, - "interpolation": "smoothstep" - } - }, - { - "class": "icon_folder", - "layer0.texture": "Meetio/assets/default/folder_closed.png", + "layer0.texture": "Meetio/assets/default/dirty_icon.png", "layer0.tint": [ "accent", 1 - ], - "layer0.opacity": 1, - "content_margin": [ - 10, - 10 ] }, { - "class": "icon_folder", - "parents": [ - { - "class": "tree_row", - "attributes": [ - "expanded" - ] - } + "class": "close_button", + "attributes": [ + "hover", + "dirty" ], - "layer0.texture": "Meetio/assets/default/folder_open.png", + "layer0.texture": "Meetio/assets/default/dirty_icon.png", "layer0.tint": [ "accent", 1 - ], - "layer0.opacity": 1, - "content_margin": [ - 10, - 10 ] }, { - "class": "icon_folder", - "layer0.texture": "Meetio/assets/default/arrow_folder_closed.png", - "layer0.tint": [ - "accent", + "class": "label_control", + "fg": [ + "foreground", 1 ], - "content_margin": [ - 12, - 12 - ], - "settings": [ - "meetio_arrow_folders" - ] + "font.bold": false }, { - "class": "icon_folder", + "class": "label_control", "parents": [ { - "class": "tree_row", - "attributes": [ - "expanded" - ] + "class": "button_control" } ], - "layer0.texture": "Meetio/assets/default/arrow_folder_open.png", - "layer0.tint": [ - "accent", + "color": [ + "foreground", 1 ], - "content_margin": [ - 12, - 12 - ], - "settings": [ - "meetio_arrow_folders" - ] + "font.bold": true }, { - "class": "icon_folder_loading", - "layer0.texture": { - "keyframes": [ - "Meetio/assets/default/spinner11.png", - "Meetio/assets/default/spinner10.png", - "Meetio/assets/default/spinner9.png", - "Meetio/assets/default/spinner8.png", - "Meetio/assets/default/spinner7.png", - "Meetio/assets/default/spinner6.png", - "Meetio/assets/default/spinner5.png", - "Meetio/assets/default/spinner4.png", - "Meetio/assets/default/spinner3.png", - "Meetio/assets/default/spinner2.png", - "Meetio/assets/default/spinner1.png", - "Meetio/assets/default/spinner.png" - ], - "loop": true, - "frame_time": 0.08 - }, - "layer0.tint": [ - "accent", + "class": "label_control", + "parents": [ + { + "class": "panel_control" + } + ], + "color": [ + "foreground", 1 ], - "layer0.opacity": 1, - "content_margin": [ - 9, - 9 - ] + "font.bold": true }, { - "class": "icon_folder_dup", - "layer0.texture": "Meetio/assets/default/folder_dup.png", - "layer0.tint": [ - "accent", + "class": "title_label_control", + "fg": [ + "foreground", 1 ], - "layer0.opacity": 1, - "content_margin": [ - 9, - 9 - ] + "font.size": 24 }, { - "class": "icon_file_type", - "layer0.opacity": 1, - "content_margin": [ - 9, - 9 + "class": "label_control", + "parents": [ + { + "class": "button_control" + } ] }, { @@ -868,106 +966,250 @@ "layer1.opacity": 1 }, { - "class": "label_control", - "fg": [ - "foreground", - 1 + "class": "sidebar_container", + "layer0.tint": [ + "background", + 0.92 ], - "font.bold": false + "layer0.opacity": 1, + "content_margin": 0 }, { - "class": "label_control", - "parents": [ - { - "class": "button_control" - } - ], - "color": [ - "foreground", - 1 + "class": "sidebar_tree", + "row_padding": [ + 20, + 6 ], - "font.bold": true + "indent": 10, + "indent_offset": 2, + "indent_top_level": false, + "dark_content": false, + "spacer_rows": true }, { - "class": "label_control", - "parents": [ - { - "class": "panel_control" - } - ], - "color": [ - "foreground", - 1 + "class": "sidebar_tree", + "platforms": [ + "windows" ], - "font.bold": true + "row_padding": [ + 16, + 2, + 16, + 2 + ] }, { - "class": "title_label_control", - "fg": [ - "foreground", - 1 + "class": "sidebar_tree", + "settings": [ + "meetio_compact_sidebar" ], - "font.size": 24 - }, - { - "class": "label_control", - "parents": [ - { - "class": "button_control" - } + "row_padding": [ + 16, + 3 ] }, { - "class": "close_button", - "layer0.texture": "Meetio/assets/default/icon_close.png", - "layer0.tint": [ - "accent", - 1 + "class": "tree_row", + "attributes": [ + "!hover" ], - "layer0.opacity": 1, - "content_margin": [ - 8, - 8 - ] + "layer0.opacity": 0 }, { - "class": "close_button", + "class": "tree_row", "attributes": [ + "selectable", "hover" ], - "layer0.texture": "Meetio/assets/default/icon_close.png", "layer0.tint": [ - "accent", - 1 + "foreground", + 0.6 ], - "layer0.opacity": 1 + "layer0.opacity": 0.1 }, { - "class": "close_button", + "class": "tree_row", "attributes": [ - "dirty" + "selected" ], - "layer0.texture": "Meetio/assets/default/dirty_icon.png", "layer0.tint": [ - "accent", - 1 - ] - }, - { - "class": "close_button", - "attributes": [ - "hover", - "dirty" + "foreground", + 0.1 ], - "layer0.texture": "Meetio/assets/default/dirty_icon.png", - "layer0.tint": [ - "accent", - 1 - ] + "layer0.opacity": 1 }, { - "class": "panel_control", - "layer0.tint": [ + "class": "sidebar_heading", + "color": [ + "foreground", + 0.4 + ], + "font.bold": true, + "font.size": 12 + }, + { + "class": "sidebar_heading", + "parents": [ + { + "class": "tree_row", + "attributes": [ + "selected" + ] + } + ] + }, + { + "class": "sidebar_label", + "color": [ + "foreground", + 0.8 + ], + "font.size": 12, + "font.bold": false, + "font.italic": false + }, + { + "class": "sidebar_label", + "settings": [ + "meetio_sidebar_font_big" + ], + "font.size": 14 + }, + { + "class": "sidebar_label", + "parents": [ + { + "class": "tree_row", + "attributes": [ + "hover" + ] + } + ], + "color": [ + "foreground", + 0.8 + ] + }, + { + "class": "sidebar_label", + "parents": [ + { + "class": "tree_row", + "attributes": [ + "selected" + ] + } + ], + "font.bold": false, + "color": [ + "foreground", + 0.9 + ] + }, + { + "class": "sidebar_label", + "parents": [ + { + "class": "tree_row", + "attributes": [ + "expandable" + ] + } + ], + "color": [ + "foreground", + 0.8 + ] + }, + { + "class": "sidebar_label", + "parents": [ + { + "class": "tree_row", + "attributes": [ + "expandable" + ] + } + ], + "settings": [ + "bold_folder_labels" + ], + "font.bold": true + }, + { + "class": "sidebar_label", + "parents": [ + { + "class": "tree_row", + "attributes": [ + "expandable", + "selected" + ] + } + ], + "color": [ + 69, + 90, + 100 + ] + }, + { + "class": "sidebar_label", + "parents": [ + { + "class": "tree_row", + "attributes": [ + "expanded" + ] + } + ], + "color": [ + "accent", + 1 + ] + }, + { + "class": "sidebar_label", + "parents": [ + { + "class": "tree_row", + "attributes": [ + "expanded" + ] + } + ], + "settings": [ + "bold_folder_labels" + ], + "font.bold": true + }, + { + "class": "sidebar_label", + "parents": [ + { + "class": "tree_row", + "attributes": [ + "expanded", + "selected" + ] + } + ], + "color": [ + 69, + 90, + 100 + ] + }, + { + "class": "sidebar_label", + "attributes": [ + "transient" + ], + "font.italic": false + }, + { + "class": "panel_control", + "layer0.tint": [ "background", 0.94 ], @@ -1335,384 +1577,89 @@ "layer0.inner_margin": 2, "content_margin": [ 0, - 12 - ] - }, - { - "class": "scroll_corner_control", - "layer0.opacity": 1, - "tint_index": 0 - }, - { - "class": "scroll_track_control", - "attributes": [ - "horizontal" - ], - "layer0.texture": "Meetio/assets/default/scroll_bar_horiz.png", - "content_margin": [ - 4, - 4, - 4, - 3 - ] - }, - { - "class": "puck_control", - "attributes": [ - "horizontal" - ], - "layer0.texture": "Meetio/assets/default/scroll_puck_horiz.png", - "content_margin": [ - 12, - 0 - ] - }, - { - "class": "scroll_bar_control", - "parents": [ - { - "class": "sidebar_container" - } - ], - "layer0.opacity": 0 - }, - { - "class": "scroll_corner_control", - "parents": [ - { - "class": "sidebar_container" - } - ], - "layer0.opacity": 0 - }, - { - "class": "scroll_bar_control", - "parents": [ - { - "class": "overlay_control" - } - ], - "layer0.opacity": 0, - "content_margin": [ - 4, - 0, - 0, - 0 - ] - }, - { - "class": "sidebar_container", - "layer0.tint": [ - "background", - 0.92 - ], - "layer0.opacity": 1, - "content_margin": 0 - }, - { - "class": "sidebar_tree", - "row_padding": [ - 16, - 3 - ], - "indent": 16, - "indent_offset": 16, - "indent_top_level": false, - "dark_content": false, - "spacer_rows": true - }, - { - "class": "sidebar_tree", - "platforms": [ - "windows" - ], - "row_padding": [ - 16, - 2, - 16, - 2 - ] - }, - { - "class": "sidebar_tree", - "settings": [ - "meetio_sidebar_large" - ], - "row_padding": [ - 16, - 6 - ] - }, - { - "class": "tree_row", - "attributes": [ - "!hover" - ], - "layer0.opacity": 0 - }, - { - "class": "tree_row", - "attributes": [ - "selectable", - "hover" - ], - "layer0.tint": [ - "foreground", - 0.6 - ], - "layer0.opacity": 0.1 - }, - { - "class": "tree_row", - "attributes": [ - "selected" - ], - "layer0.tint": [ - "foreground", - 0.1 - ], - "layer0.opacity": 1 - }, - { - "class": "sidebar_heading", - "color": [ - "foreground", - 0.4 - ], - "font.bold": true, - "font.size": 12 - }, - { - "class": "sidebar_heading", - "parents": [ - { - "class": "tree_row", - "attributes": [ - "selected" - ] - } - ] - }, - { - "class": "sidebar_label", - "color": [ - "foreground", - 0.8 - ], - "font.size": 12, - "font.bold": false, - "font.italic": false - }, - { - "class": "sidebar_label", - "settings": [ - "meetio_sidebar_font_big" - ], - "font.size": 14 - }, - { - "class": "sidebar_label", - "parents": [ - { - "class": "tree_row", - "attributes": [ - "hover" - ] - } - ], - "color": [ - "foreground", - 0.8 - ] - }, - { - "class": "sidebar_label", - "parents": [ - { - "class": "tree_row", - "attributes": [ - "selected" - ] - } - ], - "font.bold": false, - "color": [ - "foreground", - 0.9 - ] - }, - { - "class": "sidebar_label", - "parents": [ - { - "class": "tree_row", - "attributes": [ - "expandable" - ] - } - ], - "color": [ - "foreground", - 0.8 - ] - }, - { - "class": "sidebar_label", - "parents": [ - { - "class": "tree_row", - "attributes": [ - "expandable" - ] - } - ], - "settings": [ - "bold_folder_labels" - ], - "font.bold": true - }, - { - "class": "sidebar_label", - "parents": [ - { - "class": "tree_row", - "attributes": [ - "expandable", - "selected" - ] - } - ], - "color": [ - 69, - 90, - 100 - ] - }, - { - "class": "sidebar_label", - "parents": [ - { - "class": "tree_row", - "attributes": [ - "expanded" - ] - } - ], - "color": [ - "accent", - 1 - ] - }, - { - "class": "sidebar_label", - "parents": [ - { - "class": "tree_row", - "attributes": [ - "expanded" - ] - } - ], - "settings": [ - "bold_folder_labels" - ], - "font.bold": true - }, - { - "class": "sidebar_label", - "parents": [ - { - "class": "tree_row", - "attributes": [ - "expanded", - "selected" - ] - } - ], - "color": [ - 69, - 90, - 100 - ] - }, - { - "class": "sidebar_label", - "attributes": [ - "transient" - ], - "font.italic": false - }, - { - "class": "status_bar", - "layer0.tint": "#4A616C", - "layer0.opacity": 1, - "content_margin": [ - 10, - 2, - 0, - 2 + 12 ] }, { - "class": "panel_button_control", - "layer0.texture": "Meetio/assets/default/overflow_menu.png", - "layer0.tint": [ - "accent", - 1 - ], + "class": "scroll_corner_control", "layer0.opacity": 1, - "content_margin": [ - 8, - 8 - ] + "tint_index": 0 }, { - "class": "panel_button_control", + "class": "scroll_track_control", "attributes": [ - "hover" + "horizontal" ], - "layer0.texture": "Meetio/assets/default/overflow_menu.png", - "layer0.tint": [ - "accent", - 1 + "layer0.texture": "Meetio/assets/default/scroll_bar_horiz.png", + "content_margin": [ + 4, + 4, + 4, + 3 ] }, { - "class": "status_container", + "class": "puck_control", + "attributes": [ + "horizontal" + ], + "layer0.texture": "Meetio/assets/default/scroll_puck_horiz.png", "content_margin": [ - 8, - 0, - 0, + 12, 0 ] }, { - "class": "status_button", - "content_margin": [ - 10, - 0, - 10, - 0 + "class": "scroll_bar_control", + "parents": [ + { + "class": "sidebar_container" + } ], - "min_size": [ - 80, - 0 - ] + "layer0.opacity": 0 }, { - "class": "label_control", + "class": "scroll_corner_control", "parents": [ { - "class": "status_bar" + "class": "sidebar_container" } ], - "font.size": 11, - "color": [ - 255, - 255, - 255 + "layer0.opacity": 0 + }, + { + "class": "scroll_bar_control", + "parents": [ + { + "class": "overlay_control" + } ], - "font.bold": false + "layer0.opacity": 0, + "content_margin": [ + 4, + 0, + 0, + 0 + ] + }, + { + "class": "title_bar", + "bg": "rgb(115, 128, 140)", + "fg": "rgb(235, 237, 239)" + }, + { + "class": "title_bar", + "settings": [ + "meetio_titlebar" + ], + "bg": [ + "background", + 0.92 + ], + "fg": [ + "foreground", + 1 + ] }, { "class": "tabset_control", @@ -2088,24 +2035,79 @@ "layer0.opacity": 0.8 }, { - "class": "title_bar", - "bg": "rgb(115, 128, 140)", - "fg": "rgb(235, 237, 239)" + "class": "status_bar", + "layer0.tint": "#4A616C", + "layer0.opacity": 1, + "content_margin": [ + 10, + 2, + 0, + 2 + ] }, { - "class": "title_bar", - "settings": [ - "meetio_titlebar" + "class": "panel_button_control", + "layer0.texture": "Meetio/assets/default/overflow_menu.png", + "layer0.tint": "#fff", + "layer0.opacity": 1, + "content_margin": 9, + "layer0.inner_margin": 4 + }, + { + "class": "vcs_branch_icon", + "layer0.texture": "Meetio/assets/default/icon_branch.png", + "layer0.tint": "#fff", + "layer0.opacity": 1, + "content_margin": 9, + "layer0.inner_margin": 2 + }, + { + "class": "panel_button_control", + "attributes": [ + "hover" ], - "bg": [ - "background", - 0.92 + "layer0.opacity": 0.8 + }, + { + "class": "vcs_branch_icon", + "attributes": [ + "hover" ], - "fg": [ - "foreground", - 1 + "layer0.opacity": 0.8 + }, + { + "class": "status_container", + "content_margin": [ + 8, + 0, + 0, + 0 + ] + }, + { + "class": "status_button", + "content_margin": [ + 10, + 0, + 10, + 0 + ], + "min_size": [ + 80, + 0 ] }, + { + "class": "label_control", + "parents": [ + { + "class": "status_bar" + } + ], + "font.size": 11, + "color": "#fff", + "font.bold": false + }, { "class": "tool_tip_control", "layer0.tint": [ @@ -2125,51 +2127,6 @@ 1 ] }, - { - "class": "grid_layout_control", - "border_color": "rgba(255, 255, 255, 0.25)", - "border_size": 2 - }, - { - "class": "minimap_control", - "settings": [ - "always_show_minimap_viewport" - ], - "viewport_color": "rgb(128, 128, 128, 0.18)", - "viewport_opacity": 1 - }, - { - "class": "minimap_control", - "settings": [ - "!always_show_minimap_viewport" - ], - "viewport_color": "rgba(128, 128, 128, 0.25)", - "viewport_opacity": { - "target": 0, - "speed": 4, - "interpolation": "smoothstep" - } - }, - { - "class": "minimap_control", - "attributes": [ - "hover" - ], - "settings": [ - "!always_show_minimap_viewport" - ], - "viewport_color": "rgba(128, 128, 128, 0.25)", - "viewport_opacity": { - "target": 1, - "speed": 20, - "interpolation": "smoothstep" - } - }, - { - "class": "table_row", - "layer0.tint": "rgb(255, 255, 255)", - "layer0.opacity": 0 - }, { "class": "vcs_status_badge", "parents": [ @@ -2311,5 +2268,50 @@ } ], "color": "rgb(211, 49, 49)" + }, + { + "class": "grid_layout_control", + "border_color": "rgba(255, 255, 255, 0.25)", + "border_size": 2 + }, + { + "class": "minimap_control", + "settings": [ + "always_show_minimap_viewport" + ], + "viewport_color": "rgb(128, 128, 128, 0.18)", + "viewport_opacity": 1 + }, + { + "class": "minimap_control", + "settings": [ + "!always_show_minimap_viewport" + ], + "viewport_color": "rgba(128, 128, 128, 0.25)", + "viewport_opacity": { + "target": 0, + "speed": 4, + "interpolation": "smoothstep" + } + }, + { + "class": "minimap_control", + "attributes": [ + "hover" + ], + "settings": [ + "!always_show_minimap_viewport" + ], + "viewport_color": "rgba(128, 128, 128, 0.25)", + "viewport_opacity": { + "target": 1, + "speed": 20, + "interpolation": "smoothstep" + } + }, + { + "class": "table_row", + "layer0.tint": "rgb(255, 255, 255)", + "layer0.opacity": 0 } ] \ No newline at end of file diff --git a/Meetio-Lighter.sublime-theme b/Meetio-Lighter.sublime-theme index ef609bb2..28555986 100644 --- a/Meetio-Lighter.sublime-theme +++ b/Meetio-Lighter.sublime-theme @@ -42,6 +42,46 @@ 1 ] }, + { + "class": "fold_button_control", + "layer0.texture": "Meetio/assets/default/arrow_right.png", + "layer0.tint": [ + "accent", + 1 + ], + "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/assets/default/arrow_down.png", + "layer0.tint": [ + "accent", + 1 + ], + "content_margin": [ + 12, + 12 + ] + }, { "class": "button_control", "layer0.tint": [ @@ -489,46 +529,6 @@ ], "layer0.opacity": 1 }, - { - "class": "fold_button_control", - "layer0.texture": "Meetio/assets/default/arrow_right.png", - "layer0.tint": [ - "accent", - 1 - ], - "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/assets/default/arrow_down.png", - "layer0.tint": [ - "accent", - 1 - ], - "content_margin": [ - 12, - 12 - ] - }, { "class": "dialog", "layer0.tint": [ @@ -867,56 +867,6 @@ ], "layer1.opacity": 1 }, - { - "class": "label_control", - "fg": [ - "foreground", - 1 - ], - "font.bold": false - }, - { - "class": "label_control", - "parents": [ - { - "class": "button_control" - } - ], - "color": [ - "foreground", - 1 - ], - "font.bold": true - }, - { - "class": "label_control", - "parents": [ - { - "class": "panel_control" - } - ], - "color": [ - "foreground", - 1 - ], - "font.bold": true - }, - { - "class": "title_label_control", - "fg": [ - "foreground", - 1 - ], - "font.size": 24 - }, - { - "class": "label_control", - "parents": [ - { - "class": "button_control" - } - ] - }, { "class": "close_button", "layer0.texture": "Meetio/assets/default/icon_close.png", @@ -1127,6 +1077,56 @@ "interpolation": "smoothstep" } }, + { + "class": "label_control", + "fg": [ + "foreground", + 1 + ], + "font.bold": false + }, + { + "class": "label_control", + "parents": [ + { + "class": "button_control" + } + ], + "color": [ + "foreground", + 1 + ], + "font.bold": true + }, + { + "class": "label_control", + "parents": [ + { + "class": "panel_control" + } + ], + "color": [ + "foreground", + 1 + ], + "font.bold": true + }, + { + "class": "title_label_control", + "fg": [ + "foreground", + 1 + ], + "font.size": 24 + }, + { + "class": "label_control", + "parents": [ + { + "class": "button_control" + } + ] + }, { "class": "mini_quick_panel_row", "layer0.tint": [ @@ -1412,11 +1412,11 @@ { "class": "sidebar_tree", "row_padding": [ - 16, - 3 + 20, + 6 ], - "indent": 16, - "indent_offset": 16, + "indent": 10, + "indent_offset": 2, "indent_top_level": false, "dark_content": false, "spacer_rows": true @@ -1436,11 +1436,11 @@ { "class": "sidebar_tree", "settings": [ - "meetio_sidebar_large" + "meetio_compact_sidebar" ], "row_padding": [ 16, - 6 + 3 ] }, { @@ -1656,26 +1656,32 @@ { "class": "panel_button_control", "layer0.texture": "Meetio/assets/default/overflow_menu.png", - "layer0.tint": [ - "accent", - 1 - ], + "layer0.tint": "#fff", "layer0.opacity": 1, - "content_margin": [ - 8, - 8 - ] + "content_margin": 9, + "layer0.inner_margin": 4 + }, + { + "class": "vcs_branch_icon", + "layer0.texture": "Meetio/assets/default/icon_branch.png", + "layer0.tint": "#fff", + "layer0.opacity": 1, + "content_margin": 9, + "layer0.inner_margin": 2 }, { "class": "panel_button_control", "attributes": [ "hover" ], - "layer0.texture": "Meetio/assets/default/overflow_menu.png", - "layer0.tint": [ - "accent", - 1 - ] + "layer0.opacity": 0.8 + }, + { + "class": "vcs_branch_icon", + "attributes": [ + "hover" + ], + "layer0.opacity": 0.8 }, { "class": "status_container", @@ -1707,13 +1713,28 @@ } ], "font.size": 11, - "color": [ - 255, - 255, - 255 - ], + "color": "#fff", "font.bold": false }, + { + "class": "title_bar", + "bg": "rgb(115, 128, 140)", + "fg": "rgb(235, 237, 239)" + }, + { + "class": "title_bar", + "settings": [ + "meetio_titlebar" + ], + "bg": [ + "background", + 0.92 + ], + "fg": [ + "foreground", + 1 + ] + }, { "class": "tabset_control", "layer0.opacity": 1, @@ -2087,25 +2108,6 @@ ], "layer0.opacity": 0.8 }, - { - "class": "title_bar", - "bg": "rgb(115, 128, 140)", - "fg": "rgb(235, 237, 239)" - }, - { - "class": "title_bar", - "settings": [ - "meetio_titlebar" - ], - "bg": [ - "background", - 0.92 - ], - "fg": [ - "foreground", - 1 - ] - }, { "class": "tool_tip_control", "layer0.tint": [ @@ -2125,51 +2127,6 @@ 1 ] }, - { - "class": "grid_layout_control", - "border_color": "rgba(255, 255, 255, 0.25)", - "border_size": 2 - }, - { - "class": "minimap_control", - "settings": [ - "always_show_minimap_viewport" - ], - "viewport_color": "rgb(128, 128, 128, 0.18)", - "viewport_opacity": 1 - }, - { - "class": "minimap_control", - "settings": [ - "!always_show_minimap_viewport" - ], - "viewport_color": "rgba(128, 128, 128, 0.25)", - "viewport_opacity": { - "target": 0, - "speed": 4, - "interpolation": "smoothstep" - } - }, - { - "class": "minimap_control", - "attributes": [ - "hover" - ], - "settings": [ - "!always_show_minimap_viewport" - ], - "viewport_color": "rgba(128, 128, 128, 0.25)", - "viewport_opacity": { - "target": 1, - "speed": 20, - "interpolation": "smoothstep" - } - }, - { - "class": "table_row", - "layer0.tint": "rgb(255, 255, 255)", - "layer0.opacity": 0 - }, { "class": "vcs_status_badge", "parents": [ @@ -2311,5 +2268,50 @@ } ], "color": "rgb(211, 49, 49)" + }, + { + "class": "grid_layout_control", + "border_color": "rgba(255, 255, 255, 0.25)", + "border_size": 2 + }, + { + "class": "minimap_control", + "settings": [ + "always_show_minimap_viewport" + ], + "viewport_color": "rgb(128, 128, 128, 0.18)", + "viewport_opacity": 1 + }, + { + "class": "minimap_control", + "settings": [ + "!always_show_minimap_viewport" + ], + "viewport_color": "rgba(128, 128, 128, 0.25)", + "viewport_opacity": { + "target": 0, + "speed": 4, + "interpolation": "smoothstep" + } + }, + { + "class": "minimap_control", + "attributes": [ + "hover" + ], + "settings": [ + "!always_show_minimap_viewport" + ], + "viewport_color": "rgba(128, 128, 128, 0.25)", + "viewport_opacity": { + "target": 1, + "speed": 20, + "interpolation": "smoothstep" + } + }, + { + "class": "table_row", + "layer0.tint": "rgb(255, 255, 255)", + "layer0.opacity": 0 } ] \ No newline at end of file diff --git a/Meetio-Palenight.sublime-theme b/Meetio-Palenight.sublime-theme index 8cc987de..fb991172 100644 --- a/Meetio-Palenight.sublime-theme +++ b/Meetio-Palenight.sublime-theme @@ -42,6 +42,238 @@ 1 ] }, + { + "class": "fold_button_control", + "layer0.texture": "Meetio/assets/default/arrow_right.png", + "layer0.tint": [ + "accent", + 1 + ], + "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/assets/default/arrow_down.png", + "layer0.tint": [ + "accent", + 1 + ], + "content_margin": [ + 12, + 12 + ] + }, + { + "class": "dialog", + "layer0.tint": [ + "background", + 0.94 + ], + "layer0.opacity": 1 + }, + { + "class": "progress_bar_control", + "layer0.tint": [ + "background", + 1 + ], + "layer0.opacity": 1 + }, + { + "class": "progress_gauge_control", + "layer0.tint": [ + "background", + 0.5 + ], + "layer0.opacity": 1, + "content_margin": [ + 0, + 8 + ] + }, + { + "class": "disclosure_button_control", + "layer0.texture": "Meetio/assets/default/disclosure_unexpanded.png", + "layer0.tint": [ + "accent", + 1 + ], + "layer0.opacity": { + "target": 0.3, + "speed": 4, + "interpolation": "smoothstep" + }, + "content_margin": [ + 0, + 0, + 0, + 0 + ] + }, + { + "class": "disclosure_button_control", + "attributes": [ + "expanded" + ], + "layer0.texture": "Meetio/assets/default/disclosure_expanded.png", + "layer0.tint": [ + "accent", + 1 + ] + }, + { + "class": "disclosure_button_control", + "attributes": [ + "hover" + ], + "layer0.opacity": { + "target": 0.5, + "speed": 4, + "interpolation": "smoothstep" + } + }, + { + "class": "icon_folder", + "layer0.texture": "Meetio/assets/default/folder_closed.png", + "layer0.tint": [ + "accent", + 1 + ], + "layer0.opacity": 1, + "content_margin": [ + 10, + 10 + ] + }, + { + "class": "icon_folder", + "parents": [ + { + "class": "tree_row", + "attributes": [ + "expanded" + ] + } + ], + "layer0.texture": "Meetio/assets/default/folder_open.png", + "layer0.tint": [ + "accent", + 1 + ], + "layer0.opacity": 1, + "content_margin": [ + 10, + 10 + ] + }, + { + "class": "icon_folder", + "layer0.texture": "Meetio/assets/default/arrow_folder_closed.png", + "layer0.tint": [ + "accent", + 1 + ], + "content_margin": [ + 12, + 12 + ], + "settings": [ + "meetio_arrow_folders" + ] + }, + { + "class": "icon_folder", + "parents": [ + { + "class": "tree_row", + "attributes": [ + "expanded" + ] + } + ], + "layer0.texture": "Meetio/assets/default/arrow_folder_open.png", + "layer0.tint": [ + "accent", + 1 + ], + "content_margin": [ + 12, + 12 + ], + "settings": [ + "meetio_arrow_folders" + ] + }, + { + "class": "icon_folder_loading", + "layer0.texture": { + "keyframes": [ + "Meetio/assets/default/spinner11.png", + "Meetio/assets/default/spinner10.png", + "Meetio/assets/default/spinner9.png", + "Meetio/assets/default/spinner8.png", + "Meetio/assets/default/spinner7.png", + "Meetio/assets/default/spinner6.png", + "Meetio/assets/default/spinner5.png", + "Meetio/assets/default/spinner4.png", + "Meetio/assets/default/spinner3.png", + "Meetio/assets/default/spinner2.png", + "Meetio/assets/default/spinner1.png", + "Meetio/assets/default/spinner.png" + ], + "loop": true, + "frame_time": 0.08 + }, + "layer0.tint": [ + "accent", + 1 + ], + "layer0.opacity": 1, + "content_margin": [ + 9, + 9 + ] + }, + { + "class": "icon_folder_dup", + "layer0.texture": "Meetio/assets/default/folder_dup.png", + "layer0.tint": [ + "accent", + 1 + ], + "layer0.opacity": 1, + "content_margin": [ + 9, + 9 + ] + }, + { + "class": "icon_file_type", + "layer0.opacity": 1, + "content_margin": [ + 9, + 9 + ] + }, { "class": "button_control", "layer0.tint": [ @@ -490,93 +722,25 @@ "layer0.opacity": 1 }, { - "class": "fold_button_control", - "layer0.texture": "Meetio/assets/default/arrow_right.png", + "class": "text_line_control", + "layer0.texture": "", + "layer0.opacity": 1, + "layer0.inner_margin": [ + 20, + 5, + 20, + 5 + ], + "tint_index": 1, "layer0.tint": [ - "accent", + "background", 1 ], - "layer0.opacity": 0.4, - "layer0.inner_margin": 0, "content_margin": [ + 10, + 8, 12, - 12 - ] - }, - { - "class": "fold_button_control", - "attributes": [ - "hover" - ], - "layer0.opacity": 1, - "content_margin": [ - 12, - 12 - ] - }, - { - "class": "fold_button_control", - "attributes": [ - "expanded" - ], - "layer0.texture": "Meetio/assets/default/arrow_down.png", - "layer0.tint": [ - "accent", - 1 - ], - "content_margin": [ - 12, - 12 - ] - }, - { - "class": "dialog", - "layer0.tint": [ - "background", - 0.94 - ], - "layer0.opacity": 1 - }, - { - "class": "progress_bar_control", - "layer0.tint": [ - "background", - 1 - ], - "layer0.opacity": 1 - }, - { - "class": "progress_gauge_control", - "layer0.tint": [ - "background", - 0.5 - ], - "layer0.opacity": 1, - "content_margin": [ - 0, - 8 - ] - }, - { - "class": "text_line_control", - "layer0.texture": "", - "layer0.opacity": 1, - "layer0.inner_margin": [ - 20, - 5, - 20, - 5 - ], - "tint_index": 1, - "layer0.tint": [ - "background", - 1 - ], - "content_margin": [ - 10, - 8, - 12, - 8 + 8 ] }, { @@ -704,266 +868,264 @@ "layer1.opacity": 1 }, { - "class": "disclosure_button_control", - "layer0.texture": "Meetio/assets/default/disclosure_unexpanded.png", - "layer0.tint": [ - "accent", + "class": "label_control", + "fg": [ + "foreground", 1 ], - "layer0.opacity": { - "target": 0.3, - "speed": 4, - "interpolation": "smoothstep" - }, - "content_margin": [ - 0, - 0, - 0, - 0 - ] + "font.bold": false }, { - "class": "disclosure_button_control", - "attributes": [ - "expanded" + "class": "label_control", + "parents": [ + { + "class": "button_control" + } ], - "layer0.texture": "Meetio/assets/default/disclosure_expanded.png", - "layer0.tint": [ - "accent", + "color": [ + "foreground", 1 - ] + ], + "font.bold": true }, { - "class": "disclosure_button_control", - "attributes": [ - "hover" + "class": "label_control", + "parents": [ + { + "class": "panel_control" + } ], - "layer0.opacity": { - "target": 0.5, - "speed": 4, - "interpolation": "smoothstep" - } + "color": [ + "foreground", + 1 + ], + "font.bold": true }, { - "class": "icon_folder", - "layer0.texture": "Meetio/assets/default/folder_closed.png", - "layer0.tint": [ - "accent", + "class": "title_label_control", + "fg": [ + "foreground", 1 ], - "layer0.opacity": 1, - "content_margin": [ - 10, - 10 - ] + "font.size": 24 }, { - "class": "icon_folder", + "class": "label_control", "parents": [ { - "class": "tree_row", - "attributes": [ - "expanded" - ] + "class": "button_control" } - ], - "layer0.texture": "Meetio/assets/default/folder_open.png", + ] + }, + { + "class": "close_button", + "layer0.texture": "Meetio/assets/default/icon_close.png", "layer0.tint": [ "accent", 1 ], "layer0.opacity": 1, "content_margin": [ - 10, - 10 + 8, + 8 ] }, { - "class": "icon_folder", - "layer0.texture": "Meetio/assets/default/arrow_folder_closed.png", + "class": "close_button", + "attributes": [ + "hover" + ], + "layer0.texture": "Meetio/assets/default/icon_close.png", "layer0.tint": [ "accent", 1 ], - "content_margin": [ - 12, - 12 - ], - "settings": [ - "meetio_arrow_folders" - ] + "layer0.opacity": 1 }, { - "class": "icon_folder", - "parents": [ - { - "class": "tree_row", - "attributes": [ - "expanded" - ] - } + "class": "close_button", + "attributes": [ + "dirty" ], - "layer0.texture": "Meetio/assets/default/arrow_folder_open.png", + "layer0.texture": "Meetio/assets/default/dirty_icon.png", "layer0.tint": [ "accent", 1 - ], - "content_margin": [ - 12, - 12 - ], - "settings": [ - "meetio_arrow_folders" ] }, { - "class": "icon_folder_loading", - "layer0.texture": { - "keyframes": [ - "Meetio/assets/default/spinner11.png", - "Meetio/assets/default/spinner10.png", - "Meetio/assets/default/spinner9.png", - "Meetio/assets/default/spinner8.png", - "Meetio/assets/default/spinner7.png", - "Meetio/assets/default/spinner6.png", - "Meetio/assets/default/spinner5.png", - "Meetio/assets/default/spinner4.png", - "Meetio/assets/default/spinner3.png", - "Meetio/assets/default/spinner2.png", - "Meetio/assets/default/spinner1.png", - "Meetio/assets/default/spinner.png" - ], - "loop": true, - "frame_time": 0.08 - }, + "class": "close_button", + "attributes": [ + "hover", + "dirty" + ], + "layer0.texture": "Meetio/assets/default/dirty_icon.png", "layer0.tint": [ "accent", 1 - ], - "layer0.opacity": 1, - "content_margin": [ - 9, - 9 ] }, { - "class": "icon_folder_dup", - "layer0.texture": "Meetio/assets/default/folder_dup.png", + "class": "panel_control", "layer0.tint": [ - "accent", - 1 + "background", + 0.94 + ], + "layer0.inner_margin": [ + 2, + 2, + 2, + 2 ], "layer0.opacity": 1, "content_margin": [ - 9, - 9 + 6, + 12, + 6, + 12 ] }, { - "class": "icon_file_type", + "class": "overlay_control", + "layer0.texture": "Meetio/assets/default/overlay_bg.png", + "layer0.inner_margin": [ + 24, + 4, + 24, + 33 + ], "layer0.opacity": 1, - "content_margin": [ - 9, - 9 - ] - }, - { - "class": "label_control", - "fg": [ - "foreground", + "layer0.tint": [ + "background", 1 ], - "font.bold": false + "layer1.texture": "Meetio/assets/default/quick_panel_background.png", + "layer1.inner_margin": [ + 16, + 0, + 16, + 25 + ], + "layer1.opacity": 1, + "layer.tint": [ + "background", + 1 + ], + "content_margin": [ + 12, + 4, + 13, + 28 + ] }, { - "class": "label_control", + "class": "panel_control", "parents": [ { - "class": "button_control" + "class": "overlay_control" } ], - "color": [ - "foreground", + "layer0.opacity": 1, + "layer0.inner_margin": [ + 32, + 0, + 32, + 2 + ], + "layer0.tint": [ + "background", 1 ], - "font.bold": true + "layer1.inner_margin": [ + 32, + 0, + 32, + 2 + ], + "layer1.opacity": 1, + "content_margin": [ + 32, + 8, + 32, + 8 + ] }, { - "class": "label_control", + "class": "panel_control", "parents": [ { - "class": "panel_control" + "class": "switch_project_window" } ], - "color": [ - "foreground", + "layer0.inner_margin": [ + 32, + 0, + 32, + 2 + ], + "layer0.tint": [ + "background", 1 ], - "font.bold": true - }, - { - "class": "title_label_control", - "fg": [ - "foreground", + "layer1.inner_margin": [ + 32, + 0, + 32, + 2 + ], + "layer1.tint": [ + "background", 1 ], - "font.size": 24 + "content_margin": [ + 32, + 8, + 32, + 8 + ] }, { - "class": "label_control", + "class": "panel_control", "parents": [ { - "class": "button_control" + "class": "window" } ] }, { - "class": "close_button", - "layer0.texture": "Meetio/assets/default/icon_close.png", - "layer0.tint": [ - "accent", - 1 - ], - "layer0.opacity": 1, - "content_margin": [ - 8, - 8 - ] + "class": "panel_grid_control", + "inside_spacing": 4, + "outside_hspacing": 4, + "outside_vspacing": 4 }, { - "class": "close_button", - "attributes": [ - "hover" - ], + "class": "panel_close_button", "layer0.texture": "Meetio/assets/default/icon_close.png", "layer0.tint": [ "accent", 1 ], - "layer0.opacity": 1 - }, - { - "class": "close_button", - "attributes": [ - "dirty" - ], - "layer0.texture": "Meetio/assets/default/dirty_icon.png", - "layer0.tint": [ - "accent", - 1 + "layer0.opacity": { + "target": 0.4, + "speed": 4, + "interpolation": "smoothstep" + }, + "layer1.opacity": 0, + "content_margin": [ + 0, + 0 ] }, { - "class": "close_button", + "class": "panel_close_button", "attributes": [ - "hover", - "dirty" + "hover" ], - "layer0.texture": "Meetio/assets/default/dirty_icon.png", - "layer0.tint": [ - "accent", - 1 - ] + "layer0.opacity": { + "target": 0.6, + "speed": 4, + "interpolation": "smoothstep" + } }, { "class": "mini_quick_panel_row", @@ -1250,11 +1412,11 @@ { "class": "sidebar_tree", "row_padding": [ - 16, - 3 + 20, + 6 ], - "indent": 16, - "indent_offset": 16, + "indent": 10, + "indent_offset": 2, "indent_top_level": false, "dark_content": false, "spacer_rows": true @@ -1274,11 +1436,11 @@ { "class": "sidebar_tree", "settings": [ - "meetio_sidebar_large" + "meetio_compact_sidebar" ], "row_padding": [ 16, - 6 + 3 ] }, { @@ -1369,350 +1531,116 @@ { "class": "tree_row", "attributes": [ - "selected" - ] - } - ], - "font.bold": false, - "color": [ - "foreground", - 0.9 - ] - }, - { - "class": "sidebar_label", - "parents": [ - { - "class": "tree_row", - "attributes": [ - "expandable" - ] - } - ], - "color": [ - "foreground", - 0.8 - ] - }, - { - "class": "sidebar_label", - "parents": [ - { - "class": "tree_row", - "attributes": [ - "expandable" - ] - } - ], - "settings": [ - "bold_folder_labels" - ], - "font.bold": true - }, - { - "class": "sidebar_label", - "parents": [ - { - "class": "tree_row", - "attributes": [ - "expandable", - "selected" - ] - } - ], - "color": [ - 69, - 90, - 100 - ] - }, - { - "class": "sidebar_label", - "parents": [ - { - "class": "tree_row", - "attributes": [ - "expanded" - ] - } - ], - "color": [ - "accent", - 1 - ] - }, - { - "class": "sidebar_label", - "parents": [ - { - "class": "tree_row", - "attributes": [ - "expanded" - ] - } - ], - "settings": [ - "bold_folder_labels" - ], - "font.bold": true - }, - { - "class": "sidebar_label", - "parents": [ - { - "class": "tree_row", - "attributes": [ - "expanded", - "selected" - ] - } - ], - "color": [ - 69, - 90, - 100 - ] - }, - { - "class": "sidebar_label", - "attributes": [ - "transient" - ], - "font.italic": false - }, - { - "class": "status_bar", - "layer0.tint": "#4A616C", - "layer0.opacity": 1, - "content_margin": [ - 10, - 2, - 0, - 2 - ] - }, - { - "class": "panel_button_control", - "layer0.texture": "Meetio/assets/default/overflow_menu.png", - "layer0.tint": [ - "accent", - 1 - ], - "layer0.opacity": 1, - "content_margin": [ - 8, - 8 - ] - }, - { - "class": "panel_button_control", - "attributes": [ - "hover" - ], - "layer0.texture": "Meetio/assets/default/overflow_menu.png", - "layer0.tint": [ - "accent", - 1 - ] - }, - { - "class": "status_container", - "content_margin": [ - 8, - 0, - 0, - 0 - ] - }, - { - "class": "status_button", - "content_margin": [ - 10, - 0, - 10, - 0 - ], - "min_size": [ - 80, - 0 - ] - }, - { - "class": "label_control", - "parents": [ - { - "class": "status_bar" - } - ], - "font.size": 11, - "color": [ - 255, - 255, - 255 - ], - "font.bold": false - }, - { - "class": "panel_control", - "layer0.tint": [ - "background", - 0.94 - ], - "layer0.inner_margin": [ - 2, - 2, - 2, - 2 - ], - "layer0.opacity": 1, - "content_margin": [ - 6, - 12, - 6, - 12 - ] - }, - { - "class": "overlay_control", - "layer0.texture": "Meetio/assets/default/overlay_bg.png", - "layer0.inner_margin": [ - 24, - 4, - 24, - 33 - ], - "layer0.opacity": 1, - "layer0.tint": [ - "background", - 1 - ], - "layer1.texture": "Meetio/assets/default/quick_panel_background.png", - "layer1.inner_margin": [ - 16, - 0, - 16, - 25 - ], - "layer1.opacity": 1, - "layer.tint": [ - "background", - 1 - ], - "content_margin": [ - 12, - 4, - 13, - 28 + "selected" + ] + } + ], + "font.bold": false, + "color": [ + "foreground", + 0.9 ] }, { - "class": "panel_control", + "class": "sidebar_label", "parents": [ { - "class": "overlay_control" + "class": "tree_row", + "attributes": [ + "expandable" + ] } ], - "layer0.opacity": 1, - "layer0.inner_margin": [ - 32, - 0, - 32, - 2 - ], - "layer0.tint": [ - "background", - 1 - ], - "layer1.inner_margin": [ - 32, - 0, - 32, - 2 - ], - "layer1.opacity": 1, - "content_margin": [ - 32, - 8, - 32, - 8 + "color": [ + "foreground", + 0.8 ] }, { - "class": "panel_control", + "class": "sidebar_label", "parents": [ { - "class": "switch_project_window" + "class": "tree_row", + "attributes": [ + "expandable" + ] } ], - "layer0.inner_margin": [ - 32, - 0, - 32, - 2 - ], - "layer0.tint": [ - "background", - 1 - ], - "layer1.inner_margin": [ - 32, - 0, - 32, - 2 + "settings": [ + "bold_folder_labels" ], - "layer1.tint": [ - "background", - 1 + "font.bold": true + }, + { + "class": "sidebar_label", + "parents": [ + { + "class": "tree_row", + "attributes": [ + "expandable", + "selected" + ] + } ], - "content_margin": [ - 32, - 8, - 32, - 8 + "color": [ + 69, + 90, + 100 ] }, { - "class": "panel_control", + "class": "sidebar_label", "parents": [ { - "class": "window" + "class": "tree_row", + "attributes": [ + "expanded" + ] } + ], + "color": [ + "accent", + 1 ] }, { - "class": "panel_grid_control", - "inside_spacing": 4, - "outside_hspacing": 4, - "outside_vspacing": 4 + "class": "sidebar_label", + "parents": [ + { + "class": "tree_row", + "attributes": [ + "expanded" + ] + } + ], + "settings": [ + "bold_folder_labels" + ], + "font.bold": true }, { - "class": "panel_close_button", - "layer0.texture": "Meetio/assets/default/icon_close.png", - "layer0.tint": [ - "accent", - 1 + "class": "sidebar_label", + "parents": [ + { + "class": "tree_row", + "attributes": [ + "expanded", + "selected" + ] + } ], - "layer0.opacity": { - "target": 0.4, - "speed": 4, - "interpolation": "smoothstep" - }, - "layer1.opacity": 0, - "content_margin": [ - 0, - 0 + "color": [ + 69, + 90, + 100 ] }, { - "class": "panel_close_button", + "class": "sidebar_label", "attributes": [ - "hover" + "transient" ], - "layer0.opacity": { - "target": 0.6, - "speed": 4, - "interpolation": "smoothstep" - } + "font.italic": false }, { "class": "tabset_control", @@ -2087,6 +2015,99 @@ ], "layer0.opacity": 0.8 }, + { + "class": "status_bar", + "layer0.tint": "#4A616C", + "layer0.opacity": 1, + "content_margin": [ + 10, + 2, + 0, + 2 + ] + }, + { + "class": "panel_button_control", + "layer0.texture": "Meetio/assets/default/overflow_menu.png", + "layer0.tint": "#fff", + "layer0.opacity": 1, + "content_margin": 9, + "layer0.inner_margin": 4 + }, + { + "class": "vcs_branch_icon", + "layer0.texture": "Meetio/assets/default/icon_branch.png", + "layer0.tint": "#fff", + "layer0.opacity": 1, + "content_margin": 9, + "layer0.inner_margin": 2 + }, + { + "class": "panel_button_control", + "attributes": [ + "hover" + ], + "layer0.opacity": 0.8 + }, + { + "class": "vcs_branch_icon", + "attributes": [ + "hover" + ], + "layer0.opacity": 0.8 + }, + { + "class": "status_container", + "content_margin": [ + 8, + 0, + 0, + 0 + ] + }, + { + "class": "status_button", + "content_margin": [ + 10, + 0, + 10, + 0 + ], + "min_size": [ + 80, + 0 + ] + }, + { + "class": "label_control", + "parents": [ + { + "class": "status_bar" + } + ], + "font.size": 11, + "color": "#fff", + "font.bold": false + }, + { + "class": "tool_tip_control", + "layer0.tint": [ + "foreground", + 1 + ], + "layer0.opacity": 1, + "content_margin": [ + 12, + 8 + ] + }, + { + "class": "tool_tip_label_control", + "fg": [ + "background", + 1 + ] + }, { "class": "title_bar", "bg": "rgb(115, 128, 140)", @@ -2151,25 +2172,6 @@ "layer0.tint": "rgb(255, 255, 255)", "layer0.opacity": 0 }, - { - "class": "tool_tip_control", - "layer0.tint": [ - "foreground", - 1 - ], - "layer0.opacity": 1, - "content_margin": [ - 12, - 8 - ] - }, - { - "class": "tool_tip_label_control", - "fg": [ - "background", - 1 - ] - }, { "class": "vcs_status_badge", "parents": [ diff --git a/MT.py b/Meetio.py similarity index 100% rename from MT.py rename to Meetio.py diff --git a/Preferences.sublime-settings b/Preferences.sublime-settings index 54467998..4acac694 100755 --- a/Preferences.sublime-settings +++ b/Preferences.sublime-settings @@ -8,8 +8,8 @@ // Set large font in sidebar "meetio_sidebar_font_big" : false, - // Set large sidebar - "meetio_sidebar_large" : false, + // Set compact sidebar + "meetio_compact_sidebar" : false, // Replace folder icons with arrows "meetio_arrow_folders" : false, diff --git a/README.md b/README.md index b77006e9..31cf4938 100755 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ To activate this theme, adding these lines to your user settings (**Preferences // Sidebar "meetio_sidebar_font_big" : true, // Set large font in sidebar - "meetio_sidebar_large" : true, // Set large sidebar + "meetio_compact_sidebar" : true, // Set compact sidebar "meetio_arrow_folders" : true, // Replace folder icons with arrows // Panels diff --git a/assets/default/icon_branch.png b/assets/default/icon_branch.png new file mode 100644 index 0000000000000000000000000000000000000000..c9095cef586666f2d0dcf3876ab51327c52b3da8 GIT binary patch literal 204 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjoCO|{#S9GG!XV7ZFl!D-MV+UM zV~9uR+ewCe4GKK2-Q@|-_3qRko@LZ=*Zj7pcL>$STww1uFLD<;L-<6*Umgxy*Km6 xiY4E>%LGpVeawX6u44$rjF6*2UngBIHOtt_3 literal 0 HcmV?d00001 diff --git a/assets/default/icon_branch@2x.png b/assets/default/icon_branch@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..99c54bdabb3036b67b169626707496e8dcfe3fc2 GIT binary patch literal 284 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC&H|6fVg?3oVGw3ym^DWND0t4( z#W5tK@$EEkzGed+*2nWE@@_xbSamq0D(BFmEh~OnY+SrAve|YqgA$7qhhiL~0HaHG zzuKlho?E`He5ABL>`3n)DM9-uweBLPe)p`H@?G?z#(U*O!EvfiQ=;q`8n(MCIhWbG z@yz99UX$2h%Cn)3@tVN{X@+fr#mgBIm?!Aj=bXH?y2JXXs^63KPd);rE83Q9?_CA6Z{_B5r4@&=eJ_)ft~!9>e7RR~x^}>!%IdrqW}g0@+3#XkeRtb_?tw?t-tt`~V#~k(_YGxI57wMhaxSK! zweZ@?eW{`a&wd84=`gknVxCht(d*$9yVc!UHWy4hOyyH5mWc5i=med9cv!KLC$BQS z`@7?OfkWEIenh`IP;yOs?%n#C{##y!-+g`0Tec_H=n{~Ad(2GsW$F8+Prg_kdL5?( c0#>j17d_}=HYvIj4h(1pPgg&ebxsLQ0I49R_y7O^ literal 0 HcmV?d00001 diff --git a/schemes/Meetio-Lighter.sublime-color-scheme b/schemes/Meetio-Lighter.sublime-color-scheme index 2f34d276..d3604121 100644 --- a/schemes/Meetio-Lighter.sublime-color-scheme +++ b/schemes/Meetio-Lighter.sublime-color-scheme @@ -43,6 +43,16 @@ "tags_foreground": "var(violet)" }, "rules": [ + { + "background": "#000000", + "scope": "col_gutter", + "foreground": "#ffffff" + }, + { + "background": "#6D88FFFF", + "scope": "col_6D88FFFF", + "foreground": "#0D0D0DFF" + }, { "name": "Comment", "scope": "comment, punctuation.definition.comment", diff --git a/schemes/Meetio-Palenight.sublime-color-scheme b/schemes/Meetio-Palenight.sublime-color-scheme index 106a1b18..89f3432b 100644 --- a/schemes/Meetio-Palenight.sublime-color-scheme +++ b/schemes/Meetio-Palenight.sublime-color-scheme @@ -43,6 +43,56 @@ "tags_foreground": "var(violet)" }, "rules": [ + { + "background": "#4A616CFF", + "scope": "col_4A616CFF", + "foreground": "#DBDBDBFF" + }, + { + "background": "#253137FF", + "scope": "col_253137FF", + "foreground": "#AEAEAEFF" + }, + { + "background": "#FFFFFFFF", + "scope": "col_FFFFFFFF", + "foreground": "#7F7F7FFF" + }, + { + "background": "#D33131FF", + "scope": "col_D33131FF", + "foreground": "#E1E1E1FF" + }, + { + "background": "#479E8EFF", + "scope": "col_479E8EFF", + "foreground": "#020202FF" + }, + { + "background": "#7B88CCFF", + "scope": "col_7B88CCFF", + "foreground": "#0B0B0BFF" + }, + { + "background": "#C1685CFF", + "scope": "col_C1685CFF", + "foreground": "#010101FF" + }, + { + "background": "#000000FF", + "scope": "col_000000FF", + "foreground": "#808080FF" + }, + { + "background": "#000000", + "scope": "col_gutter", + "foreground": "#ffffff" + }, + { + "background": "#6D88FFFF", + "scope": "col_6D88FFFF", + "foreground": "#0D0D0DFF" + }, { "name": "Comment", "scope": "comment, punctuation.definition.comment", diff --git a/src/icons/svg/icon_branch.svg b/src/icons/svg/icon_branch.svg new file mode 100644 index 00000000..c7b33f0d --- /dev/null +++ b/src/icons/svg/icon_branch.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/themes/default/sidebar.json b/src/themes/default/sidebar.json index efc2f5d1..aae26c56 100644 --- a/src/themes/default/sidebar.json +++ b/src/themes/default/sidebar.json @@ -7,9 +7,9 @@ }, { "class": "sidebar_tree", - "row_padding": [16, 3], - "indent": 16, - "indent_offset": 16, + "row_padding": [20, 6], + "indent": 10, + "indent_offset": 2, "indent_top_level": false, "dark_content": false, "spacer_rows": true @@ -21,8 +21,8 @@ }, { "class": "sidebar_tree", - "settings": ["meetio_sidebar_large"], - "row_padding": [16, 6] + "settings": ["meetio_compact_sidebar"], + "row_padding": [16, 3] }, { "class": "tree_row", diff --git a/src/themes/default/status_bar.json b/src/themes/default/status_bar.json index 212c9bce..223c28c2 100644 --- a/src/themes/default/status_bar.json +++ b/src/themes/default/status_bar.json @@ -8,15 +8,28 @@ { "class": "panel_button_control", "layer0.texture": "Meetio/assets/default/overflow_menu.png", - "layer0.tint": ["accent", 1.0], + "layer0.tint": "#fff", "layer0.opacity": 1.0, - "content_margin": [8, 8] + "content_margin": 9, + "layer0.inner_margin":4 + }, + { + "class": "vcs_branch_icon", + "layer0.texture": "Meetio/assets/default/icon_branch.png", + "layer0.tint": "#fff", + "layer0.opacity": 1.0, + "content_margin": 9, + "layer0.inner_margin":2 }, { "class": "panel_button_control", "attributes": ["hover"], - "layer0.texture": "Meetio/assets/default/overflow_menu.png", - "layer0.tint": ["accent", 1.0] + "layer0.opacity": 0.8 + }, + { + "class": "vcs_branch_icon", + "attributes": ["hover"], + "layer0.opacity": 0.8 }, { "class": "status_container", @@ -31,7 +44,7 @@ "class": "label_control", "parents": [{"class": "status_bar"}], "font.size": 11, - "color": [255, 255, 255], + "color": "#fff", "font.bold": false } ] diff --git a/utils/activation.py b/utils/activation.py index 2beb1eb5..aa22020b 100755 --- a/utils/activation.py +++ b/utils/activation.py @@ -63,7 +63,7 @@ def commit(): return sublime.save_settings(PREFERENCES) -class MtActivateCommand(sublime_plugin.WindowCommand): +class MeetioActivateCommand(sublime_plugin.WindowCommand): def display_list(self, themes): self.themes = themes diff --git a/utils/changelog.py b/utils/changelog.py index 65d09e9f..7835c023 100755 --- a/utils/changelog.py +++ b/utils/changelog.py @@ -42,8 +42,7 @@ } ''' - -class MtChangesCommand(sublime_plugin.WindowCommand): +class MeetioChangesCommand(sublime_plugin.WindowCommand): def on_navigate(self, href): webbrowser.open_new_tab(href) diff --git a/utils/links.py b/utils/links.py index 695696e2..cda6900f 100755 --- a/utils/links.py +++ b/utils/links.py @@ -3,20 +3,15 @@ import sublime_plugin import webbrowser - # Repository command. - - -class MtRepoCommand(sublime_plugin.WindowCommand): +class MeetioRepoCommand(sublime_plugin.WindowCommand): def run(self): """Open the repository in a browser tab.""" webbrowser.open_new_tab('https://github.com/mauroreisvieira/meetio') # Issues command. - - -class MtIssuesCommand(sublime_plugin.WindowCommand): +class MeetioIssuesCommand(sublime_plugin.WindowCommand): def run(self): """Open the issues page in a browser tab""" webbrowser.open_new_tab('https://github.com/mauroreisvieira/meetio/issues')