diff --git a/Meetio-Theme.hidden-theme b/Meetio-Theme.hidden-theme index a0eec621..466be983 100644 --- a/Meetio-Theme.hidden-theme +++ b/Meetio-Theme.hidden-theme @@ -217,85 +217,6 @@ "vcsMissing": "var(--orangish)" }, "rules": [ - { - "class": "annotation_close_button", - "content_margin": 8, - "layer0.texture": "Meetio Theme/textures/icon_close.png", - "layer0.tint": "var(colorAccent)", - "layer0.opacity": { - "target": 0.8, - "speed": 4, - "interpolation": "smoothstep" - } - }, - { - "class": "annotation_close_button", - "attributes": [ - "hover" - ], - "layer0.opacity": { - "target": 1, - "speed": 4, - "interpolation": "smoothstep" - } - }, - { - "class": "button_control", - "layer0.tint": "var(buttonBackground)", - "layer0.opacity": { - "target": 0.6, - "speed": 4, - "interpolation": "smoothstep" - }, - "layer0.inner_margin": [ - 6, - 6 - ], - "content_margin": [ - 6, - 10, - 6, - 10 - ], - "min_size": "var(buttonMinSize)" - }, - { - "class": "button_control", - "attributes": [ - "hover" - ], - "layer0.tint": "var(buttonBackgroundHover)", - "layer0.opacity": 1 - }, - { - "class": "button_control", - "attributes": [ - "pressed" - ], - "layer0.opacity": { - "target": 0.1, - "speed": 4, - "interpolation": "smoothstep" - } - }, - { - "class": "dropdown_button_control", - "layer0.texture": "Meetio Theme/textures/overflow_menu.png", - "layer0.tint": "var(colorAccent)", - "layer0.opacity": 1, - "layer0.inner_margin": 0, - "content_margin": [ - 12, - 12 - ] - }, - { - "class": "dropdown_button_control", - "attributes": [ - "hover" - ], - "layer0.opacity": 0.8 - }, { "class": "dialog", "layer0.tint": [ @@ -368,43 +289,26 @@ "layer0.opacity": 1 }, { - "class": "fold_button_control", - "layer0.texture": "Meetio Theme/textures/arrow_right.png", + "class": "annotation_close_button", + "content_margin": 8, + "layer0.texture": "Meetio Theme/textures/icon_close.png", "layer0.tint": "var(colorAccent)", - "layer0.opacity": 0.4, - "layer0.inner_margin": 0, - "content_margin": [ - 12, - 12 - ] + "layer0.opacity": { + "target": 0.8, + "speed": 4, + "interpolation": "smoothstep" + } }, { - "class": "fold_button_control", + "class": "annotation_close_button", "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": "grid_layout_control", - "border_color": "var(gridLayoutBorderColor)", - "border_size": "var(gridLayoutBorderSize)" + "layer0.opacity": { + "target": 1, + "speed": 4, + "interpolation": "smoothstep" + } }, { "class": "disclosure_button_control", @@ -549,6 +453,167 @@ ], "layer0.opacity": 1 }, + { + "class": "grid_layout_control", + "border_color": "var(gridLayoutBorderColor)", + "border_size": "var(gridLayoutBorderSize)" + }, + { + "class": "text_line_control", + "layer0.opacity": 1, + "layer0.inner_margin": [ + 20, + 5, + 20, + 5 + ], + "layer0.tint": "var(inputBackground)", + "layer1.tint": "var(inputBorderColor)", + "layer1.opacity": 1, + "layer1.inner_margin": "var(inputBorderSize)", + "layer1.draw_center": false, + "tint_index": 1, + "content_margin": "var(inputBorderMargin)", + "color_scheme_tint": "var(inputBackground)" + }, + { + "class": "text_line_control", + "platforms": [ + "osx", + "linux" + ], + "parents": [ + { + "class": "overlay_control" + } + ], + "layer1.opacity": 0, + "content_margin": [ + 52, + 10, + 10, + 10 + ], + "settings": [ + "meetio_input_search_icon" + ] + }, + { + "class": "text_line_control", + "parents": [ + { + "class": "overlay_control" + } + ], + "layer1.opacity": 0, + "layer2.inner_margin": [ + 52, + 48, + 0, + 0 + ], + "layer2.draw_center": false, + "layer2.texture": "Meetio Theme/textures/inputs/icon_search.png", + "layer2.tint": "var(colorAccent)", + "layer2.opacity": 1, + "settings": [ + "meetio_input_search_icon" + ] + }, + { + "class": "text_line_control", + "platforms": [ + "osx", + "linux" + ], + "parents": [ + { + "class": "switch_project_window" + } + ], + "layer1.opacity": 0, + "content_margin": [ + 52, + 10, + 10, + 10 + ], + "settings": [ + "meetio_input_search_icon" + ] + }, + { + "class": "text_line_control", + "parents": [ + { + "class": "switch_project_window" + } + ], + "layer2.inner_margin": [ + 52, + 48, + 0, + 0 + ], + "layer2.draw_center": false, + "layer2.texture": "Meetio Theme/textures/inputs/icon_search.png", + "layer2.tint": "var(colorAccent)", + "layer2.opacity": 1, + "layer1.opacity": 0, + "settings": [ + "meetio_input_search_icon" + ] + }, + { + "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": "var(fontSizeHuge)" + }, + { + "class": "label_control", + "parents": [ + { + "class": "button_control" + } + ] + }, { "class": "icon_button_group", "spacing": 8 @@ -1268,204 +1333,48 @@ 28 ] }, - { - "class": "text_line_control", - "layer0.opacity": 1, - "layer0.inner_margin": [ - 20, - 5, - 20, - 5 - ], - "layer0.tint": "var(inputBackground)", - "layer1.tint": "var(inputBorderColor)", - "layer1.opacity": 1, - "layer1.inner_margin": "var(inputBorderSize)", - "layer1.draw_center": false, - "tint_index": 1, - "content_margin": "var(inputBorderMargin)", - "color_scheme_tint": "var(inputBackground)" - }, - { - "class": "text_line_control", - "platforms": [ - "osx", - "linux" - ], - "parents": [ - { - "class": "overlay_control" - } - ], - "layer1.opacity": 0, - "content_margin": [ - 52, - 10, - 10, - 10 - ], - "settings": [ - "meetio_input_search_icon" - ] - }, - { - "class": "text_line_control", - "parents": [ - { - "class": "overlay_control" - } - ], - "layer1.opacity": 0, - "layer2.inner_margin": [ - 52, - 48, - 0, - 0 - ], - "layer2.draw_center": false, - "layer2.texture": "Meetio Theme/textures/inputs/icon_search.png", - "layer2.tint": "var(colorAccent)", - "layer2.opacity": 1, - "settings": [ - "meetio_input_search_icon" - ] - }, - { - "class": "text_line_control", - "platforms": [ - "osx", - "linux" - ], - "parents": [ - { - "class": "switch_project_window" - } - ], - "layer1.opacity": 0, - "content_margin": [ - 52, - 10, - 10, - 10 - ], - "settings": [ - "meetio_input_search_icon" - ] - }, - { - "class": "text_line_control", - "parents": [ - { - "class": "switch_project_window" - } - ], - "layer2.inner_margin": [ - 52, - 48, - 0, - 0 - ], - "layer2.draw_center": false, - "layer2.texture": "Meetio Theme/textures/inputs/icon_search.png", - "layer2.tint": "var(colorAccent)", - "layer2.opacity": 1, - "layer1.opacity": 0, - "settings": [ - "meetio_input_search_icon" - ] - }, { "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": "label_control", - "fg": [ - "foreground", - 1 - ], - "font.bold": false - }, - { - "class": "label_control", - "parents": [ - { - "class": "button_control" - } - ], - "color": [ - "foreground", - 1 + "layer0.opacity": 1, + "layer0.inner_margin": [ + 3, + 3 ], - "font.bold": true + "content_margin": [ + 8, + 8 + ] }, { - "class": "label_control", + "class": "close_button", "parents": [ { - "class": "panel_control" + "class": "tree_row", + "attributes": [ + "hover" + ] } ], - "color": [ - "foreground", - 1 - ], - "font.bold": true + "layer0.opacity": 1 }, { - "class": "title_label_control", - "fg": [ - "foreground", - 1 + "class": "close_button", + "attributes": [ + "dirty" ], - "font.size": "var(fontSizeHuge)" + "layer0.texture": "Meetio Theme/textures/dirty_icon.png", + "layer0.tint": "var(colorAccent)" }, { - "class": "label_control", - "parents": [ - { - "class": "button_control" - } - ] + "class": "close_button", + "attributes": [ + "hover", + "dirty" + ], + "layer0.texture": "Meetio Theme/textures/dirty_icon.png", + "layer0.tint": "var(colorAccent)" }, { "class": "panel_control", @@ -1600,155 +1509,100 @@ ] }, { - "class": "scroll_area_control", - "settings": [ - "overlay_scroll_bars" - ], - "overlay": true + "class": "status_bar", + "content_margin": "var(statusbarMargin)", + "layer0.tint": "var(statusbarBackground)", + "layer0.opacity": 1 }, { - "class": "scroll_area_control", - "settings": [ - "!overlay_scroll_bars" - ], - "overlay": false + "class": "panel_button_control", + "layer0.texture": "Meetio Theme/textures/overflow_menu.png", + "layer0.tint": "var(statusbarIconColor)", + "layer0.opacity": 1, + "content_margin": 9, + "layer0.inner_margin": 4 }, { - "class": "scroll_area_control", - "parents": [ - { - "class": "sidebar_container" - } + "class": "panel_button_control", + "attributes": [ + "hover" ], - "content_margin": [ - 0, - 10, - 0, - 10 - ] - }, - { - "class": "scroll_bar_control", - "layer0.opacity": 1, - "content_margin": 4, - "tint_index": 0 + "layer0.opacity": 0.8 }, { - "class": "scroll_bar_control", + "class": "vcs_branch_icon", "settings": [ - "overlay_scroll_bars" + "!meetio_status_badges" ], + "content_margin": 0, + "layer0.texture": "", "layer0.opacity": 0 }, { - "class": "scroll_bar_control", + "class": "vcs_branch_icon", "settings": [ - "!overlay_scroll_bars" + "meetio_status_badges" ], + "layer0.texture": "Meetio Theme/textures/icon_branch.png", + "content_margin": 8, + "layer0.tint": "var(statusbarIconColor)", + "layer0.inner_margin": 2, "layer0.opacity": 1 }, { - "class": "scroll_bar_control", - "parents": [ - { - "class": "popup_control auto_complete_popup" - } - ], - "tint_modifier": [ - 0, - 0, - 0, - 0.05 - ] - }, - { - "class": "scroll_bar_control", - "parents": [ - { - "class": "switch_project_window" - } - ], - "layer0.tint": [ - 235, - 237, - 239 + "class": "vcs_branch_icon", + "attributes": [ + "hover" ], - "tint_index": -1 + "layer0.opacity": 0.8 }, { - "class": "scroll_bar_control", - "parents": [ - { - "class": "sidebar_container" - } - ], - "layer0.opacity": 0 + "class": "sidebar_button_control", + "layer0.texture": "Meetio Theme/textures/sidebar_button.png", + "content_margin": 8, + "layer0.tint": "var(statusbarIconColor)", + "layer0.inner_margin": 2, + "layer0.opacity": 1 }, { - "class": "scroll_corner_control", - "parents": [ - { - "class": "sidebar_container" - } + "class": "sidebar_button_control", + "attributes": [ + "hover" ], - "layer0.opacity": 0 + "layer0.opacity": 0.8 }, { - "class": "scroll_bar_control", - "parents": [ - { - "class": "overlay_control" - } - ], - "layer0.opacity": 0, + "class": "status_container", "content_margin": [ - 4, + 8, 0, 0, 0 ] }, { - "class": "scroll_track_control", - "layer0.tint": "var(scrollBar)", - "layer0.opacity": 1, - "layer0.inner_margin": 2, + "class": "status_button", "content_margin": [ - 4, - 4, - 3, - 4 - ] - }, - { - "class": "puck_control", - "layer0.tint": "var(scrollTrack)", - "layer0.opacity": 1 - }, - { - "class": "scroll_corner_control", - "layer0.opacity": 1, - "tint_index": 0 - }, - { - "class": "scroll_track_control", - "attributes": [ - "horizontal" + 10, + 0, + 10, + 0 ], - "layer0.tint": "var(scrollBar)", - "content_margin": [ - 4, - 4, - 4, - 3 + "min_size": [ + 80, + 0 ] }, { - "class": "puck_control", - "attributes": [ - "horizontal" + "class": "label_control", + "parents": [ + { + "class": "status_bar" + } ], - "layer0.tint": "var(scrollTrack)" + "font.size": "var(statusbarLabelFontSize)", + "color": "var(statusbarLabelColor)", + "font.bold": "var(statusbarLabelBold)" }, { "class": "mini_quick_panel_row", @@ -1854,112 +1708,155 @@ "font.size": "var(panelPathRowFontSize)" }, { - "class": "status_bar", - "content_margin": "var(statusbarMargin)", - "layer0.tint": "var(statusbarBackground)", - "layer0.opacity": 1 + "class": "scroll_area_control", + "settings": [ + "overlay_scroll_bars" + ], + "overlay": true }, { - "class": "panel_button_control", - "layer0.texture": "Meetio Theme/textures/overflow_menu.png", - "layer0.tint": "var(statusbarIconColor)", - "layer0.opacity": 1, - "content_margin": 9, - "layer0.inner_margin": 4 + "class": "scroll_area_control", + "settings": [ + "!overlay_scroll_bars" + ], + "overlay": false }, { - "class": "panel_button_control", - "attributes": [ - "hover" + "class": "scroll_area_control", + "parents": [ + { + "class": "sidebar_container" + } ], - "layer0.opacity": 0.8 + "content_margin": [ + 0, + 10, + 0, + 10 + ] }, { - "class": "vcs_branch_icon", + "class": "scroll_bar_control", + "layer0.opacity": 1, + "content_margin": 4, + "tint_index": 0 + }, + { + "class": "scroll_bar_control", "settings": [ - "!meetio_status_badges" + "overlay_scroll_bars" ], - "content_margin": 0, - "layer0.texture": "", "layer0.opacity": 0 }, { - "class": "vcs_branch_icon", + "class": "scroll_bar_control", "settings": [ - "meetio_status_badges" + "!overlay_scroll_bars" ], - "layer0.texture": "Meetio Theme/textures/icon_branch.png", - "content_margin": 8, - "layer0.tint": "var(statusbarIconColor)", - "layer0.inner_margin": 2, "layer0.opacity": 1 }, { - "class": "vcs_branch_icon", - "attributes": [ - "hover" + "class": "scroll_bar_control", + "parents": [ + { + "class": "popup_control auto_complete_popup" + } ], - "layer0.opacity": 0.8 + "tint_modifier": [ + 0, + 0, + 0, + 0.05 + ] }, { - "class": "sidebar_button_control", - "settings": [ - "!meetio_sidebar_button" + "class": "scroll_bar_control", + "parents": [ + { + "class": "switch_project_window" + } ], - "content_margin": 0, - "layer0.texture": "", - "layer0.opacity": 0 + "layer0.tint": [ + 235, + 237, + 239 + ], + "tint_index": -1 }, { - "class": "sidebar_button_control", - "settings": [ - "meetio_sidebar_button" + "class": "scroll_bar_control", + "parents": [ + { + "class": "sidebar_container" + } ], - "layer0.texture": "Meetio Theme/textures/sidebar_button.png", - "content_margin": 8, - "layer0.tint": "var(statusbarIconColor)", - "layer0.inner_margin": 2, - "layer0.opacity": 1 + "layer0.opacity": 0 }, { - "class": "sidebar_button_control", - "attributes": [ - "hover" + "class": "scroll_corner_control", + "parents": [ + { + "class": "sidebar_container" + } ], - "layer0.opacity": 0.8 + "layer0.opacity": 0 }, { - "class": "status_container", + "class": "scroll_bar_control", + "parents": [ + { + "class": "overlay_control" + } + ], + "layer0.opacity": 0, "content_margin": [ - 8, + 4, 0, 0, 0 ] }, { - "class": "status_button", + "class": "scroll_track_control", + "layer0.tint": "var(scrollBar)", + "layer0.opacity": 1, + "layer0.inner_margin": 2, "content_margin": [ - 10, - 0, - 10, - 0 + 4, + 4, + 3, + 4 + ] + }, + { + "class": "puck_control", + "layer0.tint": "var(scrollTrack)", + "layer0.opacity": 1 + }, + { + "class": "scroll_corner_control", + "layer0.opacity": 1, + "tint_index": 0 + }, + { + "class": "scroll_track_control", + "attributes": [ + "horizontal" ], - "min_size": [ - 80, - 0 + "layer0.tint": "var(scrollBar)", + "content_margin": [ + 4, + 4, + 4, + 3 ] }, { - "class": "label_control", - "parents": [ - { - "class": "status_bar" - } + "class": "puck_control", + "attributes": [ + "horizontal" ], - "font.size": "var(statusbarLabelFontSize)", - "color": "var(statusbarLabelColor)", - "font.bold": "var(statusbarLabelBold)" + "layer0.tint": "var(scrollTrack)" }, { "class": "sidebar_container", @@ -2138,6 +2035,56 @@ ], "font.italic": false }, + { + "class": "button_control", + "layer0.tint": "var(buttonBackground)", + "layer0.opacity": { + "target": 0.6, + "speed": 4, + "interpolation": "smoothstep" + }, + "layer0.inner_margin": [ + 6, + 6 + ], + "content_margin": [ + 6, + 10, + 6, + 10 + ], + "min_size": "var(buttonMinSize)" + }, + { + "class": "button_control", + "attributes": [ + "hover" + ], + "layer0.tint": "var(buttonBackgroundHover)", + "layer0.opacity": 1 + }, + { + "class": "button_control", + "attributes": [ + "pressed" + ], + "layer0.opacity": { + "target": 0.1, + "speed": 4, + "interpolation": "smoothstep" + } + }, + { + "class": "symbol_container", + "content_margin": 4 + }, + { + "class": "symbol_container", + "platforms": [ + "windows" + ], + "content_margin": 4 + }, { "class": "tabset_control", "layer0.opacity": 1, @@ -2492,17 +2439,9 @@ "layer0.opacity": 0.8 }, { - "class": "tool_tip_control", - "layer0.tint": "var(tooltipBackground)", - "layer0.opacity": 1, - "content_margin": [ - 12, - 8 - ] - }, - { - "class": "tool_tip_label_control", - "fg": "var(tooltipLabelColor)" + "class": "title_bar", + "bg": "var(titleBarBackground)", + "fg": "var(titleBarColor)" }, { "class": "minimap_control", @@ -2537,6 +2476,19 @@ "interpolation": "smoothstep" } }, + { + "class": "tool_tip_control", + "layer0.tint": "var(tooltipBackground)", + "layer0.opacity": 1, + "content_margin": [ + 12, + 8 + ] + }, + { + "class": "tool_tip_label_control", + "fg": "var(tooltipLabelColor)" + }, { "class": "vcs_status_badge", "parents": [ @@ -2770,20 +2722,56 @@ ] }, { - "class": "title_bar", - "bg": "var(titleBarBackground)", - "fg": "var(titleBarColor)" + "class": "dropdown_button_control", + "layer0.texture": "Meetio Theme/textures/overflow_menu.png", + "layer0.tint": "var(colorAccent)", + "layer0.opacity": 1, + "layer0.inner_margin": 0, + "content_margin": [ + 12, + 12 + ] }, { - "class": "symbol_container", - "content_margin": 4 + "class": "dropdown_button_control", + "attributes": [ + "hover" + ], + "layer0.opacity": 0.8 }, { - "class": "symbol_container", - "platforms": [ - "windows" + "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" ], - "content_margin": 4 + "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 + ] } ] } \ No newline at end of file diff --git a/package.json b/package.json index 0c585822..ede00b73 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "sublime-meetio-theme", - "version": "4.5.0", + "version": "4.5.1", "description": "The most powerful and adaptive theme for Sublime Text 3", "bugs": { "url": "https://github.com/meetio-theme/sublime-meetio-theme/issues"