diff --git a/Preferences.sublime-settings b/Preferences.sublime-settings new file mode 100644 index 00000000..8d077ff8 --- /dev/null +++ b/Preferences.sublime-settings @@ -0,0 +1,19 @@ +{ + // ayu theme: Use native titlebars on macOs + "ui_native_titlebar": false, + + // ayu theme: Show separators between panels + "ui_separator": false, + + // ayu theme: Use smaller font size for UI + "ui_font_size_small": false, + + // ayu theme: Use Source Code Pro as UI font + "ui_font_source_code_pro": false, + + // ayu theme: Use Roboto Mono as UI font + "ui_font_roboto_mono": false, + + // ayu theme: Display wider scrollbars + "ui_wide_scrollbars": false +} diff --git a/README.md b/README.md index 6c64a41e..03492b57 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -![ayu](https://i.imgur.com/lt4pIAI.png) +![ayu](https://i.imgur.com/akLUOXg.png) `ayu` is a simple theme with bright colors and comes in three versions — *dark*, *mirage* and *light* for all day long comfortable work. @@ -12,22 +12,22 @@ ### Screenshots -
Light with ui_separator option off
+
Light with ui_separator option on
-![Light](https://i.imgur.com/DbWFq76.png) +![Light](https://i.imgur.com/pQQfIio.png) --- -
Mirage with ui_separator option on
+
Mirage with ui_separator option off
-![Mirage](https://i.imgur.com/BOYGmHf.png) +![Mirage](https://i.imgur.com/KYXJbBu.png) --- -
Dark with ui_separator option off
+
Dark with ui_separator option on
-![Dark](https://i.imgur.com/pmkHtQJ.png) +![Dark](https://i.imgur.com/lo8XBTr.png) ### Settings @@ -35,10 +35,8 @@ "ui_native_titlebar": true, // use native titlebars on macOs "ui_separator": true, // separators between panels "ui_font_size_small": true, // smaller UI font size(sidebar, statusbar etc) -"ui_big_tabs": true, // increased tab height -"ui_fix_tab_labels": true, // to fix tab labels if they look not right "ui_font_source_code_pro": true, // use Source Code Pro (https://fonts.google.com/specimen/Source+Code+Pro) as UI font -"ui_font_default": true, // use Sublime's default UI font +"ui_font_roboto_mono": true, // use Roboto Mono (https://fonts.google.com/specimen/Roboto+Mono) as UI font "ui_wide_scrollbars": true, // wider scrollbars ``` @@ -99,32 +97,8 @@ For dark theme: ### Sublime Text 2 -_Sublime Text 2 version may have some glitches, if you notice something, please file an issue._ - -Add this lines to your user settings *Preferences > Setting - User*: - -For light theme: - -```js -"theme": "ayu-light2.sublime-theme", -"color_scheme": "Packages/ayu/ayu-light.tmTheme", -``` - -For mirage theme: - -```js -"theme": "ayu-mirage2.sublime-theme", -"color_scheme": "Packages/ayu/ayu-mirage.tmTheme", -``` - -For dark theme: - -```js -"theme": "ayu-dark2.sublime-theme", -"color_scheme": "Packages/ayu/ayu-dark.tmTheme", -``` - -**NOTE:** Restart Sublime Text after activation of the theme to avoid any glitches. +ayu no longer supports Sublime Text 2. But you still can download +and install manually [previous version](https://github.com/dempfi/ayu/releases/tag/3.2.2). ### Related projects and ports diff --git a/activation.py b/activation.py index da160589..cb536161 100644 --- a/activation.py +++ b/activation.py @@ -1,9 +1,5 @@ # -*- coding: utf-8 -*- -""" -Material Theme Activation -""" - import sublime import sublime_plugin import functools @@ -66,7 +62,7 @@ def display_list(self, themes): self.initial_color_scheme = get_color_scheme() self.initial_ui_theme = get_ui_theme() - quick_list = [theme for theme in self.themes] + quick_list = [theme.replace("-", " ") for theme in self.themes] self.quick_list = quick_list self.window.show_quick_panel(quick_list, self.on_done, on_highlight=self.on_highlighted) @@ -88,10 +84,10 @@ def on_done(self, index): activate_ui_theme(ui_theme) def _quick_list_to_scheme(self, index): - return 'Packages/ayu/%s.tmTheme' % self.quick_list[index] + return 'Packages/ayu/%s.tmTheme' % THEMES[index] def _quick_list_to_theme(self, index): - return '%s.sublime-theme' % self.quick_list[index] + return '%s.sublime-theme' % THEMES[index] def run(self): self.display_list(THEMES) diff --git a/assets/close.png b/assets/close.png index 4e6ed855..a1b25791 100644 Binary files a/assets/close.png and b/assets/close.png differ diff --git a/assets/close@2x.png b/assets/close@2x.png index 818472bb..597a9ff4 100644 Binary files a/assets/close@2x.png and b/assets/close@2x.png differ diff --git a/assets/dirty.png b/assets/dirty.png index d395f5b9..e56f7ef9 100644 Binary files a/assets/dirty.png and b/assets/dirty.png differ diff --git a/assets/dirty@2x.png b/assets/dirty@2x.png index 7fe0dbc3..2e6df8fb 100644 Binary files a/assets/dirty@2x.png and b/assets/dirty@2x.png differ diff --git a/assets/input-search.png b/assets/input-search.png index 8a1e47c6..b66dda54 100644 Binary files a/assets/input-search.png and b/assets/input-search.png differ diff --git a/assets/input-search@2x.png b/assets/input-search@2x.png index a2197eab..19544322 100644 Binary files a/assets/input-search@2x.png and b/assets/input-search@2x.png differ diff --git a/assets/overlay-bg.png b/assets/overlay-bg.png index 81cb6b0a..e238c92f 100644 Binary files a/assets/overlay-bg.png and b/assets/overlay-bg.png differ diff --git a/assets/overlay-bg@2x.png b/assets/overlay-bg@2x.png index 9605b43f..a7dff1c9 100644 Binary files a/assets/overlay-bg@2x.png and b/assets/overlay-bg@2x.png differ diff --git a/assets/overlay-border.png b/assets/overlay-border.png index c8c41736..bcac0638 100644 Binary files a/assets/overlay-border.png and b/assets/overlay-border.png differ diff --git a/assets/overlay-border@2x.png b/assets/overlay-border@2x.png index bc8a0343..b41c57bf 100644 Binary files a/assets/overlay-border@2x.png and b/assets/overlay-border@2x.png differ diff --git a/assets/overlay-shadow.png b/assets/overlay-shadow.png index f89bb627..37993d2d 100644 Binary files a/assets/overlay-shadow.png and b/assets/overlay-shadow.png differ diff --git a/assets/overlay-shadow@2x.png b/assets/overlay-shadow@2x.png index 80f066a6..3def38e8 100644 Binary files a/assets/overlay-shadow@2x.png and b/assets/overlay-shadow@2x.png differ diff --git a/assets/tree-highlight-separators.png b/assets/tree-highlight-separators.png index 23679037..12b5bc9a 100644 Binary files a/assets/tree-highlight-separators.png and b/assets/tree-highlight-separators.png differ diff --git a/assets/tree-highlight-separators@2x.png b/assets/tree-highlight-separators@2x.png index e13ba60b..ecce3f14 100644 Binary files a/assets/tree-highlight-separators@2x.png and b/assets/tree-highlight-separators@2x.png differ diff --git a/assets/tree-highlight.png b/assets/tree-highlight.png index 614f3871..915cc41e 100644 Binary files a/assets/tree-highlight.png and b/assets/tree-highlight.png differ diff --git a/assets/tree-highlight@2x.png b/assets/tree-highlight@2x.png index c3006796..2fdfc9dc 100644 Binary files a/assets/tree-highlight@2x.png and b/assets/tree-highlight@2x.png differ diff --git a/ayu-dark.sublime-theme b/ayu-dark.sublime-theme index 29213b40..63a9ddc1 100644 --- a/ayu-dark.sublime-theme +++ b/ayu-dark.sublime-theme @@ -8,9 +8,9 @@ */ { - "class" : "sheet_container_control", - "layer0.tint" : [15, 20, 25], - "layer0.opacity" : 1 + "class": "sheet_container_control", + "layer0.tint": [15, 20, 25], + "layer0.opacity": 1 }, @@ -21,7 +21,7 @@ { "class": "grid_layout_control", "border_size": 0, - "border_color": [29, 36, 44] + "border_color": [10, 13, 16] }, { "class": "grid_layout_control", @@ -60,7 +60,7 @@ "layer0.texture": "ayu/assets/unfold.png", "layer0.opacity": 1.0, "layer0.inner_margin": 0, - "layer0.tint": [81, 92, 102], + "layer0.tint": [71, 82, 89], "content_margin": [8, 6, 8, 6] }, @@ -82,7 +82,7 @@ */ { "class": "popup_control", - "layer0.tint": [20, 25, 31], + "layer0.tint": [19, 24, 29], "layer0.opacity": 1.0, "content_margin": [0, 0] }, @@ -90,22 +90,22 @@ { "class": "auto_complete", "row_padding": [12, 6], - "layer0.tint": [20, 25, 31], + "layer0.tint": [19, 24, 29], "layer0.opacity": 1.0 }, { "class": "auto_complete_label", - "fg": [81, 92, 102], + "fg": [71, 82, 89], "match_fg": [242, 151, 24], - "selected_fg": [230, 225, 207], + "selected_fg": [191, 186, 176], "selected_match_fg": [242, 151, 24], "fg_blend": true }, { "class": "table_row", - "layer0.tint": [25, 31, 38], + "layer0.tint": [12, 16, 20], "layer0.opacity": 0.0 }, @@ -129,8 +129,7 @@ { "class": "tool_tip_label_control", - "color": [81, 92, 102], - "font.face": "Roboto mono", + "color": [71, 82, 89], "font.size": 13 }, { @@ -140,8 +139,8 @@ }, { "class": "tool_tip_label_control", - "settings": ["ui_font_default"], - "font.face": "" + "settings": ["ui_font_roboto_mono"], + "font.face": "Roboto mono" }, /* OVERLAY PANELS @@ -152,21 +151,21 @@ { "class": "overlay_control", "layer0.texture": "ayu/assets/overlay-shadow.png", - "layer0.inner_margin": [25, 45, 25, 35], - "layer0.opacity": 1.0, - "layer0.tint": [0, 0, 0], + "layer0.inner_margin": [15, 35, 15, 25], + "layer0.opacity": 0.6, + "layer0.tint": [10, 14, 18], "layer1.texture": "ayu/assets/overlay-border.png", - "layer1.inner_margin": [25, 45, 25, 35], + "layer1.inner_margin": [15, 35, 15, 25], "layer1.opacity": 1.0, - "layer1.tint": [230, 225, 207, 30], + "layer1.tint": [3, 4, 5], "layer2.texture": "ayu/assets/overlay-bg.png", - "layer2.inner_margin": [25, 45, 25, 35], + "layer2.inner_margin": [15, 35, 15, 25], "layer2.opacity": 1.0, - "layer2.tint": [20, 25, 31], + "layer2.tint": [19, 24, 29], - "content_margin": [20, 45, 20, 35] + "content_margin": [10, 35, 10, 20] }, // Command Panel list item style (cmd + shift + p) @@ -183,7 +182,7 @@ { "class": "mini_quick_panel_row", "attributes": ["selected"], - "layer0.tint": [25, 31, 38] + "layer0.tint": [12, 16, 20] }, // Quick panel project setting (project manager) (cmd + ctrl + p) @@ -191,7 +190,7 @@ { "class": "quick_panel", "row_padding": [32, 12], - "layer0.tint": [20, 25, 31], + "layer0.tint": [19, 24, 29], "layer0.opacity": 1.0 }, @@ -200,7 +199,7 @@ { "class": "quick_panel_row", "layer0.texture": "", - "layer0.tint": [20, 25, 31], + "layer0.tint": [19, 24, 29], "layer0.inner_margin": 0, "layer0.opacity": 1.0 }, @@ -210,84 +209,77 @@ { "class": "quick_panel_row", "parents": [{"class": "overlay_control"}], - "layer0.tint": [20, 25, 31], + "layer0.tint": [19, 24, 29], "layer0.opacity": 1.0 }, // Quick panel (project) style inside overlay_control (cmd + shift + p) - { "class": "quick_panel", "parents": [{"class": "overlay_control"}], - "row_padding": [20, 5], - "layer0.tint": [20, 25, 31], + "row_padding": [24, 8], + "layer0.tint": [19, 24, 29], "layer0.opacity": 1.0 }, // Quick Panel selected list item style - { "class": "quick_panel_row", "attributes": ["selected"], - "layer0.tint": [25, 31, 38] + "layer0.tint": [12, 16, 20] }, // Panel labels - { "class": "quick_panel_label", - "fg": [81, 92, 102], + "fg": [71, 82, 89], + "font.bold": false, "match_fg": [242, 151, 24], - "selected_fg": [230, 225, 207], + "selected_fg": [191, 186, 176], "selected_match_fg": [242, 151, 24] }, // Panel labels - { "class": "quick_panel_label", "parents": [{"class": "overlay_control"}], - "fg": [81, 92, 102], + "fg": [71, 82, 89], "match_fg": [242, 151, 24], - "selected_fg": [230, 225, 207], + "selected_fg": [191, 186, 176], "selected_match_fg": [242, 151, 24] }, // Panels sublabels - { "class": "quick_panel_path_label", - "fg": [66, 80, 94], - "match_fg": [230, 225, 207], - "selected_fg": [81, 92, 102], - "selected_match_fg": [230, 225, 207] + "fg": [54, 63, 70], + "match_fg": [156, 153, 146], + "selected_fg": [54, 63, 70], + "selected_match_fg": [156, 153, 146] }, // Panels data / score - { "class": "quick_panel_score_label", - "fg": [81, 92, 102], - "selected_fg": [81, 92, 102] + "fg": [71, 82, 89], + "selected_fg": [242, 151, 24] }, - /* TABS * Tabs settings and behavioring */ - { "class": "tabset_control", "mouse_wheel_switch": false, "tab_min_width": 50, "tab_overlap": 0, - "tab_height": 30, + "tab_height": 36, "tab_width": 50, "layer0.tint": [15, 20, 25], "layer0.opacity": 1.0, - "content_margin": [0, 0] // <<<<<<<<<<<<< + "content_margin": [10, 0] }, { "class": "tabset_control", @@ -298,114 +290,107 @@ "class": "tabset_control", "settings": ["ui_separator"], "content_margin": [0, 0, 0, 0], - "layer1.opacity": 0.3, + "layer1.opacity": 1, "layer1.texture": "ayu/assets/separator-bottom.png", - "layer1.tint": [81, 92, 102], + "layer1.tint": [10, 13, 16], "layer1.inner_margin": [1, 0, 1, 2] }, { "class": "tabset_control", "platforms": ["osx"], "settings": ["ui_separator", "!ui_native_titlebar"], - "layer2.opacity": 0.3, + "layer2.opacity": 1, "layer2.texture": "ayu/assets/separator-top.png", - "layer2.tint": [81, 92, 102], + "layer2.tint": [10, 13, 16], "layer2.inner_margin": [1, 2, 1, 0] }, - { - "class": "tabset_control", - "settings": ["ui_big_tabs"], - "tab_height": 40 - }, - // Tabs { "class": "tab_control", - - "layer0.tint": [15, 20, 25, 0], + // Background + "layer0.tint": [15, 20, 25], "layer0.opacity": 1.0, - "layer1.texture": "", + // Top + "layer1.texture": "ayu/assets/separator-top.png", + "layer1.tint": [10, 13, 16], + "layer1.inner_margin": [0, 1, 0, 0], + "layer1.opacity": 0.0, - "layer2.texture": "ayu/assets/separator-bottom.png", - "layer2.tint": [242, 151, 24], - "layer2.inner_margin": [1, 0, 1, 2], + // Right + "layer2.texture": "ayu/assets/separator-right.png", + "layer2.tint": [10, 13, 16], + "layer2.inner_margin": [0, 0, 1, 0], "layer2.opacity": 0.0, - "layer3.texture": "", + // Bottom + "layer3.texture": "ayu/assets/separator-bottom.png", + "layer3.tint": [10, 13, 16], + "layer3.inner_margin": [0, 0, 0, 1], + "layer3.opacity": 0.0, - "content_margin": [10, -2, 10, 0], + "content_margin": [15, -2, 15, 0], "max_margin_trim": 12 }, { "class": "tab_control", "settings": ["ui_separator"], - "layer1.texture": "ayu/assets/separator-right.png", - "layer1.tint": [81, 92, 102], - "layer1.inner_margin": [0, 1, 2, 1], - "layer1.opacity": 0.3, + "layer1.opacity": 1.0, - "layer3.texture": "ayu/assets/separator-bottom.png", - "layer3.tint": [81, 92, 102], - "layer3.inner_margin": [1, 0, 1, 2], - "layer3.opacity": 0.3 - }, - { - "class": "tab_control", - "settings": ["ui_big_tabs"], - "content_margin": [15, -2, 15, 0] + "layer2.opacity": 1.0, + + "layer3.opacity": 1.0 }, // Selected current tab - { "class": "tab_control", "attributes": ["selected"], - "layer2.opacity": 1.0, - "layer3.opacity": 0.0 + "settings": ["!ui_separator"], + "layer3.tint": [242, 151, 24], + "layer3.opacity": 1.0 }, { "class": "tab_control", "attributes": ["selected"], "settings": ["ui_separator"], - "layer0.tint": [81, 92, 102, 15] + "layer1.tint": [242, 151, 24], + "layer3.opacity": 0.0 }, // Hovered current tab - { "class": "tab_control", "attributes": ["hover"], - "layer2.opacity": 0.3 + "settings": ["!ui_separator"], + "layer3.tint": [242, 151, 24], + "layer3.opacity": 0.3 }, { "class": "tab_control", "attributes": ["hover"], "settings": ["ui_separator"], - "layer0.tint": [81, 92, 102, 6], + "layer0.tint": [10, 13, 16, 70], }, // Selected current tab - { "class": "tab_control", "attributes": ["selected", "hover"], - "layer2.opacity": 1.0 + "settings": ["!ui_separator"], + "layer3.opacity": 1.0 }, { "class": "tab_control", "attributes": ["selected", "hover"], "settings": ["ui_separator"], - "layer0.tint": [81, 92, 102, 15] + "layer0.tint": [15, 20, 25] }, // Tab Labels { "class": "tab_label", - "fg": [15, 20, 25, 0], - "shadow_color": [81, 92, 102], - "shadow_offset": [0, -1], + "fg": [71, 82, 89], "font.italic": false, "font.bold": false, - "font.size": 12, - "font.face": "Roboto mono" + "font.size": 12 }, { "class": "tab_label", @@ -414,28 +399,15 @@ }, { "class": "tab_label", - "settings": ["ui_font_default"], - "font.face": "" + "settings": ["ui_font_roboto_mono"], + "font.face": "Roboto mono" }, { "class": "tab_label", "settings": ["highlight_modified_tabs"], "font.italic": true, "attributes": ["dirty"], - "shadow_color": [242, 151, 24] - }, - { - "class": "tab_label", - "fg": [81, 92, 102], - "settings": ["ui_fix_tab_labels"], - "shadow_color": [15, 20, 25, 0], - "shadow_offset": [0, 0] - }, - { - "class": "tab_label", - "fg": [242, 151, 24], - "attributes": ["dirty"], - "settings": ["ui_fix_tab_labels", "highlight_modified_tabs"] + "fg": [242, 151, 24] }, // Tab selected label color @@ -443,17 +415,7 @@ { "class": "tab_label", "parents": [{"class": "tab_control", "attributes": ["selected"]}], - "fg": [15, 20, 25, 0], - "shadow_color": [230, 225, 207], - "shadow_offset": [0, -1], - }, - { - "class": "tab_label", - "settings": ["ui_fix_tab_labels"], - "parents": [{"class": "tab_control", "attributes": ["selected"]}], - "fg": [230, 225, 207], - "shadow_color": [15, 20, 25, 0], - "shadow_offset": [0, 0] + "fg": [191, 186, 176] }, { @@ -469,12 +431,12 @@ // Close Icon "layer0.texture": "ayu/assets/close.png", - "layer0.tint": [81, 92, 102], + "layer0.tint": [71, 82, 89], "layer0.opacity": 1.0, // Dirty Icon "layer1.texture": "ayu/assets/dirty.png", - "layer1.tint": [81, 92, 102], + "layer1.tint": [71, 82, 89], "layer1.opacity": 0, }, @@ -482,7 +444,7 @@ { "class": "tab_close_button", "settings": ["show_tab_close_buttons"], - "content_margin": [8, 8] + "content_margin": [6, 8] }, // Default hover @@ -499,7 +461,7 @@ "parents": [{"class": "tab_control", "attributes": ["dirty"]}], "layer0.opacity": 0, // Close Icon "layer1.opacity": 1.0, // dirty Icon - "content_margin": [8, 8] + "content_margin": [6, 8] }, // Dirty tab on hover @@ -534,7 +496,7 @@ "class": "scroll_tabs_left_button", "content_margin": [12, 15], "layer0.texture": "ayu/assets/arrow-left.png", - "layer0.tint": [62, 75, 89], + "layer0.tint": [46, 54, 60], "layer0.opacity": 1.0 }, @@ -548,16 +510,16 @@ "class": "scroll_tabs_right_button", "content_margin": [12, 15], "layer0.texture": "ayu/assets/arrow-right.png", - "layer0.tint": [62, 75, 89], + "layer0.tint": [46, 54, 60], "layer0.opacity": 1.0 }, { "class": "scroll_tabs_right_button", "settings": ["ui_separator"], "layer2.texture": "ayu/assets/separator-right.png", - "layer2.tint": [81, 92, 102], - "layer2.opacity": 0.3, - "layer2.inner_margin" : [0, 1, 2, 1] + "layer2.tint": [10, 13, 16], + "layer2.opacity": 1, + "layer2.inner_margin": [0, 1, 2, 1] }, { @@ -570,7 +532,7 @@ "class": "show_tabs_dropdown_button", "content_margin": [12, 12], "layer0.texture": "ayu/assets/overflow-menu.png", - "layer0.tint": [62, 75, 89], + "layer0.tint": [46, 54, 60], "layer0.opacity": 1.0, "layer0.inner_margin": [0, 0] }, @@ -588,7 +550,7 @@ { "class": "sidebar_container", - "content_margin": [0, 4, 0, 0], + "content_margin": [0, 6, 0, 0], "layer0.opacity": 1, "layer0.tint": [15, 20, 25] }, @@ -597,32 +559,23 @@ "settings": ["ui_separator"], "layer1.texture": "ayu/assets/separator-right.png", "layer1.inner_margin": [0, 1, 2, 1], - "layer1.opacity": 0.3, - "layer1.tint": [81, 92, 102] - }, - { - "class": "sidebar_container", - "platforms": ["osx"], - "settings": ["ui_separator", "!ui_native_titlebar"], - "layer2.opacity": 0.3, - "layer2.texture": "ayu/assets/separator-top.png", - "layer2.tint": [81, 92, 102], - "layer2.inner_margin": [1, 2, 1, 0] + "layer1.opacity": 1, + "layer1.tint": [10, 13, 16], }, + { "class": "sidebar_tree", "indent_top_level": false, "row_padding": [20, 6], "dark_content": false, "spacer_rows": true, - "indent_offset": 0, - "indent": 12 + "indent_offset": 2, + "indent": 10 }, { "class": "sidebar_heading", - "color": [81, 92, 102], - "font.face": "Roboto mono", + "color": [49, 57, 63], "font.bold": true, "font.size": 11 }, @@ -633,34 +586,33 @@ }, { "class": "sidebar_heading", - "settings": ["ui_font_default"], - "font.face": "" + "settings": ["ui_font_roboto_mono"], + "font.face": "Roboto mono" }, { "class": "tree_row", - "layer1.texture": "ayu/assets/tree-highlight.png", - "layer1.tint": [81, 92, 102, 50], - "layer1.inner_margin": [8, 4, 8, 4], - "layer1.opacity": 0 + "layer0.texture": "ayu/assets/tree-highlight.png", + "layer0.tint": [10, 13, 16], + "layer0.inner_margin": [8, 4, 8, 4], + "layer0.opacity": 0 }, { "class": "tree_row", - "layer1.texture": "ayu/assets/tree-highlight-separators.png", + "layer0.texture": "ayu/assets/tree-highlight-separators.png", "settings": ["ui_separator"] }, { "class": "tree_row", "attributes": ["selected"], - "layer1.opacity": 1 + "layer0.opacity": 1 }, { "class": "sidebar_label", - "color": [81, 92, 102], - "font.face": "Roboto mono", + "color": [71, 82, 89], "font.size": 12 }, { @@ -670,26 +622,26 @@ }, { "class": "sidebar_label", - "settings": ["ui_font_default"], - "font.face": "" + "settings": ["ui_font_roboto_mono"], + "font.face": "Roboto mono" }, { "class": "sidebar_label", "parents": [{"class": "tree_row","attributes": ["hover"]}], - "color": [230, 225, 207] + "color": [191, 186, 176] }, { "class": "sidebar_label", "parents": [{"class": "tree_row","attributes": ["selected"]}], - "color": [230, 225, 207] + "color": [191, 186, 176] }, { "class": "sidebar_label", "parents": [{"class": "tree_row","attributes": ["expandable"]}], - "color": [81, 92, 102], + "color": [71, 82, 89], "font.bold": false }, @@ -703,13 +655,13 @@ { "class": "sidebar_label", "parents": [{"class": "tree_row", "attributes": ["expandable", "hover"]}], - "color": [230, 225, 207] + "color": [191, 186, 176] }, { "class": "sidebar_label", "parents": [{"class": "tree_row", "attributes": ["expanded"]}], - "color": [230, 225, 207] + "color": [191, 186, 176] }, { @@ -722,7 +674,7 @@ // { // "class": "sidebar_label", // "parents": [{"class": "tree_row", "attributes": ["expanded", "selected"]}], - // "color": [230, 225, 207] + // "color": [191, 186, 176] // }, { @@ -745,7 +697,7 @@ "layer0.opacity": 0, "layer1.texture": "ayu/assets/folder.png", - "layer1.tint": [62, 75, 89], + "layer1.tint": [46, 54, 60], "layer1.opacity": 1, "layer2.texture": "ayu/assets/folder-open.png", @@ -829,11 +781,11 @@ "class": "icon_folder_dup", "content_margin": [9, 9], "layer0.texture": "ayu/assets/folder.png", - "layer0.tint": [62, 75, 89], + "layer0.tint": [46, 54, 60], "layer0.opacity": 1.0, "layer1.texture": "ayu/assets/folder-symlink.png", - "layer1.tint": [81, 92, 102], + "layer1.tint": [71, 82, 89], "layer1.opacity": 0.3 }, @@ -859,13 +811,13 @@ // Opened files { "class": "close_button", - "content_margin": [8, 8], + "content_margin": [6, 8], // Default Close icon "layer0.texture": "ayu/assets/close.png", "layer0.opacity": 0, "layer0.inner_margin": [0, 0], - "layer0.tint": [81, 92, 102] + "layer0.tint": [71, 82, 89] }, @@ -874,15 +826,14 @@ { "class": "close_button", "parents": [{ "class": "tree_row", "attributes": ["hover"] }], - // Default Close icon - "layer0.opacity": 0.6 + "layer0.opacity": 1 }, { "class": "close_button", "attributes": ["dirty"], "layer0.texture": "ayu/assets/dirty.png", - "layer0.tint": [81, 92, 102], + "layer0.tint": [71, 82, 89], "layer0.opacity": 1.0 }, @@ -903,7 +854,7 @@ "layer0.opacity": 1.0, "layer1.texture": "ayu/assets/scrollbar-vertical-wide.png", - "layer1.tint": [81, 92, 102], + "layer1.tint": [71, 82, 89], "layer1.opacity": 0.1, "layer1.inner_margin": [0, 10], "blur": false @@ -911,7 +862,7 @@ { "class": "scroll_bar_control", "parents": [{"class": "overlay_control"}], - "layer0.tint": [20, 25, 31], + "layer0.tint": [19, 24, 29], "blur": false }, { @@ -929,7 +880,7 @@ { "class": "puck_control", "layer0.texture": "ayu/assets/scrollbar-vertical-wide.png", - "layer0.tint": [81, 92, 102], + "layer0.tint": [71, 82, 89], "layer0.opacity": 0.3, "layer0.inner_margin": [0, 10], "content_margin": [6, 12], @@ -1017,14 +968,14 @@ { "class": "minimap_control", "settings": ["always_show_minimap_viewport"], - "viewport_color": [100, 100, 100], - "viewport_opacity": 0.3 + "viewport_color": [5, 6, 8], + "viewport_opacity": 0.2 }, { "class": "minimap_control", "settings": ["!always_show_minimap_viewport"], - "viewport_color": [100, 100, 100], + "viewport_color": [5, 6, 8], "viewport_opacity": { "target": 0, "speed": 4.0, "interpolation": "smoothstep" } }, @@ -1044,11 +995,10 @@ { "class": "label_control", - "color": [81, 92, 102], + "color": [71, 82, 89], "shadow_color": [0, 0, 0, 0], "shadow_offset": [0, 0], "font.bold": false, - "font.face": "Roboto mono", "font.size": 12 }, { @@ -1058,8 +1008,8 @@ }, { "class": "label_control", - "settings": ["ui_font_default"], - "font.face": "" + "settings": ["ui_font_roboto_mono"], + "font.face": "Roboto mono" }, // Status bar labels @@ -1067,7 +1017,7 @@ { "class": "label_control", "parents": [{"class": "status_bar"}], - "color": [81, 92, 102], + "color": [71, 82, 89], "font.bold": false }, @@ -1079,14 +1029,15 @@ "layer0.tint": [15, 20, 25], "layer0.opacity": 1, "layer1.texture": "ayu/assets/separator-top.png", + "layer1.tint": [10, 13, 16], "layer1.inner_margin": [1, 2, 1, 0], - "content_margin": [10, 0] + "content_margin": [16, 3] }, { "class": "status_bar", "settings": ["ui_separator"], - "layer0.tint": [20, 25, 31] - // "layer1.opacity": 0.3 + // "layer0.tint": [19, 24, 29], + // "layer1.opacity": 1 }, { @@ -1102,7 +1053,7 @@ { "class": "panel_button_control", "layer0.texture": "ayu/assets/switch-panel.png", - "layer0.tint": [81, 92, 102], + "layer0.tint": [71, 82, 89], "layer0.opacity": 1.0 }, @@ -1127,11 +1078,11 @@ { "class": "panel_control", "settings": ["ui_separator"], - "layer0.tint": [20, 25, 31], + // "layer0.tint": [19, 24, 29], "layer1.texture": "ayu/assets/separator-top.png", - "layer1.tint": [81, 92, 102], + "layer1.tint": [10, 13, 16], "layer1.inner_margin": [1, 2, 1, 0], - "layer1.opacity": 0.3 + "layer1.opacity": 1 }, // Status bar panel close icon @@ -1140,7 +1091,7 @@ "class": "panel_close_button", "layer0.texture": "ayu/assets/close.png", "layer0.opacity": 1.0, - "layer0.tint": [81, 92, 102], + "layer0.tint": [71, 82, 89], "content_margin": [0, 0] // 8,8 to show }, { @@ -1156,12 +1107,12 @@ "layer0.texture": "ayu/assets/input-bg.png", "layer0.opacity": 1, "layer0.inner_margin": [10, 8], - "layer0.tint": [20, 25, 31], + "layer0.tint": [19, 24, 29], "layer1.texture": "ayu/assets/input-border.png", - "layer1.opacity": 0.3, + "layer1.opacity": 1, "layer1.inner_margin": [10, 8], - "layer1.tint": [81, 92, 102], + "layer1.tint": [10, 13, 16], "content_margin": [10, 7, 10, 5] }, @@ -1175,9 +1126,9 @@ "layer0.opacity": 0, "layer1.texture": "ayu/assets/input-search.png", "layer1.opacity": 1, - "layer1.tint": [242, 151, 24], - "layer1.inner_margin": [35, 0, 0, 0], - "content_margin": [43, 7, 10, 4] + "layer1.tint": [71, 82, 89, 100], + "layer1.inner_margin": [60, 0, 0, 0], + "content_margin": [50, 7, 10, 4] }, // Textline input oveflow menu @@ -1185,7 +1136,7 @@ "class": "dropdown_button_control", "content_margin": [12, 12], "layer0.texture": "ayu/assets/overflow-menu.png", - "layer0.tint": [62, 75, 89], + "layer0.tint": [46, 54, 60], "layer0.opacity": 1.0 }, { @@ -1220,7 +1171,7 @@ { "class": "label_control", "parents": [{"class": "button_control"}], - "color": [81, 92, 102] + "color": [71, 82, 89] }, { @@ -1234,7 +1185,7 @@ "class": "icon_button_control", "layer0.tint": [0, 0, 0], "layer0.opacity": 0, - "layer2.tint": [230, 225, 207], + "layer2.tint": [191, 186, 176], "layer2.opacity": { "target": 0.0, "speed": 10.0, "interpolation": "smoothstep" }, "content_margin": [10, 5] }, @@ -1247,7 +1198,7 @@ { "class": "icon_regex", "layer0.texture": "ayu/assets/regex.png", - "layer0.tint": [81, 92, 102], + "layer0.tint": [71, 82, 89], "layer0.opacity": 1.0, "content_margin": [12, 12] }, @@ -1263,7 +1214,7 @@ { "class": "icon_case", "layer0.texture": "ayu/assets/matchcase.png", - "layer0.tint": [81, 92, 102], + "layer0.tint": [71, 82, 89], "layer0.opacity": 1.0, "content_margin": [12, 12] }, @@ -1279,7 +1230,7 @@ { "class": "icon_whole_word", "layer0.texture": "ayu/assets/word.png", - "layer0.tint": [81, 92, 102], + "layer0.tint": [71, 82, 89], "layer0.opacity": 1.0, "content_margin": [12, 12] }, @@ -1295,7 +1246,7 @@ { "class": "icon_wrap", "layer0.texture": "ayu/assets/wrap.png", - "layer0.tint": [81, 92, 102], + "layer0.tint": [71, 82, 89], "layer0.opacity": 1.0, "content_margin": [12, 12] }, @@ -1311,7 +1262,7 @@ { "class": "icon_in_selection", "layer0.texture": "ayu/assets/inselection.png", - "layer0.tint": [81, 92, 102], + "layer0.tint": [71, 82, 89], "layer0.opacity": 1.0, "content_margin": [12, 12] }, @@ -1327,7 +1278,7 @@ { "class": "icon_highlight", "layer0.texture": "ayu/assets/highlight.png", - "layer0.tint": [81, 92, 102], + "layer0.tint": [71, 82, 89], "layer0.opacity": 1.0, "content_margin": [12, 12] }, @@ -1343,7 +1294,7 @@ { "class": "icon_preserve_case", "layer0.texture": "ayu/assets/replace-preserve-case.png", - "layer0.tint": [81, 92, 102], + "layer0.tint": [71, 82, 89], "layer0.opacity": 1.0, "content_margin": [12, 12] }, @@ -1359,7 +1310,7 @@ { "class": "icon_context", "layer0.texture": "ayu/assets/context.png", - "layer0.tint": [81, 92, 102], + "layer0.tint": [71, 82, 89], "layer0.opacity": 1.0, "content_margin": [12, 12] }, @@ -1376,7 +1327,7 @@ { "class": "icon_use_buffer", "layer0.texture": "ayu/assets/buffer.png", - "layer0.tint": [81, 92, 102], + "layer0.tint": [71, 82, 89], "layer0.opacity": 1.0, "content_margin": [12, 12] }, @@ -1392,7 +1343,7 @@ { "class": "icon_reverse", "layer0.texture": "ayu/assets/reverse.png", - "layer0.tint": [81, 92, 102], + "layer0.tint": [71, 82, 89], "layer0.opacity": 1.0, "content_margin": [12, 12] }, @@ -1408,7 +1359,7 @@ { "class": "title_bar", "bg": [15, 20, 25], - "fg": [230, 225, 207] + "fg": [191, 186, 176] }, { "class": "title_bar", diff --git a/ayu-dark.tmTheme b/ayu-dark.tmTheme index 9d13aa89..a6d90da4 100644 --- a/ayu-dark.tmTheme +++ b/ayu-dark.tmTheme @@ -18,35 +18,35 @@ accent #F29718 activeGuide - #314559 + #363F46 background #0F1419 caret #F29718 findHighlight - #FFEE99 + #F29718 findHighlightForeground #0F1419 foreground - #E6E1CF + #BFBAB0 guide - #35404C + #20272C gutter #0F1419 gutterForeground - #35404C + #252D33 inactiveBackground #0F1419 inactiveSelection - #25334088 + #131E27 invisibles - #35404C + #252D33 lineHighlight - #151A1F + #0A0E12 popupCss html, body { - background-color: #14191F; - color: #E6E1CF; + background-color: #13181D; + color: #BFBAB0; } body { padding: 1px 3px; @@ -56,13 +56,13 @@ a { } selection - #253340 + #16242E selectionBorder - #253340 + #192B37 shadow #00000010 stackGuide - #1A2633 + #20272C @@ -86,7 +86,7 @@ a { settings foreground - #E6E1CF + #BFBAB0 @@ -108,7 +108,7 @@ a { settings foreground - #FFEE99 + #F29718 @@ -130,7 +130,7 @@ a { settings foreground - #FFEE99 + #F29718 @@ -141,7 +141,7 @@ a { settings foreground - #FFEE99 + #F29718 @@ -185,7 +185,7 @@ a { settings foreground - #E6E1CFCC + #BFBAB0CC @@ -196,7 +196,7 @@ a { settings foreground - #E6E1CF + #BFBAB0 @@ -218,7 +218,7 @@ a { settings foreground - #E6E1CFCC + #BFBAB0CC @@ -297,7 +297,7 @@ a { settings foreground - #FFEE99 + #F29718 @@ -698,7 +698,7 @@ a { settings background - #E6E1CF07 + #BFBAB007 @@ -709,7 +709,7 @@ a { settings background - #E6E1CF10 + #BFBAB010 @@ -720,7 +720,7 @@ a { settings background - #E6E1CF10 + #BFBAB010 fontStyle bold foreground @@ -737,7 +737,7 @@ a { fontStyle italic foreground - #FFEE99 + #F29718 @@ -781,7 +781,7 @@ a { settings foreground - #FF3333 + #F07178 @@ -803,7 +803,7 @@ a { settings background - #E6E1CF10 + #BFBAB010 foreground #39BAE6 @@ -838,9 +838,9 @@ a { settings background - #E6E1CF10 + #BFBAB010 foreground - #E6E1CF + #BFBAB0 @@ -851,7 +851,7 @@ a { settings background - #E6E1CF10 + #BFBAB010 foreground #5C6773 @@ -908,7 +908,7 @@ a { settings foreground - #5C6773 + #20272C @@ -919,7 +919,7 @@ a { settings foreground - #5C6773 + #20272C diff --git a/ayu-dark2.sublime-theme b/ayu-dark2.sublime-theme deleted file mode 100644 index e5ee64e8..00000000 --- a/ayu-dark2.sublime-theme +++ /dev/null @@ -1,1280 +0,0 @@ -// prefix="" -// sublime="2" -// ext="sublime-theme" -[ - - /* @ EMPTY WINDOW - * Style for empty (no tabs) window - ========================================================================= */ - - { - "class" : "sheet_container_control", - "layer0.tint" : [15, 20, 25], - "layer0.opacity" : 1.0 - }, - - - /* @ GRID LAYOUT - * Grid style - ========================================================================= */ - - { - "class": "grid_layout_control", - "border_size": 0, - "border_color": [29, 36, 44] - }, - { - "class": "grid_layout_control", - "settings": ["ui_separator"], - "border_size": 1 - }, - - /* @ DIALOG POPUP - * Dialog popup style and progressbar - ========================================================================= */ - // !!! - { - "class": "progress_gauge_control", - "layer0.tint": [242, 151, 24], - "layer0.opacity": 1.0, - "content_margin": [0, 6] - }, - - { - "class": "dialog", - "layer0.tint": [15, 20, 25], - "layer0.opacity": 1.0 - }, - - { - "class": "progress_bar_control", - "layer0.tint": [15, 20, 25], - "layer0.opacity": 1.0 - }, - - - /* @ CODE FOLDING - * Folding arrow setting and behavioring - ========================================================================= */ - { - "class": "fold_button_control", - "layer0.texture": "ayu/assets/unfold.png", - "layer0.opacity": 1.0, - "layer0.inner_margin": 0, - "layer0.tint": [81, 92, 102], - "content_margin": [8, 6, 8, 6] - }, - - { - "class": "fold_button_control", - "attributes": ["hover"], - "layer0.tint": [242, 151, 24] - }, - - { - "class": "fold_button_control", - "attributes": ["expanded"], - "layer0.texture": "ayu/assets/fold.png" - }, - - - /* @ AUTOCOMPLETE - * Autocomplete popup setting and behavioring - ========================================================================= */ - - { - "class": "popup_control", - "layer0.tint": [20, 25, 31], - "layer0.opacity": 1.0, - "content_margin": [0, 0] - }, - - { - "class": "auto_complete", - "row_padding": [12, 6], - "layer0.tint": [20, 25, 31], - "layer0.opacity": 1.0 - }, - - { - "class": "auto_complete_label", - "fg": [81, 92, 102], - "match_fg": [242, 151, 24], - "selected_fg": [230, 225, 207], - "selected_match_fg": [242, 151, 24] - }, - - { - "class": "table_row", - "layer0.tint": [25, 31, 38], - "layer0.opacity": 0.0 - }, - - { - "class": "table_row", - "attributes": ["selected"], - "layer0.opacity": 1.0 - }, - - - /* @ TOOLTIP - * Tooltip setting and behavioring - ========================================================================= */ - - { - "class": "tool_tip_control", - "layer0.tint": [15, 20, 25], - "layer0.inner_margin": [0, 0], - "layer0.opacity": 1.0, - "content_margin": [10, 6] - }, - - { - "class": "tool_tip_label_control", - "color": [81, 92, 102], - "font.face": "Roboto mono", - "font.size": 12 - }, - { - "class": "tool_tip_label_control", - "settings": ["ui_font_source_code_pro"], - "font.face": "Source Code Pro" - }, - { - "class": "tool_tip_label_control", - "settings": ["ui_font_default"], - "font.face": "" - }, - - /* @OVERLAY PANELS - * Overlay panels setting and behavioring - ========================================================================= */ - - // Command Panel - { - "class": "overlay_control", - "layer0.texture": "ayu/assets/overlay-shadow.png", - "layer0.inner_margin": [25, 45, 25, 35], - "layer0.opacity": 1.0, - "layer0.tint": [0, 0, 0], - - "layer1.texture": "ayu/assets/overlay-bg.png", - "layer1.inner_margin": [25, 45, 25, 35], - "layer1.opacity": 1.0, - "layer1.tint": [20, 25, 31], - - "content_margin": [20, 45, 20, 35] - }, - - // Command Panel list item style (cmd + shift + p) - - { - "class": "mini_quick_panel_row", - "layer0.tint": [15, 20, 25, 0], - "layer0.inner_margin": [2, 2, 2, 2], - "layer0.opacity": 1.0 - }, - - // Command Panel selected list item style (cmd + p) - - { - "class": "mini_quick_panel_row", - "attributes": ["selected"], - "layer0.tint": [25, 31, 38] - }, - - // Quick panel project setting (project manager) (cmd + ctrl + p) - - { - "class": "quick_panel", - "row_padding": [32, 12], - "layer0.tint": [20, 25, 31], - "layer0.opacity": 1.0 - }, - - // Quick Panel row default style (project manager) - - { - "class": "quick_panel_row", - "layer0.texture": "", - "layer0.tint": [20, 25, 31], - "layer0.inner_margin": 0, - "layer0.opacity": 1.0 - }, - - // Row panel style inside comman panel (cmd + shift + p) - - { - "class": "quick_panel_row", - "parents": [{"class": "overlay_control"}], - "layer0.tint": [20, 25, 31], - "layer0.opacity": 1.0 - }, - - // Quick panel (project) style inside overlay_control (cmd + shift + p) - - { - "class": "quick_panel", - "parents": [{"class": "overlay_control"}], - "row_padding": [10, 7], - "layer0.tint": [20, 25, 31], - "layer0.opacity": 1.0 - }, - - // Quick Panel selected list item style - - { - "class": "quick_panel_row", - "attributes": ["selected"], - "layer0.tint": [25, 31, 38] - }, - - // Panel labels - - { - "class": "quick_panel_label", - "fg": [81, 92, 102], - "match_fg": [242, 151, 24], - "selected_fg": [230, 225, 207], - "selected_match_fg": [242, 151, 24] - }, - - // Panel labels - - { - "class": "quick_panel_label", - "parents": [{"class": "overlay_control"}], - "fg": [81, 92, 102], - "match_fg": [242, 151, 24], - "selected_fg": [230, 225, 207], - "selected_match_fg": [242, 151, 24] - }, - - // Panels sublabels - - { - "class": "quick_panel_path_label", - "fg": [66, 80, 94], - "match_fg": [230, 225, 207], - "selected_fg": [81, 92, 102], - "selected_match_fg": [230, 225, 207] - }, - - // Panels data / score - - { - "class": "quick_panel_score_label", - "fg": [81, 92, 102], - "selected_fg": [81, 92, 102] - }, - - - - /* @ TABS - * Tabs settings and behavioring - ========================================================================= */ - - { - "class": "tabset_control", - "tab_overlap": 0, - "tab_width": 50, - "tab_min_width": 50, - "tab_height": 30, - "mouse_wheel_switch": false, - - "layer0.opacity": 1.0, - "layer0.tint": [15, 20, 25], - "content_margin": [10, 0] - }, - { - "class": "tabset_control", - "settings": ["mouse_wheel_switches_tabs", "!enable_tab_scrolling"], - "mouse_wheel_switch": true - }, - { - "class": "tabset_control", - "settings": ["ui_separator"], - "content_margin": [0, 0, 0, 0], - "layer1.opacity": 0.3, - "layer1.texture": "ayu/assets/separator-bottom.png", - "layer1.tint": [81, 92, 102], - "layer1.inner_margin": [1, 0, 1, 2] - }, - { - "class": "tabset_control", - "settings": ["ui_big_tabs"], - "tab_height": 44 - }, - - // Tabs - { - "class": "tab_control", - - "layer0.tint": [15, 20, 25], - "layer0.opacity": 1.0, - - "layer1.texture": "", - - "layer2.texture": "ayu/assets/separator-bottom.png", - "layer2.tint": [242, 151, 24], - "layer2.inner_margin": [1, 0, 1, 2], - "layer2.opacity": 0.0, - - "layer3.texture": "", - - "content_margin": [10, -2, 10, 0], - "max_margin_trim": 12 - }, - { - "class": "tab_control", - "settings": ["ui_separator"], - - "layer1.texture": "ayu/assets/separator-right.png", - "layer1.tint": [81, 92, 102], - "layer1.inner_margin": [0, 1, 2, 1], - "layer1.opacity": 0.3, - - "layer3.texture": "ayu/assets/separator-bottom.png", - "layer3.tint": [81, 92, 102], - "layer3.inner_margin": [1, 0, 1, 2], - "layer3.opacity": 0.3 - }, - { - "class": "tab_control", - "settings": ["ui_big_tabs"], - "content_margin": [15, -2, 15, 0] - }, - - // Selected current tab - - { - "class": "tab_control", "attributes": ["selected"], - "layer2.opacity": 1.0, - "layer3.opacity": 0.0 - }, - - // Hovered current tab - - { - "class": "tab_control", "attributes": ["hover"], - "layer2.opacity": 0.3 - }, - - // Selected current tab - - { - "class": "tab_control", "attributes": ["selected","hover"], - "layer2.opacity": 1.0 - }, - - // Tab Labels - - { - "class": "tab_label", - "fg": [15, 20, 25, 0], - "shadow_color": [81, 92, 102], - "shadow_offset": [0, -1], - "font.size": 12, - "font.italic": false, - "font.bold": false, - "font.face": "Roboto mono" - }, - { - "class": "tab_label", - "settings": ["ui_font_source_code_pro"], - "font.face": "Source Code Pro" - }, - { - "class": "tab_label", - "settings": ["ui_font_default"], - "font.face": "" - }, - { - "class": "tab_label", - "fg": [81, 92, 102], - "settings": ["ui_fix_tab_labels"], - "shadow_color": [15, 20, 25, 0], - "shadow_offset": [0, 0] - }, - - // Tab selected label color - - { - "class": "tab_label", - "parents": [{"class": "tab_control", "attributes": ["selected"]}], - "fg": [15, 20, 25, 0], - "shadow_color": [230, 225, 207], - "shadow_offset": [0, -1] - }, - { - "class": "tab_label", - "settings": ["ui_fix_tab_labels"], - "parents": [{"class": "tab_control", "attributes": ["selected"]}], - "fg": [230, 225, 207], - "shadow_color": [15, 20, 25, 0], - "shadow_offset": [0, 0] - }, - - { - "class": "tab_label", - "attributes": ["transient"], - "font.italic": true - }, - - // Tab Close Buttons - { - "class": "tab_close_button", - "content_margin": [0, 0], - - // Close Icon - "layer0.texture": "ayu/assets/close.png", - "layer0.tint": [81, 92, 102], - "layer0.opacity": 1.0, - - // Dirty Icon - "layer1.texture": "ayu/assets/dirty.png", - "layer1.tint": [81, 92, 102], - "layer1.opacity": 0 - }, - - // Default - { - "class": "tab_close_button", - "settings": ["show_tab_close_buttons"], - "content_margin": [8, 8] - }, - - // Default hover - { - "class": "tab_close_button", - "settings": ["show_tab_close_buttons"], - "attributes": ["hover"], - "layer0.tint": [242, 151, 24] - }, - - // Dirty tab - { - "class": "tab_close_button", - "parents": [{"class": "tab_control", "attributes": ["dirty"]}], - "layer0.opacity": 0, // Close Icon - "layer1.opacity": 1.0, // dirty Icon - "content_margin": [8, 8] - }, - - // Dirty tab on hover - { - "class": "tab_close_button", - "parents": [{"class": "tab_control", "attributes": ["dirty"]}], - "attributes": ["hover"], - "layer0.opacity": 1.0, // Close Icon - "layer1.opacity": 0 // Close Icon - }, - - // Selected dirty tab - { - "class": "tab_close_button", - "parents": [{"class": "tab_control", "attributes": ["selected", "dirty"]}], - "layer0.opacity": 0, // Close Icon - "layer1.opacity": 1.0, // Dirty Icon - "layer1.tint": [242, 151, 24] - }, - - // Selected dirty tab on hover - { - "class": "tab_close_button", - "parents": [{"class": "tab_control", "attributes": ["selected", "dirty"]}], - "attributes": ["hover"], - "layer0.opacity": 1.0, - "layer1.opacity": 0 - }, - // tab set scroll left | scroll right - { - "class": "scroll_tabs_left_button", - "content_margin": [12, 15], - "layer0.texture": "ayu/assets/arrow-left.png", - "layer0.tint": [62, 75, 89], - "layer0.opacity": 1.0 - }, - - { - "class": "scroll_tabs_left_button", - "attributes": ["hover"], - "layer0.tint": [242, 151, 24] - }, - - { - "class": "scroll_tabs_right_button", - "content_margin": [12, 15], - "layer0.texture": "ayu/assets/arrow-right.png", - "layer0.tint": [62, 75, 89], - "layer0.opacity": 1.0 - }, - { - "class": "scroll_tabs_right_button", - "settings": ["ui_separator"], - "layer2.texture": "ayu/assets/separator-right.png", - "layer2.tint": [81, 92, 102], - "layer2.opacity": 0.3, - "layer2.inner_margin" : [0, 1, 2, 1] - }, - - { - "class": "scroll_tabs_right_button", - "attributes": ["hover"], - "layer0.tint": [242, 151, 24] - }, - - { - "class": "show_tabs_dropdown_button", - "content_margin": [12, 12], - "layer0.texture": "ayu/assets/overflow-menu.png", - "layer0.tint": [62, 75, 89], - "layer0.opacity": 1.0, - "layer0.inner_margin": [0, 0] - }, - - { - "class": "show_tabs_dropdown_button", - "attributes": ["hover"], - "layer0.tint": [242, 151, 24] - }, - - - /* @ SIDEBAR - * Sidebar panel settings and behavioring - ========================================================================= */ - - { - "class": "sidebar_container", - "content_margin": [0, -20, 0, 0], - "layer0.opacity": 1, - "layer0.tint": [15, 20, 25] - }, - { - "class": "sidebar_container", - "settings": ["ui_separator"], - "layer1.texture": "ayu/assets/separator-right.png", - "layer1.tint": [81, 92, 102], - "layer1.inner_margin": [0, 1, 2, 1], - "layer1.opacity": 0.3 - }, - - { - "class": "sidebar_tree", - "row_padding": [30, 6], - "indent": 12, - "indent_offset": 0, - "indent_top_level": false, - "dark_content": true - }, - - { - "class": "sidebar_heading", - "color": [15, 20, 25], - "font.face": "Roboto mono", - "font.bold": true, - "font.size": 11 - }, - { - "class": "sidebar_heading", - "settings": ["ui_font_source_code_pro"], - "font.face": "Source Code Pro" - }, - { - "class": "sidebar_heading", - "settings": ["ui_font_default"], - "font.face": "" - }, - - { - "class": "tree_row", - "layer1.texture": "ayu/assets/tree-highlight.png", - "layer1.opacity": { "target": 0.0, "speed": 5.0, "interpolation": "smoothstep" }, - "layer1.tint": [242, 151, 24], - "layer1.inner_margin": [5, 0, 0, 3], - "layer0.tint": [25, 31, 38], - "layer0.opacity": 0 - }, - - { - "class": "tree_row", - "attributes": ["selected"], - "layer1.opacity": { "target": 1.0, "speed": 5.0, "interpolation": "smoothstep" } - }, - - { - "class": "sidebar_label", - "color": [81, 92, 102], - "shadow_color": [0, 0, 0], - "shadow_offset": [0, 0], - "font.face": "Roboto mono", - "font.size": 12 - }, - { - "class": "sidebar_label", - "settings": ["ui_font_source_code_pro"], - "font.face": "Source Code Pro" - }, - { - "class": "sidebar_label", - "settings": ["ui_font_default"], - "font.face": "" - }, - - { - "class": "sidebar_label", - "parents": [{"class": "tree_row","attributes": ["hover"]}], - "color": [230, 225, 207] - }, - - { - "class": "sidebar_label", - "parents": [{"class": "tree_row","attributes": ["selected"]}], - "color": [230, 225, 207], - "shadow_color": [0, 0, 0], - "shadow_offset": [0, 0] - }, - - { - "class": "sidebar_label", - "parents": [{"class": "tree_row","attributes": ["expandable"]}], - "color": [81, 92, 102], - "font.bold": false - }, - - { - "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", "hover"]}], - "color": [230, 225, 207] - }, - - { - "class": "sidebar_label", - "parents": [{"class": "tree_row", "attributes": ["expanded"]}], - "color": [230, 225, 207] - }, - - { - "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": [230, 225, 207] - // }, - - { - "class": "sidebar_label", - "attributes": ["transient"], - "font.italic": false - }, - - // Hidden arrow icon before folder - - { - "class": "disclosure_button_control", - "layer0.texture": "ayu/assets/arrow-right.png", - "layer0.tint": [62, 75, 89], - "layer0.opacity": 1, - "layer0.inner_margin": 0, - "content_margin": [12, 15] - }, - - { - "class": "disclosure_button_control", - "parents": [{ "class": "tree_row", "attributes": ["hover"]}], - "layer0.tint": [242, 151, 24] - }, - - { - "class": "disclosure_button_control", - "attributes": ["expanded"], - "layer0.texture": "ayu/assets/overflow-menu.png", - "content_margin": [12, 12] - }, - - { - "class": "disclosure_button_control", - "attributes": ["expanded"], - "parents": [{ "class": "tree_row", "attributes": ["hover"]}], - "layer0.tint": [242, 151, 24] - }, - - // Opened files - { - "class": "close_button", - "content_margin": [8, 8], - - // Default Close icon - "layer0.texture": "ayu/assets/close.png", - "layer0.opacity": 0, - "layer0.inner_margin": [0, 0], - "layer0.tint": [81, 92, 102] - }, - - - // Opened file hover - - { - "class": "close_button", - "parents": [{ "class": "tree_row", "attributes": ["hover"] }], - // Default Close icon - "layer0.opacity": 0.6 - }, - - { - "class": "close_button", - "attributes": ["dirty"], - "layer0.texture": "ayu/assets/dirty.png", - "layer0.tint": [81, 92, 102], - "layer0.opacity": 1.0 - }, - - { - "class": "close_button", - "attributes": ["hover"], - "layer0.opacity": 1.0, - "layer0.tint": [242, 151, 24] - }, - - - /* @ SCROLLBARS - * Scrollbars settings and behavioring - ========================================================================= */ - - // Normal Vertical scrollbar track - // !!! - { - "class": "scroll_bar_control", - "layer0.tint" : [15, 20, 25], - "layer0.opacity": 1, - "layer0.inner_margin": [0, 0], - "blur": false - }, - - // Normal Vertical scrollbar track inside overlay panel - - { - "class": "scroll_bar_control", - "parents": [{"class": "overlay_control"}], - "layer0.tint": [15, 20, 25, 0], - "layer0.opacity": 1.0, - "layer0.inner_margin": [0, 2], - "blur": false - }, - - // Normal horizontal scrollbar track - - { - "class": "scroll_bar_control", - "attributes": ["horizontal"], - "layer0.texture": "", - "layer0.tint" : [15, 20, 25], - "layer0.inner_margin": [0, 0], - "blur": false - }, - - // Normal horizontal scrollbar track inside overlay panel - // !!! - // { - // "class": "scroll_bar_control", - // "attributes": ["horizontal"], - // "parents": [{"class": "overlay_control"}], - // "layer0.tint": [15, 20, 25, 0], - // "layer0.opacity": 0.0, - // "layer0.inner_margin": [0, 2], - // "blur": false - // }, - - // Scrollbars corner - - { - "class": "scroll_corner_control", - "layer0.texture": "", - "layer0.tint":[15, 20, 25], - "layer0.inner_margin": [0, 0], - "layer0.opacity": 1, - "blur": false - }, - - // Vertical puck controller - - { - "class": "puck_control", - "layer0.texture": "", - "layer0.tint": [255, 255, 255, 50], - "layer0.opacity": 1, - "layer0.inner_margin": [0, 0], - "content_margin": [1, 12], - "blur": false - }, - - // Horizontal puck controller - - { - "class": "puck_control", - "attributes": ["horizontal"], - "layer0.texture": "", - "layer0.tint": [255, 255, 255, 50], - "layer0.inner_margin": [0, 0], - "content_margin": [12, 1], - "blur": false - }, - - { - "class": "scroll_area_control", - "settings": ["overlay_scroll_bars"], - "overlay": true - }, - - { - "class": "scroll_area_control", - "settings": ["!overlay_scroll_bars"], - "overlay": false // set to false for the original behavior - }, - - - { - "class": "scroll_area_control", - "parents": [{"class": "overlay_control"}], - "settings": ["overlay_scroll_bars"], - "overlay": true // set to false for the original behavior - }, - - { - "class": "scroll_area_control", - "parents": [{"class": "sidebar_container"}], - "settings": ["!overlay_scroll_bars"], - "overlay": false // set to false for the original behavior - }, - - { - "class": "scroll_bar_control", - "settings": ["overlay_scroll_bars"], - "layer0.tint": [28, 31, 38], - "layer0.inner_margin": [0, 5], - "blur": false - }, - - { - "class": "scroll_bar_control", - "settings": ["overlay_scroll_bars"], - "attributes": ["horizontal"], - "layer0.inner_margin": [5, 0], - "blur": true - }, - - - /* @ MINIMAP - * Minimap settings and behavioring - ========================================================================= */ - - { - "class": "minimap_control", - "settings": ["always_show_minimap_viewport"], - "viewport_color": [100, 100, 100] - }, - - { - "class": "minimap_control", - "settings": ["!always_show_minimap_viewport"], - "viewport_color": [100, 100, 100, 20] - }, - - - /* @ STATUS BAR - * Status bar settings and behavioring - ========================================================================= */ - - // All labels - - { - "class": "label_control", - "color": [81, 92, 102], - "shadow_color": [0, 0, 0, 0], - "shadow_offset": [0, 0], - "font.bold": false, - "font.face": "Roboto mono", - "font.size": 12 - }, - { - "class": "label_control", - "settings": ["ui_font_source_code_pro"], - "font.face": "Source Code Pro" - }, - { - "class": "label_control", - "settings": ["ui_font_default"], - "font.face": "" - }, - - // Status bar labels - - { - "class": "label_control", - "parents": [{"class": "status_bar"}], - "color": [81, 92, 102], - "font.bold": false - }, - - // Text field labels - - { - "class": "status_bar", - "layer0.texture": "", - "layer0.tint": [15, 20, 25], - "layer0.opacity": 1, - "layer1.texture": "ayu/assets/separator-top.png", - "layer1.inner_margin": [1, 2, 1, 0], - "content_margin": [10, 5] - }, - { - "class": "status_bar", - "settings": ["ui_separator"], - "layer0.tint": [20, 25, 31] - // "layer1.opacity": 0.3 - }, - - { - "class": "status_container", - "content_margin": [0, 5] - }, - - { - "class": "status_button", - "min_size": [100, 0] - }, - - - /* @ WIDGET PANEL - * Widget, input, buttons settings and behavioring - ========================================================================= */ - - - // Status bar panel - { - "class": "panel_control", - "layer0.tint": [15, 20, 25], - "layer0.opacity": 1.0, - "content_margin": [0, 5] - }, - { - "class": "panel_control", - "settings": ["ui_separator"], - "layer0.tint": [20, 25, 31], - "layer1.texture": "ayu/assets/separator-top.png", - "layer1.tint": [81, 92, 102], - "layer1.inner_margin": [1, 2, 1, 0], - "layer1.opacity": 0.3 - }, - - // Status bar panel close icon - - { - "class": "panel_close_button", - "layer0.texture": "ayu/assets/close.png", - "layer0.opacity": 1.0, - "layer0.tint": [81, 92, 102], - "content_margin": [0, 0] // 8,8 to show - }, - // !!! - { - "class": "panel_close_button", - "attributes": ["hover"], - "layer0.tint": [242, 151, 24] - }, - - // Texline input - - { - "class": "text_line_control", - "layer0.texture": "ayu/assets/input-bg.png", - "layer0.opacity": 1, - "layer0.inner_margin": [10, 8], - "layer0.tint": [20, 25, 31], - - "layer1.texture": "ayu/assets/input-border.png", - "layer1.opacity": 0.3, - "layer1.inner_margin": [10, 8], - "layer1.tint": [81, 92, 102], - "content_margin": [10, 7, 10, 5] - }, - - - // Textline input inside overlay panels - - { - "class": "text_line_control", - "parents": [{"class": "overlay_control"}], - "layer0.texture": "", - "layer0.opacity": 0, - "layer1.texture": "ayu/assets/input-search.png", - "layer1.opacity": 1, - "layer1.tint": [242, 151, 24], - "layer1.inner_margin": [35, 0, 0, 0], - "content_margin": [43, 7, 10, 4] - }, - - // Textline input oveflow menu - { - "class": "dropdown_button_control", - "content_margin": [12, 12], - "layer0.texture": "ayu/assets/overflow-menu.png", - "layer0.tint": [62, 75, 89], - "layer0.opacity": 1.0 - }, - { - "class": "dropdown_button_control", - "attributes": ["hover"], - "layer0.tint": [242, 151, 24] - }, - - - /* @ BUTTONS - * Buttons panels settings and behavioring - ========================================================================= */ - - - // Button labels - - { - "class": "button_control", - "content_margin": [15, 9, 15, 10], - "min_size": [60, 0], - "layer0.tint": [242, 151, 24, 10], - "layer0.texture": "ayu/assets/input-bg.png", - "layer0.inner_margin": [10, 8], - "layer0.opacity": 0 - }, - { - "class": "button_control", - "attributes": ["hover"], - "layer0.opacity": 1 - }, - - { - "class": "label_control", - "parents": [{"class": "button_control"}], - "color": [81, 92, 102] - }, - - { - "class": "label_control", - "parents": [{"class": "button_control", "attributes": ["hover"]}], - "color": [242, 151, 24] - }, - - // !!! - // Small Icon Buttons - { - "class": "icon_button_control", - "layer0.tint": [0, 0, 0], - "layer0.opacity": 0, - "layer2.tint": [230, 225, 207], - "layer2.opacity": { "target": 0.0, "speed": 10.0, "interpolation": "smoothstep" }, - "content_margin": [10, 5] - }, - - - /* Buttons icons settings - ===================================================================== */ - - // Regex Icon - { - "class": "icon_regex", - "layer0.texture": "ayu/assets/regex.png", - "layer0.tint": [81, 92, 102], - "layer0.opacity": 1.0, - "content_margin": [12, 12] - }, - - { - "class": "icon_regex", - "parents": [{"class": "icon_button_control", "attributes": ["selected"]}], - "layer0.tint": [242, 151, 24] - }, - - // Preserve case sensitive - - { - "class": "icon_case", - "layer0.texture": "ayu/assets/matchcase.png", - "layer0.tint": [81, 92, 102], - "layer0.opacity": 1.0, - "content_margin": [12, 12] - }, - - { - "class": "icon_case", - "parents": [{"class": "icon_button_control", "attributes": ["selected"]}], - "layer0.tint": [242, 151, 24] - }, - - // Wholeword - - { - "class": "icon_whole_word", - "layer0.texture": "ayu/assets/word.png", - "layer0.tint": [81, 92, 102], - "layer0.opacity": 1.0, - "content_margin": [12, 12] - }, - - - { - "class": "icon_whole_word", - "parents": [{"class": "icon_button_control", "attributes": ["selected"]}], - "layer0.tint": [242, 151, 24] - }, - - // Wrap - - { - "class": "icon_wrap", - "layer0.texture": "ayu/assets/wrap.png", - "layer0.tint": [81, 92, 102], - "layer0.opacity": 1.0, - "content_margin": [12, 12] - }, - - { - "class": "icon_wrap", - "parents": [{"class": "icon_button_control", "attributes": ["selected"]}], - "layer0.tint": [242, 151, 24] - }, - - // In selection - - { - "class": "icon_in_selection", - "layer0.texture": "ayu/assets/inselection.png", - "layer0.tint": [81, 92, 102], - "layer0.opacity": 1.0, - "content_margin": [12, 12] - }, - - { - "class": "icon_in_selection", - "parents": [{"class": "icon_button_control", "attributes": ["selected"]}], - "layer0.tint": [242, 151, 24] - }, - - // Highlight Result - - { - "class": "icon_highlight", - "layer0.texture": "ayu/assets/highlight.png", - "layer0.tint": [81, 92, 102], - "layer0.opacity": 1.0, - "content_margin": [12, 12] - }, - - { - "class": "icon_highlight", - "parents": [{"class": "icon_button_control", "attributes": ["selected"]}], - "layer0.tint": [242, 151, 24] - }, - - // Preserve Case - - { - "class": "icon_preserve_case", - "layer0.texture": "ayu/assets/replace-preserve-case.png", - "layer0.tint": [81, 92, 102], - "layer0.opacity": 1.0, - "content_margin": [12, 12] - }, - - { - "class": "icon_preserve_case", - "parents": [{"class": "icon_button_control", "attributes": ["selected"]}], - "layer0.tint": [242, 151, 24] - }, - - // Show context - - { - "class": "icon_context", - "layer0.texture": "ayu/assets/context.png", - "layer0.tint": [81, 92, 102], - "layer0.opacity": 1.0, - "content_margin": [12, 12] - }, - - - { - "class": "icon_context", - "parents": [{"class": "icon_button_control", "attributes": ["selected"]}], - "layer0.tint": [242, 151, 24] - }, - - // Use buffer - - { - "class": "icon_use_buffer", - "layer0.texture": "ayu/assets/buffer.png", - "layer0.tint": [81, 92, 102], - "layer0.opacity": 1.0, - "content_margin": [12, 12] - }, - - { - "class": "icon_use_buffer", - "parents": [{"class": "icon_button_control", "attributes": ["selected"]}], - "layer0.tint": [242, 151, 24] - }, - - // Reverse direction - - { - "class": "icon_reverse", - "layer0.texture": "ayu/assets/reverse.png", - "layer0.tint": [81, 92, 102], - "layer0.opacity": 1.0, - "content_margin": [12, 12] - }, - - { - "class": "icon_reverse", - "parents": [{"class": "icon_button_control", "attributes": ["selected"]}], - "layer0.tint": [242, 151, 24] - }, - - - /* Visual settings - ===================================================================== */ - - // UI font sizees - // ============== - { - "class": "tab_label", - "settings": ["ui_font_size_small"], - "font.size": 11 - }, - { - "class": "sidebar_label", - "settings": ["ui_font_size_small"], - "font.size": 11 - }, - { - "class": "label_control", - "settings": ["ui_font_size_small"], - "font.size": 11 - }, - { - "class": "tool_tip_label_control", - "settings": ["ui_font_size_small"], - "font.size": 11 - } -] diff --git a/ayu-light.sublime-theme b/ayu-light.sublime-theme index 964bde2c..2342bc44 100644 --- a/ayu-light.sublime-theme +++ b/ayu-light.sublime-theme @@ -8,9 +8,9 @@ */ { - "class" : "sheet_container_control", - "layer0.tint" : [250, 250, 250], - "layer0.opacity" : 1 + "class": "sheet_container_control", + "layer0.tint": [250, 250, 250], + "layer0.opacity": 1 }, @@ -21,7 +21,7 @@ { "class": "grid_layout_control", "border_size": 0, - "border_color": [226, 228, 231] + "border_color": [237, 237, 237] }, { "class": "grid_layout_control", @@ -34,7 +34,7 @@ */ { "class": "progress_gauge_control", - "layer0.tint": [255, 106, 0], + "layer0.tint": [255, 143, 64], "layer0.opacity": 1.0, "content_margin": [0, 6] }, @@ -60,14 +60,14 @@ "layer0.texture": "ayu/assets/unfold.png", "layer0.opacity": 1.0, "layer0.inner_margin": 0, - "layer0.tint": [133, 136, 140], + "layer0.tint": [157, 162, 166], "content_margin": [8, 6, 8, 6] }, { "class": "fold_button_control", "attributes": ["hover"], - "layer0.tint": [255, 106, 0], + "layer0.tint": [255, 143, 64], }, { @@ -96,10 +96,10 @@ { "class": "auto_complete_label", - "fg": [133, 136, 140], - "match_fg": [255, 106, 0], - "selected_fg": [110, 117, 128], - "selected_match_fg": [255, 106, 0], + "fg": [157, 162, 166], + "match_fg": [255, 143, 64], + "selected_fg": [97, 103, 108], + "selected_match_fg": [255, 143, 64], "fg_blend": true }, @@ -129,8 +129,7 @@ { "class": "tool_tip_label_control", - "color": [133, 136, 140], - "font.face": "Roboto mono", + "color": [157, 162, 166], "font.size": 13 }, { @@ -140,8 +139,8 @@ }, { "class": "tool_tip_label_control", - "settings": ["ui_font_default"], - "font.face": "" + "settings": ["ui_font_roboto_mono"], + "font.face": "Roboto mono" }, /* OVERLAY PANELS @@ -152,21 +151,21 @@ { "class": "overlay_control", "layer0.texture": "ayu/assets/overlay-shadow.png", - "layer0.inner_margin": [25, 45, 25, 35], - "layer0.opacity": 1.0, - "layer0.tint": [126, 132, 140], + "layer0.inner_margin": [15, 35, 15, 25], + "layer0.opacity": 0.6, + "layer0.tint": [200, 200, 200], "layer1.texture": "ayu/assets/overlay-border.png", - "layer1.inner_margin": [25, 45, 25, 35], + "layer1.inner_margin": [15, 35, 15, 25], "layer1.opacity": 1.0, - "layer1.tint": [110, 117, 128, 30], + "layer1.tint": [200, 200, 200], "layer2.texture": "ayu/assets/overlay-bg.png", - "layer2.inner_margin": [25, 45, 25, 35], + "layer2.inner_margin": [15, 35, 15, 25], "layer2.opacity": 1.0, "layer2.tint": [255, 255, 255], - "content_margin": [20, 45, 20, 35] + "content_margin": [10, 35, 10, 20] }, // Command Panel list item style (cmd + shift + p) @@ -215,17 +214,15 @@ }, // Quick panel (project) style inside overlay_control (cmd + shift + p) - { "class": "quick_panel", "parents": [{"class": "overlay_control"}], - "row_padding": [20, 5], + "row_padding": [24, 8], "layer0.tint": [255, 255, 255], "layer0.opacity": 1.0 }, // Quick Panel selected list item style - { "class": "quick_panel_row", "attributes": ["selected"], @@ -233,61 +230,56 @@ }, // Panel labels - { "class": "quick_panel_label", - "fg": [133, 136, 140], - "match_fg": [255, 106, 0], - "selected_fg": [110, 117, 128], - "selected_match_fg": [255, 106, 0] + "fg": [157, 162, 166], + "font.bold": false, + "match_fg": [255, 143, 64], + "selected_fg": [97, 103, 108], + "selected_match_fg": [255, 143, 64] }, // Panel labels - { "class": "quick_panel_label", "parents": [{"class": "overlay_control"}], - "fg": [133, 136, 140], - "match_fg": [255, 106, 0], - "selected_fg": [110, 117, 128], - "selected_match_fg": [255, 106, 0] + "fg": [157, 162, 166], + "match_fg": [255, 143, 64], + "selected_fg": [97, 103, 108], + "selected_match_fg": [255, 143, 64] }, // Panels sublabels - { "class": "quick_panel_path_label", - "fg": [149, 156, 166], - "match_fg": [110, 117, 128], - "selected_fg": [133, 136, 140], - "selected_match_fg": [110, 117, 128] + "fg": [185, 188, 191], + "match_fg": [128, 132, 136], + "selected_fg": [185, 188, 191], + "selected_match_fg": [128, 132, 136] }, // Panels data / score - { "class": "quick_panel_score_label", - "fg": [133, 136, 140], - "selected_fg": [133, 136, 140] + "fg": [157, 162, 166], + "selected_fg": [255, 143, 64] }, - /* TABS * Tabs settings and behavioring */ - { "class": "tabset_control", "mouse_wheel_switch": false, "tab_min_width": 50, "tab_overlap": 0, - "tab_height": 30, + "tab_height": 36, "tab_width": 50, "layer0.tint": [250, 250, 250], "layer0.opacity": 1.0, - "content_margin": [0, 0] // <<<<<<<<<<<<< + "content_margin": [10, 0] }, { "class": "tabset_control", @@ -298,114 +290,107 @@ "class": "tabset_control", "settings": ["ui_separator"], "content_margin": [0, 0, 0, 0], - "layer1.opacity": 0.2, + "layer1.opacity": 1, "layer1.texture": "ayu/assets/separator-bottom.png", - "layer1.tint": [133, 136, 140], + "layer1.tint": [237, 237, 237], "layer1.inner_margin": [1, 0, 1, 2] }, { "class": "tabset_control", "platforms": ["osx"], "settings": ["ui_separator", "!ui_native_titlebar"], - "layer2.opacity": 0.2, + "layer2.opacity": 1, "layer2.texture": "ayu/assets/separator-top.png", - "layer2.tint": [133, 136, 140], + "layer2.tint": [237, 237, 237], "layer2.inner_margin": [1, 2, 1, 0] }, - { - "class": "tabset_control", - "settings": ["ui_big_tabs"], - "tab_height": 40 - }, - // Tabs { "class": "tab_control", - - "layer0.tint": [250, 250, 250, 0], + // Background + "layer0.tint": [250, 250, 250], "layer0.opacity": 1.0, - "layer1.texture": "", + // Top + "layer1.texture": "ayu/assets/separator-top.png", + "layer1.tint": [237, 237, 237], + "layer1.inner_margin": [0, 1, 0, 0], + "layer1.opacity": 0.0, - "layer2.texture": "ayu/assets/separator-bottom.png", - "layer2.tint": [255, 106, 0], - "layer2.inner_margin": [1, 0, 1, 2], + // Right + "layer2.texture": "ayu/assets/separator-right.png", + "layer2.tint": [237, 237, 237], + "layer2.inner_margin": [0, 0, 1, 0], "layer2.opacity": 0.0, - "layer3.texture": "", + // Bottom + "layer3.texture": "ayu/assets/separator-bottom.png", + "layer3.tint": [237, 237, 237], + "layer3.inner_margin": [0, 0, 0, 1], + "layer3.opacity": 0.0, - "content_margin": [10, -2, 10, 0], + "content_margin": [15, -2, 15, 0], "max_margin_trim": 12 }, { "class": "tab_control", "settings": ["ui_separator"], - "layer1.texture": "ayu/assets/separator-right.png", - "layer1.tint": [133, 136, 140], - "layer1.inner_margin": [0, 1, 2, 1], - "layer1.opacity": 0.2, + "layer1.opacity": 1.0, - "layer3.texture": "ayu/assets/separator-bottom.png", - "layer3.tint": [133, 136, 140], - "layer3.inner_margin": [1, 0, 1, 2], - "layer3.opacity": 0.2 - }, - { - "class": "tab_control", - "settings": ["ui_big_tabs"], - "content_margin": [15, -2, 15, 0] + "layer2.opacity": 1.0, + + "layer3.opacity": 1.0 }, // Selected current tab - { "class": "tab_control", "attributes": ["selected"], - "layer2.opacity": 1.0, - "layer3.opacity": 0.0 + "settings": ["!ui_separator"], + "layer3.tint": [255, 143, 64], + "layer3.opacity": 1.0 }, { "class": "tab_control", "attributes": ["selected"], "settings": ["ui_separator"], - "layer0.tint": [133, 136, 140, 15] + "layer1.tint": [255, 143, 64], + "layer3.opacity": 0.0 }, // Hovered current tab - { "class": "tab_control", "attributes": ["hover"], - "layer2.opacity": 0.3 + "settings": ["!ui_separator"], + "layer3.tint": [255, 143, 64], + "layer3.opacity": 0.3 }, { "class": "tab_control", "attributes": ["hover"], "settings": ["ui_separator"], - "layer0.tint": [133, 136, 140, 6], + "layer0.tint": [237, 237, 237, 70], }, // Selected current tab - { "class": "tab_control", "attributes": ["selected", "hover"], - "layer2.opacity": 1.0 + "settings": ["!ui_separator"], + "layer3.opacity": 1.0 }, { "class": "tab_control", "attributes": ["selected", "hover"], "settings": ["ui_separator"], - "layer0.tint": [133, 136, 140, 15] + "layer0.tint": [250, 250, 250] }, // Tab Labels { "class": "tab_label", - "fg": [250, 250, 250, 0], - "shadow_color": [133, 136, 140], - "shadow_offset": [0, -1], + "fg": [157, 162, 166], "font.italic": false, "font.bold": false, - "font.size": 12, - "font.face": "Roboto mono" + "font.size": 12 }, { "class": "tab_label", @@ -414,28 +399,15 @@ }, { "class": "tab_label", - "settings": ["ui_font_default"], - "font.face": "" + "settings": ["ui_font_roboto_mono"], + "font.face": "Roboto mono" }, { "class": "tab_label", "settings": ["highlight_modified_tabs"], "font.italic": true, "attributes": ["dirty"], - "shadow_color": [255, 106, 0] - }, - { - "class": "tab_label", - "fg": [133, 136, 140], - "settings": ["ui_fix_tab_labels"], - "shadow_color": [250, 250, 250, 0], - "shadow_offset": [0, 0] - }, - { - "class": "tab_label", - "fg": [255, 106, 0], - "attributes": ["dirty"], - "settings": ["ui_fix_tab_labels", "highlight_modified_tabs"] + "fg": [255, 143, 64] }, // Tab selected label color @@ -443,17 +415,7 @@ { "class": "tab_label", "parents": [{"class": "tab_control", "attributes": ["selected"]}], - "fg": [250, 250, 250, 0], - "shadow_color": [110, 117, 128], - "shadow_offset": [0, -1], - }, - { - "class": "tab_label", - "settings": ["ui_fix_tab_labels"], - "parents": [{"class": "tab_control", "attributes": ["selected"]}], - "fg": [110, 117, 128], - "shadow_color": [250, 250, 250, 0], - "shadow_offset": [0, 0] + "fg": [97, 103, 108] }, { @@ -469,12 +431,12 @@ // Close Icon "layer0.texture": "ayu/assets/close.png", - "layer0.tint": [133, 136, 140], + "layer0.tint": [157, 162, 166], "layer0.opacity": 1.0, // Dirty Icon "layer1.texture": "ayu/assets/dirty.png", - "layer1.tint": [133, 136, 140], + "layer1.tint": [157, 162, 166], "layer1.opacity": 0, }, @@ -482,7 +444,7 @@ { "class": "tab_close_button", "settings": ["show_tab_close_buttons"], - "content_margin": [8, 8] + "content_margin": [6, 8] }, // Default hover @@ -490,7 +452,7 @@ "class": "tab_close_button", "settings": ["show_tab_close_buttons", "highlight_modified_tabs"], "attributes": ["hover"], - "layer0.tint": [255, 106, 0] + "layer0.tint": [255, 143, 64] }, // Dirty tab @@ -499,7 +461,7 @@ "parents": [{"class": "tab_control", "attributes": ["dirty"]}], "layer0.opacity": 0, // Close Icon "layer1.opacity": 1.0, // dirty Icon - "content_margin": [8, 8] + "content_margin": [6, 8] }, // Dirty tab on hover @@ -517,7 +479,7 @@ "parents": [{"class": "tab_control", "attributes": ["selected", "dirty"]}], "layer0.opacity": 0, // Close Icon "layer1.opacity": 1.0, // Dirty Icon - "layer1.tint": [255, 106, 0] + "layer1.tint": [255, 143, 64] }, // Selected dirty tab on hover @@ -534,43 +496,43 @@ "class": "scroll_tabs_left_button", "content_margin": [12, 15], "layer0.texture": "ayu/assets/arrow-left.png", - "layer0.tint": [135, 143, 153], + "layer0.tint": [194, 197, 200], "layer0.opacity": 1.0 }, { "class": "scroll_tabs_left_button", "attributes": ["hover"], - "layer0.tint": [255, 106, 0] + "layer0.tint": [255, 143, 64] }, { "class": "scroll_tabs_right_button", "content_margin": [12, 15], "layer0.texture": "ayu/assets/arrow-right.png", - "layer0.tint": [135, 143, 153], + "layer0.tint": [194, 197, 200], "layer0.opacity": 1.0 }, { "class": "scroll_tabs_right_button", "settings": ["ui_separator"], "layer2.texture": "ayu/assets/separator-right.png", - "layer2.tint": [133, 136, 140], - "layer2.opacity": 0.2, - "layer2.inner_margin" : [0, 1, 2, 1] + "layer2.tint": [237, 237, 237], + "layer2.opacity": 1, + "layer2.inner_margin": [0, 1, 2, 1] }, { "class": "scroll_tabs_right_button", "attributes": ["hover"], - "layer0.tint": [255, 106, 0] + "layer0.tint": [255, 143, 64] }, { "class": "show_tabs_dropdown_button", "content_margin": [12, 12], "layer0.texture": "ayu/assets/overflow-menu.png", - "layer0.tint": [135, 143, 153], + "layer0.tint": [194, 197, 200], "layer0.opacity": 1.0, "layer0.inner_margin": [0, 0] }, @@ -578,7 +540,7 @@ { "class": "show_tabs_dropdown_button", "attributes": ["hover"], - "layer0.tint": [255, 106, 0] + "layer0.tint": [255, 143, 64] }, @@ -588,7 +550,7 @@ { "class": "sidebar_container", - "content_margin": [0, 4, 0, 0], + "content_margin": [0, 6, 0, 0], "layer0.opacity": 1, "layer0.tint": [250, 250, 250] }, @@ -597,32 +559,23 @@ "settings": ["ui_separator"], "layer1.texture": "ayu/assets/separator-right.png", "layer1.inner_margin": [0, 1, 2, 1], - "layer1.opacity": 0.2, - "layer1.tint": [133, 136, 140] - }, - { - "class": "sidebar_container", - "platforms": ["osx"], - "settings": ["ui_separator", "!ui_native_titlebar"], - "layer2.opacity": 0.2, - "layer2.texture": "ayu/assets/separator-top.png", - "layer2.tint": [133, 136, 140], - "layer2.inner_margin": [1, 2, 1, 0] + "layer1.opacity": 1, + "layer1.tint": [237, 237, 237], }, + { "class": "sidebar_tree", "indent_top_level": false, "row_padding": [20, 6], "dark_content": false, "spacer_rows": true, - "indent_offset": 0, - "indent": 12 + "indent_offset": 2, + "indent": 10 }, { "class": "sidebar_heading", - "color": [133, 136, 140], - "font.face": "Roboto mono", + "color": [194, 197, 200], "font.bold": true, "font.size": 11 }, @@ -633,34 +586,33 @@ }, { "class": "sidebar_heading", - "settings": ["ui_font_default"], - "font.face": "" + "settings": ["ui_font_roboto_mono"], + "font.face": "Roboto mono" }, { "class": "tree_row", - "layer1.texture": "ayu/assets/tree-highlight.png", - "layer1.tint": [133, 136, 140, 50], - "layer1.inner_margin": [8, 4, 8, 4], - "layer1.opacity": 0 + "layer0.texture": "ayu/assets/tree-highlight.png", + "layer0.tint": [237, 237, 237], + "layer0.inner_margin": [8, 4, 8, 4], + "layer0.opacity": 0 }, { "class": "tree_row", - "layer1.texture": "ayu/assets/tree-highlight-separators.png", + "layer0.texture": "ayu/assets/tree-highlight-separators.png", "settings": ["ui_separator"] }, { "class": "tree_row", "attributes": ["selected"], - "layer1.opacity": 1 + "layer0.opacity": 1 }, { "class": "sidebar_label", - "color": [133, 136, 140], - "font.face": "Roboto mono", + "color": [157, 162, 166], "font.size": 12 }, { @@ -670,26 +622,26 @@ }, { "class": "sidebar_label", - "settings": ["ui_font_default"], - "font.face": "" + "settings": ["ui_font_roboto_mono"], + "font.face": "Roboto mono" }, { "class": "sidebar_label", "parents": [{"class": "tree_row","attributes": ["hover"]}], - "color": [110, 117, 128] + "color": [97, 103, 108] }, { "class": "sidebar_label", "parents": [{"class": "tree_row","attributes": ["selected"]}], - "color": [110, 117, 128] + "color": [97, 103, 108] }, { "class": "sidebar_label", "parents": [{"class": "tree_row","attributes": ["expandable"]}], - "color": [133, 136, 140], + "color": [157, 162, 166], "font.bold": false }, @@ -703,13 +655,13 @@ { "class": "sidebar_label", "parents": [{"class": "tree_row", "attributes": ["expandable", "hover"]}], - "color": [110, 117, 128] + "color": [97, 103, 108] }, { "class": "sidebar_label", "parents": [{"class": "tree_row", "attributes": ["expanded"]}], - "color": [110, 117, 128] + "color": [97, 103, 108] }, { @@ -722,7 +674,7 @@ // { // "class": "sidebar_label", // "parents": [{"class": "tree_row", "attributes": ["expanded", "selected"]}], - // "color": [110, 117, 128] + // "color": [97, 103, 108] // }, { @@ -745,11 +697,11 @@ "layer0.opacity": 0, "layer1.texture": "ayu/assets/folder.png", - "layer1.tint": [135, 143, 153], + "layer1.tint": [194, 197, 200], "layer1.opacity": 1, "layer2.texture": "ayu/assets/folder-open.png", - "layer2.tint": [255, 106, 0], + "layer2.tint": [255, 143, 64], "layer2.opacity": 0.0 }, @@ -763,7 +715,7 @@ { "class": "icon_folder", "parents": [{ "class": "tree_row", "attributes": ["hover"] }], - "layer1.tint": [255, 106, 0] + "layer1.tint": [255, 143, 64] }, { @@ -795,7 +747,7 @@ { "class": "icon_folder", "parents": [{ "class": "tree_row", "attributes": ["selected"] }], - "layer1.tint": [255, 106, 0] + "layer1.tint": [255, 143, 64] }, { @@ -818,7 +770,7 @@ "loop": true, "frame_time": 0.075 }, - "layer1.tint": [255, 106, 0], + "layer1.tint": [255, 143, 64], "layer0.opacity": 0.0, "content_margin": [8, 8] @@ -829,24 +781,24 @@ "class": "icon_folder_dup", "content_margin": [9, 9], "layer0.texture": "ayu/assets/folder.png", - "layer0.tint": [135, 143, 153], + "layer0.tint": [194, 197, 200], "layer0.opacity": 1.0, "layer1.texture": "ayu/assets/folder-symlink.png", - "layer1.tint": [133, 136, 140], + "layer1.tint": [157, 162, 166], "layer1.opacity": 0.3 }, { "class": "icon_folder_dup", "parents": [{ "class": "tree_row", "attributes": ["hover"]}], - "layer0.tint": [255, 106, 0] + "layer0.tint": [255, 143, 64] }, { "class": "icon_folder_dup", "parents": [{"class": "tree_row", "attributes": ["expanded"] }], - "layer0.tint": [255, 106, 0] + "layer0.tint": [255, 143, 64] }, // Hidden arrow icon before folder @@ -859,13 +811,13 @@ // Opened files { "class": "close_button", - "content_margin": [8, 8], + "content_margin": [6, 8], // Default Close icon "layer0.texture": "ayu/assets/close.png", "layer0.opacity": 0, "layer0.inner_margin": [0, 0], - "layer0.tint": [133, 136, 140] + "layer0.tint": [157, 162, 166] }, @@ -874,15 +826,14 @@ { "class": "close_button", "parents": [{ "class": "tree_row", "attributes": ["hover"] }], - // Default Close icon - "layer0.opacity": 0.6 + "layer0.opacity": 1 }, { "class": "close_button", "attributes": ["dirty"], "layer0.texture": "ayu/assets/dirty.png", - "layer0.tint": [133, 136, 140], + "layer0.tint": [157, 162, 166], "layer0.opacity": 1.0 }, @@ -890,7 +841,7 @@ "class": "close_button", "attributes": ["hover"], "layer0.opacity": 1.0, - "layer0.tint": [255, 106, 0] + "layer0.tint": [255, 143, 64] }, @@ -903,7 +854,7 @@ "layer0.opacity": 1.0, "layer1.texture": "ayu/assets/scrollbar-vertical-wide.png", - "layer1.tint": [133, 136, 140], + "layer1.tint": [157, 162, 166], "layer1.opacity": 0.1, "layer1.inner_margin": [0, 10], "blur": false @@ -929,7 +880,7 @@ { "class": "puck_control", "layer0.texture": "ayu/assets/scrollbar-vertical-wide.png", - "layer0.tint": [133, 136, 140], + "layer0.tint": [157, 162, 166], "layer0.opacity": 0.3, "layer0.inner_margin": [0, 10], "content_margin": [6, 12], @@ -1017,14 +968,14 @@ { "class": "minimap_control", "settings": ["always_show_minimap_viewport"], - "viewport_color": [130, 140, 153], + "viewport_color": [225, 225, 225], "viewport_opacity": 0.2 }, { "class": "minimap_control", "settings": ["!always_show_minimap_viewport"], - "viewport_color": [130, 140, 153], + "viewport_color": [225, 225, 225], "viewport_opacity": { "target": 0, "speed": 4.0, "interpolation": "smoothstep" } }, @@ -1044,11 +995,10 @@ { "class": "label_control", - "color": [133, 136, 140], + "color": [157, 162, 166], "shadow_color": [0, 0, 0, 0], "shadow_offset": [0, 0], "font.bold": false, - "font.face": "Roboto mono", "font.size": 12 }, { @@ -1058,8 +1008,8 @@ }, { "class": "label_control", - "settings": ["ui_font_default"], - "font.face": "" + "settings": ["ui_font_roboto_mono"], + "font.face": "Roboto mono" }, // Status bar labels @@ -1067,7 +1017,7 @@ { "class": "label_control", "parents": [{"class": "status_bar"}], - "color": [133, 136, 140], + "color": [157, 162, 166], "font.bold": false }, @@ -1079,14 +1029,15 @@ "layer0.tint": [250, 250, 250], "layer0.opacity": 1, "layer1.texture": "ayu/assets/separator-top.png", + "layer1.tint": [237, 237, 237], "layer1.inner_margin": [1, 2, 1, 0], - "content_margin": [10, 0] + "content_margin": [16, 3] }, { "class": "status_bar", "settings": ["ui_separator"], - "layer0.tint": [255, 255, 255] - // "layer1.opacity": 0.2 + // "layer0.tint": [255, 255, 255], + // "layer1.opacity": 1 }, { @@ -1102,14 +1053,14 @@ { "class": "panel_button_control", "layer0.texture": "ayu/assets/switch-panel.png", - "layer0.tint": [133, 136, 140], + "layer0.tint": [157, 162, 166], "layer0.opacity": 1.0 }, { "class": "panel_button_control", "attributes": ["hover"], - "layer0.tint": [255, 106, 0] + "layer0.tint": [255, 143, 64] }, /* WIDGET PANEL @@ -1127,11 +1078,11 @@ { "class": "panel_control", "settings": ["ui_separator"], - "layer0.tint": [255, 255, 255], + // "layer0.tint": [255, 255, 255], "layer1.texture": "ayu/assets/separator-top.png", - "layer1.tint": [133, 136, 140], + "layer1.tint": [237, 237, 237], "layer1.inner_margin": [1, 2, 1, 0], - "layer1.opacity": 0.2 + "layer1.opacity": 1 }, // Status bar panel close icon @@ -1140,13 +1091,13 @@ "class": "panel_close_button", "layer0.texture": "ayu/assets/close.png", "layer0.opacity": 1.0, - "layer0.tint": [133, 136, 140], + "layer0.tint": [157, 162, 166], "content_margin": [0, 0] // 8,8 to show }, { "class": "panel_close_button", "attributes": ["hover"], - "layer0.tint": [255, 106, 0] + "layer0.tint": [255, 143, 64] }, // Texline input @@ -1159,9 +1110,9 @@ "layer0.tint": [255, 255, 255], "layer1.texture": "ayu/assets/input-border.png", - "layer1.opacity": 0.2, + "layer1.opacity": 1, "layer1.inner_margin": [10, 8], - "layer1.tint": [133, 136, 140], + "layer1.tint": [237, 237, 237], "content_margin": [10, 7, 10, 5] }, @@ -1175,9 +1126,9 @@ "layer0.opacity": 0, "layer1.texture": "ayu/assets/input-search.png", "layer1.opacity": 1, - "layer1.tint": [255, 106, 0], - "layer1.inner_margin": [35, 0, 0, 0], - "content_margin": [43, 7, 10, 4] + "layer1.tint": [157, 162, 166, 100], + "layer1.inner_margin": [60, 0, 0, 0], + "content_margin": [50, 7, 10, 4] }, // Textline input oveflow menu @@ -1185,13 +1136,13 @@ "class": "dropdown_button_control", "content_margin": [12, 12], "layer0.texture": "ayu/assets/overflow-menu.png", - "layer0.tint": [135, 143, 153], + "layer0.tint": [194, 197, 200], "layer0.opacity": 1.0 }, { "class": "dropdown_button_control", "attributes": ["hover"], - "layer0.tint": [255, 106, 0] + "layer0.tint": [255, 143, 64] }, @@ -1206,7 +1157,7 @@ "class": "button_control", "content_margin": [15, 9, 15, 10], "min_size": [60, 0], - "layer0.tint": [255, 106, 0, 10], + "layer0.tint": [255, 143, 64, 10], "layer0.texture": "ayu/assets/input-bg.png", "layer0.inner_margin": [10, 8], "layer0.opacity": 0 @@ -1220,13 +1171,13 @@ { "class": "label_control", "parents": [{"class": "button_control"}], - "color": [133, 136, 140] + "color": [157, 162, 166] }, { "class": "label_control", "parents": [{"class": "button_control", "attributes": ["hover"]}], - "color": [255, 106, 0] + "color": [255, 143, 64] }, // Small Icon Buttons @@ -1234,7 +1185,7 @@ "class": "icon_button_control", "layer0.tint": [0, 0, 0], "layer0.opacity": 0, - "layer2.tint": [110, 117, 128], + "layer2.tint": [97, 103, 108], "layer2.opacity": { "target": 0.0, "speed": 10.0, "interpolation": "smoothstep" }, "content_margin": [10, 5] }, @@ -1247,7 +1198,7 @@ { "class": "icon_regex", "layer0.texture": "ayu/assets/regex.png", - "layer0.tint": [133, 136, 140], + "layer0.tint": [157, 162, 166], "layer0.opacity": 1.0, "content_margin": [12, 12] }, @@ -1255,7 +1206,7 @@ { "class": "icon_regex", "parents": [{"class": "icon_button_control", "attributes": ["selected"]}], - "layer0.tint": [255, 106, 0] + "layer0.tint": [255, 143, 64] }, // Preserve case sensitive @@ -1263,7 +1214,7 @@ { "class": "icon_case", "layer0.texture": "ayu/assets/matchcase.png", - "layer0.tint": [133, 136, 140], + "layer0.tint": [157, 162, 166], "layer0.opacity": 1.0, "content_margin": [12, 12] }, @@ -1271,7 +1222,7 @@ { "class": "icon_case", "parents": [{"class": "icon_button_control", "attributes": ["selected"]}], - "layer0.tint": [255, 106, 0] + "layer0.tint": [255, 143, 64] }, // Wholeword @@ -1279,7 +1230,7 @@ { "class": "icon_whole_word", "layer0.texture": "ayu/assets/word.png", - "layer0.tint": [133, 136, 140], + "layer0.tint": [157, 162, 166], "layer0.opacity": 1.0, "content_margin": [12, 12] }, @@ -1287,7 +1238,7 @@ { "class": "icon_whole_word", "parents": [{"class": "icon_button_control", "attributes": ["selected"]}], - "layer0.tint": [255, 106, 0] + "layer0.tint": [255, 143, 64] }, // Wrap @@ -1295,7 +1246,7 @@ { "class": "icon_wrap", "layer0.texture": "ayu/assets/wrap.png", - "layer0.tint": [133, 136, 140], + "layer0.tint": [157, 162, 166], "layer0.opacity": 1.0, "content_margin": [12, 12] }, @@ -1303,7 +1254,7 @@ { "class": "icon_wrap", "parents": [{"class": "icon_button_control", "attributes": ["selected"]}], - "layer0.tint": [255, 106, 0] + "layer0.tint": [255, 143, 64] }, // In selection @@ -1311,7 +1262,7 @@ { "class": "icon_in_selection", "layer0.texture": "ayu/assets/inselection.png", - "layer0.tint": [133, 136, 140], + "layer0.tint": [157, 162, 166], "layer0.opacity": 1.0, "content_margin": [12, 12] }, @@ -1319,7 +1270,7 @@ { "class": "icon_in_selection", "parents": [{"class": "icon_button_control", "attributes": ["selected"]}], - "layer0.tint": [255, 106, 0] + "layer0.tint": [255, 143, 64] }, // Highlight Result @@ -1327,7 +1278,7 @@ { "class": "icon_highlight", "layer0.texture": "ayu/assets/highlight.png", - "layer0.tint": [133, 136, 140], + "layer0.tint": [157, 162, 166], "layer0.opacity": 1.0, "content_margin": [12, 12] }, @@ -1335,7 +1286,7 @@ { "class": "icon_highlight", "parents": [{"class": "icon_button_control", "attributes": ["selected"]}], - "layer0.tint": [255, 106, 0] + "layer0.tint": [255, 143, 64] }, // Preserve Case @@ -1343,7 +1294,7 @@ { "class": "icon_preserve_case", "layer0.texture": "ayu/assets/replace-preserve-case.png", - "layer0.tint": [133, 136, 140], + "layer0.tint": [157, 162, 166], "layer0.opacity": 1.0, "content_margin": [12, 12] }, @@ -1351,7 +1302,7 @@ { "class": "icon_preserve_case", "parents": [{"class": "icon_button_control", "attributes": ["selected"]}], - "layer0.tint": [255, 106, 0] + "layer0.tint": [255, 143, 64] }, // Show context @@ -1359,7 +1310,7 @@ { "class": "icon_context", "layer0.texture": "ayu/assets/context.png", - "layer0.tint": [133, 136, 140], + "layer0.tint": [157, 162, 166], "layer0.opacity": 1.0, "content_margin": [12, 12] }, @@ -1368,7 +1319,7 @@ { "class": "icon_context", "parents": [{"class": "icon_button_control", "attributes": ["selected"]}], - "layer0.tint": [255, 106, 0] + "layer0.tint": [255, 143, 64] }, // Use buffer @@ -1376,7 +1327,7 @@ { "class": "icon_use_buffer", "layer0.texture": "ayu/assets/buffer.png", - "layer0.tint": [133, 136, 140], + "layer0.tint": [157, 162, 166], "layer0.opacity": 1.0, "content_margin": [12, 12] }, @@ -1384,7 +1335,7 @@ { "class": "icon_use_buffer", "parents": [{"class": "icon_button_control", "attributes": ["selected"]}], - "layer0.tint": [255, 106, 0] + "layer0.tint": [255, 143, 64] }, // Reverse direction @@ -1392,7 +1343,7 @@ { "class": "icon_reverse", "layer0.texture": "ayu/assets/reverse.png", - "layer0.tint": [133, 136, 140], + "layer0.tint": [157, 162, 166], "layer0.opacity": 1.0, "content_margin": [12, 12] }, @@ -1400,7 +1351,7 @@ { "class": "icon_reverse", "parents": [{"class": "icon_button_control", "attributes": ["selected"]}], - "layer0.tint": [255, 106, 0] + "layer0.tint": [255, 143, 64] }, /* Title bar @@ -1408,7 +1359,7 @@ { "class": "title_bar", "bg": [250, 250, 250], - "fg": [110, 117, 128] + "fg": [97, 103, 108] }, { "class": "title_bar", diff --git a/ayu-light.tmTheme b/ayu-light.tmTheme index e864b2b7..e25216f8 100644 --- a/ayu-light.tmTheme +++ b/ayu-light.tmTheme @@ -16,37 +16,37 @@ settings accent - #FF6A00 + #FF8F40 activeGuide - #B3B2B1 + #B9BCBF background #FAFAFA caret - #FF6A00 + #FF8F40 findHighlight - #A37ACC + #FF8F40 findHighlightForeground #FAFAFA foreground - #6E7580 + #61676C guide - #D9D8D7 + #DEE0E1 gutter #FAFAFA gutterForeground - #D9D8D7 + #D9DBDD inactiveBackground #FAFAFA inactiveSelection - #F0EEE488 + #ECF4F9 invisibles - #D9D8D7 + #D9DBDD lineHighlight - #F2F2F2 + #F3F3F3 popupCss html, body { background-color: #FFFFFF; - color: #6E7580; + color: #61676C; } body { padding: 1px 3px; @@ -56,13 +56,13 @@ a { } selection - #F0EEE4 + #E9F2F8 selectionBorder - #F0EEE4 + #E3EFF8 shadow #00000010 stackGuide - #DEDDDC + #DEE0E1 @@ -86,7 +86,7 @@ a { settings foreground - #6E7580 + #61676C @@ -108,7 +108,7 @@ a { settings foreground - #A37ACC + #FF8F40 @@ -130,7 +130,7 @@ a { settings foreground - #A37ACC + #FF8F40 @@ -141,7 +141,7 @@ a { settings foreground - #A37ACC + #FF8F40 @@ -185,7 +185,7 @@ a { settings foreground - #6E7580CC + #61676CCC @@ -196,7 +196,7 @@ a { settings foreground - #6E7580 + #61676C @@ -218,7 +218,7 @@ a { settings foreground - #6E7580CC + #61676CCC @@ -297,7 +297,7 @@ a { settings foreground - #A37ACC + #FF8F40 @@ -698,7 +698,7 @@ a { settings background - #6E758007 + #61676C07 @@ -709,7 +709,7 @@ a { settings background - #6E758010 + #61676C10 @@ -720,7 +720,7 @@ a { settings background - #6E758010 + #61676C10 fontStyle bold foreground @@ -737,7 +737,7 @@ a { fontStyle italic foreground - #A37ACC + #FF8F40 @@ -781,7 +781,7 @@ a { settings foreground - #F51818 + #F07171 @@ -803,7 +803,7 @@ a { settings background - #6E758010 + #61676C10 foreground #55B4D4 @@ -838,9 +838,9 @@ a { settings background - #6E758010 + #61676C10 foreground - #6E7580 + #61676C @@ -851,7 +851,7 @@ a { settings background - #6E758010 + #61676C10 foreground #ABB0B6 @@ -908,7 +908,7 @@ a { settings foreground - #ABB0B6 + #DEE0E1 @@ -919,7 +919,7 @@ a { settings foreground - #ABB0B6 + #DEE0E1 diff --git a/ayu-light2.sublime-theme b/ayu-light2.sublime-theme deleted file mode 100644 index b92cee31..00000000 --- a/ayu-light2.sublime-theme +++ /dev/null @@ -1,1280 +0,0 @@ -// prefix="" -// sublime="2" -// ext="sublime-theme" -[ - - /* @ EMPTY WINDOW - * Style for empty (no tabs) window - ========================================================================= */ - - { - "class" : "sheet_container_control", - "layer0.tint" : [250, 250, 250], - "layer0.opacity" : 1.0 - }, - - - /* @ GRID LAYOUT - * Grid style - ========================================================================= */ - - { - "class": "grid_layout_control", - "border_size": 0, - "border_color": [226, 228, 231] - }, - { - "class": "grid_layout_control", - "settings": ["ui_separator"], - "border_size": 1 - }, - - /* @ DIALOG POPUP - * Dialog popup style and progressbar - ========================================================================= */ - // !!! - { - "class": "progress_gauge_control", - "layer0.tint": [255, 106, 0], - "layer0.opacity": 1.0, - "content_margin": [0, 6] - }, - - { - "class": "dialog", - "layer0.tint": [250, 250, 250], - "layer0.opacity": 1.0 - }, - - { - "class": "progress_bar_control", - "layer0.tint": [250, 250, 250], - "layer0.opacity": 1.0 - }, - - - /* @ CODE FOLDING - * Folding arrow setting and behavioring - ========================================================================= */ - { - "class": "fold_button_control", - "layer0.texture": "ayu/assets/unfold.png", - "layer0.opacity": 1.0, - "layer0.inner_margin": 0, - "layer0.tint": [133, 136, 140], - "content_margin": [8, 6, 8, 6] - }, - - { - "class": "fold_button_control", - "attributes": ["hover"], - "layer0.tint": [255, 106, 0] - }, - - { - "class": "fold_button_control", - "attributes": ["expanded"], - "layer0.texture": "ayu/assets/fold.png" - }, - - - /* @ AUTOCOMPLETE - * Autocomplete popup setting and behavioring - ========================================================================= */ - - { - "class": "popup_control", - "layer0.tint": [255, 255, 255], - "layer0.opacity": 1.0, - "content_margin": [0, 0] - }, - - { - "class": "auto_complete", - "row_padding": [12, 6], - "layer0.tint": [255, 255, 255], - "layer0.opacity": 1.0 - }, - - { - "class": "auto_complete_label", - "fg": [133, 136, 140], - "match_fg": [255, 106, 0], - "selected_fg": [110, 117, 128], - "selected_match_fg": [255, 106, 0] - }, - - { - "class": "table_row", - "layer0.tint": [245, 245, 245], - "layer0.opacity": 0.0 - }, - - { - "class": "table_row", - "attributes": ["selected"], - "layer0.opacity": 1.0 - }, - - - /* @ TOOLTIP - * Tooltip setting and behavioring - ========================================================================= */ - - { - "class": "tool_tip_control", - "layer0.tint": [250, 250, 250], - "layer0.inner_margin": [0, 0], - "layer0.opacity": 1.0, - "content_margin": [10, 6] - }, - - { - "class": "tool_tip_label_control", - "color": [133, 136, 140], - "font.face": "Roboto mono", - "font.size": 12 - }, - { - "class": "tool_tip_label_control", - "settings": ["ui_font_source_code_pro"], - "font.face": "Source Code Pro" - }, - { - "class": "tool_tip_label_control", - "settings": ["ui_font_default"], - "font.face": "" - }, - - /* @OVERLAY PANELS - * Overlay panels setting and behavioring - ========================================================================= */ - - // Command Panel - { - "class": "overlay_control", - "layer0.texture": "ayu/assets/overlay-shadow.png", - "layer0.inner_margin": [25, 45, 25, 35], - "layer0.opacity": 1.0, - "layer0.tint": [126, 132, 140], - - "layer1.texture": "ayu/assets/overlay-bg.png", - "layer1.inner_margin": [25, 45, 25, 35], - "layer1.opacity": 1.0, - "layer1.tint": [255, 255, 255], - - "content_margin": [20, 45, 20, 35] - }, - - // Command Panel list item style (cmd + shift + p) - - { - "class": "mini_quick_panel_row", - "layer0.tint": [250, 250, 250, 0], - "layer0.inner_margin": [2, 2, 2, 2], - "layer0.opacity": 1.0 - }, - - // Command Panel selected list item style (cmd + p) - - { - "class": "mini_quick_panel_row", - "attributes": ["selected"], - "layer0.tint": [245, 245, 245] - }, - - // Quick panel project setting (project manager) (cmd + ctrl + p) - - { - "class": "quick_panel", - "row_padding": [32, 12], - "layer0.tint": [255, 255, 255], - "layer0.opacity": 1.0 - }, - - // Quick Panel row default style (project manager) - - { - "class": "quick_panel_row", - "layer0.texture": "", - "layer0.tint": [255, 255, 255], - "layer0.inner_margin": 0, - "layer0.opacity": 1.0 - }, - - // Row panel style inside comman panel (cmd + shift + p) - - { - "class": "quick_panel_row", - "parents": [{"class": "overlay_control"}], - "layer0.tint": [255, 255, 255], - "layer0.opacity": 1.0 - }, - - // Quick panel (project) style inside overlay_control (cmd + shift + p) - - { - "class": "quick_panel", - "parents": [{"class": "overlay_control"}], - "row_padding": [10, 7], - "layer0.tint": [255, 255, 255], - "layer0.opacity": 1.0 - }, - - // Quick Panel selected list item style - - { - "class": "quick_panel_row", - "attributes": ["selected"], - "layer0.tint": [245, 245, 245] - }, - - // Panel labels - - { - "class": "quick_panel_label", - "fg": [133, 136, 140], - "match_fg": [255, 106, 0], - "selected_fg": [110, 117, 128], - "selected_match_fg": [255, 106, 0] - }, - - // Panel labels - - { - "class": "quick_panel_label", - "parents": [{"class": "overlay_control"}], - "fg": [133, 136, 140], - "match_fg": [255, 106, 0], - "selected_fg": [110, 117, 128], - "selected_match_fg": [255, 106, 0] - }, - - // Panels sublabels - - { - "class": "quick_panel_path_label", - "fg": [149, 156, 166], - "match_fg": [110, 117, 128], - "selected_fg": [133, 136, 140], - "selected_match_fg": [110, 117, 128] - }, - - // Panels data / score - - { - "class": "quick_panel_score_label", - "fg": [133, 136, 140], - "selected_fg": [133, 136, 140] - }, - - - - /* @ TABS - * Tabs settings and behavioring - ========================================================================= */ - - { - "class": "tabset_control", - "tab_overlap": 0, - "tab_width": 50, - "tab_min_width": 50, - "tab_height": 30, - "mouse_wheel_switch": false, - - "layer0.opacity": 1.0, - "layer0.tint": [250, 250, 250], - "content_margin": [10, 0] - }, - { - "class": "tabset_control", - "settings": ["mouse_wheel_switches_tabs", "!enable_tab_scrolling"], - "mouse_wheel_switch": true - }, - { - "class": "tabset_control", - "settings": ["ui_separator"], - "content_margin": [0, 0, 0, 0], - "layer1.opacity": 0.2, - "layer1.texture": "ayu/assets/separator-bottom.png", - "layer1.tint": [133, 136, 140], - "layer1.inner_margin": [1, 0, 1, 2] - }, - { - "class": "tabset_control", - "settings": ["ui_big_tabs"], - "tab_height": 44 - }, - - // Tabs - { - "class": "tab_control", - - "layer0.tint": [250, 250, 250], - "layer0.opacity": 1.0, - - "layer1.texture": "", - - "layer2.texture": "ayu/assets/separator-bottom.png", - "layer2.tint": [255, 106, 0], - "layer2.inner_margin": [1, 0, 1, 2], - "layer2.opacity": 0.0, - - "layer3.texture": "", - - "content_margin": [10, -2, 10, 0], - "max_margin_trim": 12 - }, - { - "class": "tab_control", - "settings": ["ui_separator"], - - "layer1.texture": "ayu/assets/separator-right.png", - "layer1.tint": [133, 136, 140], - "layer1.inner_margin": [0, 1, 2, 1], - "layer1.opacity": 0.2, - - "layer3.texture": "ayu/assets/separator-bottom.png", - "layer3.tint": [133, 136, 140], - "layer3.inner_margin": [1, 0, 1, 2], - "layer3.opacity": 0.2 - }, - { - "class": "tab_control", - "settings": ["ui_big_tabs"], - "content_margin": [15, -2, 15, 0] - }, - - // Selected current tab - - { - "class": "tab_control", "attributes": ["selected"], - "layer2.opacity": 1.0, - "layer3.opacity": 0.0 - }, - - // Hovered current tab - - { - "class": "tab_control", "attributes": ["hover"], - "layer2.opacity": 0.3 - }, - - // Selected current tab - - { - "class": "tab_control", "attributes": ["selected","hover"], - "layer2.opacity": 1.0 - }, - - // Tab Labels - - { - "class": "tab_label", - "fg": [250, 250, 250, 0], - "shadow_color": [133, 136, 140], - "shadow_offset": [0, -1], - "font.size": 12, - "font.italic": false, - "font.bold": false, - "font.face": "Roboto mono" - }, - { - "class": "tab_label", - "settings": ["ui_font_source_code_pro"], - "font.face": "Source Code Pro" - }, - { - "class": "tab_label", - "settings": ["ui_font_default"], - "font.face": "" - }, - { - "class": "tab_label", - "fg": [133, 136, 140], - "settings": ["ui_fix_tab_labels"], - "shadow_color": [250, 250, 250, 0], - "shadow_offset": [0, 0] - }, - - // Tab selected label color - - { - "class": "tab_label", - "parents": [{"class": "tab_control", "attributes": ["selected"]}], - "fg": [250, 250, 250, 0], - "shadow_color": [110, 117, 128], - "shadow_offset": [0, -1] - }, - { - "class": "tab_label", - "settings": ["ui_fix_tab_labels"], - "parents": [{"class": "tab_control", "attributes": ["selected"]}], - "fg": [110, 117, 128], - "shadow_color": [250, 250, 250, 0], - "shadow_offset": [0, 0] - }, - - { - "class": "tab_label", - "attributes": ["transient"], - "font.italic": true - }, - - // Tab Close Buttons - { - "class": "tab_close_button", - "content_margin": [0, 0], - - // Close Icon - "layer0.texture": "ayu/assets/close.png", - "layer0.tint": [133, 136, 140], - "layer0.opacity": 1.0, - - // Dirty Icon - "layer1.texture": "ayu/assets/dirty.png", - "layer1.tint": [133, 136, 140], - "layer1.opacity": 0 - }, - - // Default - { - "class": "tab_close_button", - "settings": ["show_tab_close_buttons"], - "content_margin": [8, 8] - }, - - // Default hover - { - "class": "tab_close_button", - "settings": ["show_tab_close_buttons"], - "attributes": ["hover"], - "layer0.tint": [255, 106, 0] - }, - - // Dirty tab - { - "class": "tab_close_button", - "parents": [{"class": "tab_control", "attributes": ["dirty"]}], - "layer0.opacity": 0, // Close Icon - "layer1.opacity": 1.0, // dirty Icon - "content_margin": [8, 8] - }, - - // Dirty tab on hover - { - "class": "tab_close_button", - "parents": [{"class": "tab_control", "attributes": ["dirty"]}], - "attributes": ["hover"], - "layer0.opacity": 1.0, // Close Icon - "layer1.opacity": 0 // Close Icon - }, - - // Selected dirty tab - { - "class": "tab_close_button", - "parents": [{"class": "tab_control", "attributes": ["selected", "dirty"]}], - "layer0.opacity": 0, // Close Icon - "layer1.opacity": 1.0, // Dirty Icon - "layer1.tint": [255, 106, 0] - }, - - // Selected dirty tab on hover - { - "class": "tab_close_button", - "parents": [{"class": "tab_control", "attributes": ["selected", "dirty"]}], - "attributes": ["hover"], - "layer0.opacity": 1.0, - "layer1.opacity": 0 - }, - // tab set scroll left | scroll right - { - "class": "scroll_tabs_left_button", - "content_margin": [12, 15], - "layer0.texture": "ayu/assets/arrow-left.png", - "layer0.tint": [135, 143, 153], - "layer0.opacity": 1.0 - }, - - { - "class": "scroll_tabs_left_button", - "attributes": ["hover"], - "layer0.tint": [255, 106, 0] - }, - - { - "class": "scroll_tabs_right_button", - "content_margin": [12, 15], - "layer0.texture": "ayu/assets/arrow-right.png", - "layer0.tint": [135, 143, 153], - "layer0.opacity": 1.0 - }, - { - "class": "scroll_tabs_right_button", - "settings": ["ui_separator"], - "layer2.texture": "ayu/assets/separator-right.png", - "layer2.tint": [133, 136, 140], - "layer2.opacity": 0.2, - "layer2.inner_margin" : [0, 1, 2, 1] - }, - - { - "class": "scroll_tabs_right_button", - "attributes": ["hover"], - "layer0.tint": [255, 106, 0] - }, - - { - "class": "show_tabs_dropdown_button", - "content_margin": [12, 12], - "layer0.texture": "ayu/assets/overflow-menu.png", - "layer0.tint": [135, 143, 153], - "layer0.opacity": 1.0, - "layer0.inner_margin": [0, 0] - }, - - { - "class": "show_tabs_dropdown_button", - "attributes": ["hover"], - "layer0.tint": [255, 106, 0] - }, - - - /* @ SIDEBAR - * Sidebar panel settings and behavioring - ========================================================================= */ - - { - "class": "sidebar_container", - "content_margin": [0, -20, 0, 0], - "layer0.opacity": 1, - "layer0.tint": [250, 250, 250] - }, - { - "class": "sidebar_container", - "settings": ["ui_separator"], - "layer1.texture": "ayu/assets/separator-right.png", - "layer1.tint": [133, 136, 140], - "layer1.inner_margin": [0, 1, 2, 1], - "layer1.opacity": 0.2 - }, - - { - "class": "sidebar_tree", - "row_padding": [30, 6], - "indent": 12, - "indent_offset": 0, - "indent_top_level": false, - "dark_content": true - }, - - { - "class": "sidebar_heading", - "color": [250, 250, 250], - "font.face": "Roboto mono", - "font.bold": true, - "font.size": 11 - }, - { - "class": "sidebar_heading", - "settings": ["ui_font_source_code_pro"], - "font.face": "Source Code Pro" - }, - { - "class": "sidebar_heading", - "settings": ["ui_font_default"], - "font.face": "" - }, - - { - "class": "tree_row", - "layer1.texture": "ayu/assets/tree-highlight.png", - "layer1.opacity": { "target": 0.0, "speed": 5.0, "interpolation": "smoothstep" }, - "layer1.tint": [255, 106, 0], - "layer1.inner_margin": [5, 0, 0, 3], - "layer0.tint": [245, 245, 245], - "layer0.opacity": 0 - }, - - { - "class": "tree_row", - "attributes": ["selected"], - "layer1.opacity": { "target": 1.0, "speed": 5.0, "interpolation": "smoothstep" } - }, - - { - "class": "sidebar_label", - "color": [133, 136, 140], - "shadow_color": [0, 0, 0], - "shadow_offset": [0, 0], - "font.face": "Roboto mono", - "font.size": 12 - }, - { - "class": "sidebar_label", - "settings": ["ui_font_source_code_pro"], - "font.face": "Source Code Pro" - }, - { - "class": "sidebar_label", - "settings": ["ui_font_default"], - "font.face": "" - }, - - { - "class": "sidebar_label", - "parents": [{"class": "tree_row","attributes": ["hover"]}], - "color": [110, 117, 128] - }, - - { - "class": "sidebar_label", - "parents": [{"class": "tree_row","attributes": ["selected"]}], - "color": [110, 117, 128], - "shadow_color": [0, 0, 0], - "shadow_offset": [0, 0] - }, - - { - "class": "sidebar_label", - "parents": [{"class": "tree_row","attributes": ["expandable"]}], - "color": [133, 136, 140], - "font.bold": false - }, - - { - "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", "hover"]}], - "color": [110, 117, 128] - }, - - { - "class": "sidebar_label", - "parents": [{"class": "tree_row", "attributes": ["expanded"]}], - "color": [110, 117, 128] - }, - - { - "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": [110, 117, 128] - // }, - - { - "class": "sidebar_label", - "attributes": ["transient"], - "font.italic": false - }, - - // Hidden arrow icon before folder - - { - "class": "disclosure_button_control", - "layer0.texture": "ayu/assets/arrow-right.png", - "layer0.tint": [135, 143, 153], - "layer0.opacity": 1, - "layer0.inner_margin": 0, - "content_margin": [12, 15] - }, - - { - "class": "disclosure_button_control", - "parents": [{ "class": "tree_row", "attributes": ["hover"]}], - "layer0.tint": [255, 106, 0] - }, - - { - "class": "disclosure_button_control", - "attributes": ["expanded"], - "layer0.texture": "ayu/assets/overflow-menu.png", - "content_margin": [12, 12] - }, - - { - "class": "disclosure_button_control", - "attributes": ["expanded"], - "parents": [{ "class": "tree_row", "attributes": ["hover"]}], - "layer0.tint": [255, 106, 0] - }, - - // Opened files - { - "class": "close_button", - "content_margin": [8, 8], - - // Default Close icon - "layer0.texture": "ayu/assets/close.png", - "layer0.opacity": 0, - "layer0.inner_margin": [0, 0], - "layer0.tint": [133, 136, 140] - }, - - - // Opened file hover - - { - "class": "close_button", - "parents": [{ "class": "tree_row", "attributes": ["hover"] }], - // Default Close icon - "layer0.opacity": 0.6 - }, - - { - "class": "close_button", - "attributes": ["dirty"], - "layer0.texture": "ayu/assets/dirty.png", - "layer0.tint": [133, 136, 140], - "layer0.opacity": 1.0 - }, - - { - "class": "close_button", - "attributes": ["hover"], - "layer0.opacity": 1.0, - "layer0.tint": [255, 106, 0] - }, - - - /* @ SCROLLBARS - * Scrollbars settings and behavioring - ========================================================================= */ - - // Normal Vertical scrollbar track - // !!! - { - "class": "scroll_bar_control", - "layer0.tint" : [250, 250, 250], - "layer0.opacity": 1, - "layer0.inner_margin": [0, 0], - "blur": false - }, - - // Normal Vertical scrollbar track inside overlay panel - - { - "class": "scroll_bar_control", - "parents": [{"class": "overlay_control"}], - "layer0.tint": [250, 250, 250, 0], - "layer0.opacity": 1.0, - "layer0.inner_margin": [0, 2], - "blur": false - }, - - // Normal horizontal scrollbar track - - { - "class": "scroll_bar_control", - "attributes": ["horizontal"], - "layer0.texture": "", - "layer0.tint" : [250, 250, 250], - "layer0.inner_margin": [0, 0], - "blur": false - }, - - // Normal horizontal scrollbar track inside overlay panel - // !!! - // { - // "class": "scroll_bar_control", - // "attributes": ["horizontal"], - // "parents": [{"class": "overlay_control"}], - // "layer0.tint": [250, 250, 250, 0], - // "layer0.opacity": 0.0, - // "layer0.inner_margin": [0, 2], - // "blur": false - // }, - - // Scrollbars corner - - { - "class": "scroll_corner_control", - "layer0.texture": "", - "layer0.tint":[250, 250, 250], - "layer0.inner_margin": [0, 0], - "layer0.opacity": 1, - "blur": false - }, - - // Vertical puck controller - - { - "class": "puck_control", - "layer0.texture": "", - "layer0.tint": [0, 0, 0, 50], - "layer0.opacity": 1, - "layer0.inner_margin": [0, 0], - "content_margin": [1, 12], - "blur": false - }, - - // Horizontal puck controller - - { - "class": "puck_control", - "attributes": ["horizontal"], - "layer0.texture": "", - "layer0.tint": [0, 0, 0, 50], - "layer0.inner_margin": [0, 0], - "content_margin": [12, 1], - "blur": false - }, - - { - "class": "scroll_area_control", - "settings": ["overlay_scroll_bars"], - "overlay": true - }, - - { - "class": "scroll_area_control", - "settings": ["!overlay_scroll_bars"], - "overlay": false // set to false for the original behavior - }, - - - { - "class": "scroll_area_control", - "parents": [{"class": "overlay_control"}], - "settings": ["overlay_scroll_bars"], - "overlay": true // set to false for the original behavior - }, - - { - "class": "scroll_area_control", - "parents": [{"class": "sidebar_container"}], - "settings": ["!overlay_scroll_bars"], - "overlay": false // set to false for the original behavior - }, - - { - "class": "scroll_bar_control", - "settings": ["overlay_scroll_bars"], - "layer0.tint": [28, 31, 38], - "layer0.inner_margin": [0, 5], - "blur": false - }, - - { - "class": "scroll_bar_control", - "settings": ["overlay_scroll_bars"], - "attributes": ["horizontal"], - "layer0.inner_margin": [5, 0], - "blur": true - }, - - - /* @ MINIMAP - * Minimap settings and behavioring - ========================================================================= */ - - { - "class": "minimap_control", - "settings": ["always_show_minimap_viewport"], - "viewport_color": [130, 140, 153] - }, - - { - "class": "minimap_control", - "settings": ["!always_show_minimap_viewport"], - "viewport_color": [130, 140, 153, 20] - }, - - - /* @ STATUS BAR - * Status bar settings and behavioring - ========================================================================= */ - - // All labels - - { - "class": "label_control", - "color": [133, 136, 140], - "shadow_color": [0, 0, 0, 0], - "shadow_offset": [0, 0], - "font.bold": false, - "font.face": "Roboto mono", - "font.size": 12 - }, - { - "class": "label_control", - "settings": ["ui_font_source_code_pro"], - "font.face": "Source Code Pro" - }, - { - "class": "label_control", - "settings": ["ui_font_default"], - "font.face": "" - }, - - // Status bar labels - - { - "class": "label_control", - "parents": [{"class": "status_bar"}], - "color": [133, 136, 140], - "font.bold": false - }, - - // Text field labels - - { - "class": "status_bar", - "layer0.texture": "", - "layer0.tint": [250, 250, 250], - "layer0.opacity": 1, - "layer1.texture": "ayu/assets/separator-top.png", - "layer1.inner_margin": [1, 2, 1, 0], - "content_margin": [10, 5] - }, - { - "class": "status_bar", - "settings": ["ui_separator"], - "layer0.tint": [255, 255, 255] - // "layer1.opacity": 0.2 - }, - - { - "class": "status_container", - "content_margin": [0, 5] - }, - - { - "class": "status_button", - "min_size": [100, 0] - }, - - - /* @ WIDGET PANEL - * Widget, input, buttons settings and behavioring - ========================================================================= */ - - - // Status bar panel - { - "class": "panel_control", - "layer0.tint": [250, 250, 250], - "layer0.opacity": 1.0, - "content_margin": [0, 5] - }, - { - "class": "panel_control", - "settings": ["ui_separator"], - "layer0.tint": [255, 255, 255], - "layer1.texture": "ayu/assets/separator-top.png", - "layer1.tint": [133, 136, 140], - "layer1.inner_margin": [1, 2, 1, 0], - "layer1.opacity": 0.2 - }, - - // Status bar panel close icon - - { - "class": "panel_close_button", - "layer0.texture": "ayu/assets/close.png", - "layer0.opacity": 1.0, - "layer0.tint": [133, 136, 140], - "content_margin": [0, 0] // 8,8 to show - }, - // !!! - { - "class": "panel_close_button", - "attributes": ["hover"], - "layer0.tint": [255, 106, 0] - }, - - // Texline input - - { - "class": "text_line_control", - "layer0.texture": "ayu/assets/input-bg.png", - "layer0.opacity": 1, - "layer0.inner_margin": [10, 8], - "layer0.tint": [255, 255, 255], - - "layer1.texture": "ayu/assets/input-border.png", - "layer1.opacity": 0.2, - "layer1.inner_margin": [10, 8], - "layer1.tint": [133, 136, 140], - "content_margin": [10, 7, 10, 5] - }, - - - // Textline input inside overlay panels - - { - "class": "text_line_control", - "parents": [{"class": "overlay_control"}], - "layer0.texture": "", - "layer0.opacity": 0, - "layer1.texture": "ayu/assets/input-search.png", - "layer1.opacity": 1, - "layer1.tint": [255, 106, 0], - "layer1.inner_margin": [35, 0, 0, 0], - "content_margin": [43, 7, 10, 4] - }, - - // Textline input oveflow menu - { - "class": "dropdown_button_control", - "content_margin": [12, 12], - "layer0.texture": "ayu/assets/overflow-menu.png", - "layer0.tint": [135, 143, 153], - "layer0.opacity": 1.0 - }, - { - "class": "dropdown_button_control", - "attributes": ["hover"], - "layer0.tint": [255, 106, 0] - }, - - - /* @ BUTTONS - * Buttons panels settings and behavioring - ========================================================================= */ - - - // Button labels - - { - "class": "button_control", - "content_margin": [15, 9, 15, 10], - "min_size": [60, 0], - "layer0.tint": [255, 106, 0, 10], - "layer0.texture": "ayu/assets/input-bg.png", - "layer0.inner_margin": [10, 8], - "layer0.opacity": 0 - }, - { - "class": "button_control", - "attributes": ["hover"], - "layer0.opacity": 1 - }, - - { - "class": "label_control", - "parents": [{"class": "button_control"}], - "color": [133, 136, 140] - }, - - { - "class": "label_control", - "parents": [{"class": "button_control", "attributes": ["hover"]}], - "color": [255, 106, 0] - }, - - // !!! - // Small Icon Buttons - { - "class": "icon_button_control", - "layer0.tint": [0, 0, 0], - "layer0.opacity": 0, - "layer2.tint": [110, 117, 128], - "layer2.opacity": { "target": 0.0, "speed": 10.0, "interpolation": "smoothstep" }, - "content_margin": [10, 5] - }, - - - /* Buttons icons settings - ===================================================================== */ - - // Regex Icon - { - "class": "icon_regex", - "layer0.texture": "ayu/assets/regex.png", - "layer0.tint": [133, 136, 140], - "layer0.opacity": 1.0, - "content_margin": [12, 12] - }, - - { - "class": "icon_regex", - "parents": [{"class": "icon_button_control", "attributes": ["selected"]}], - "layer0.tint": [255, 106, 0] - }, - - // Preserve case sensitive - - { - "class": "icon_case", - "layer0.texture": "ayu/assets/matchcase.png", - "layer0.tint": [133, 136, 140], - "layer0.opacity": 1.0, - "content_margin": [12, 12] - }, - - { - "class": "icon_case", - "parents": [{"class": "icon_button_control", "attributes": ["selected"]}], - "layer0.tint": [255, 106, 0] - }, - - // Wholeword - - { - "class": "icon_whole_word", - "layer0.texture": "ayu/assets/word.png", - "layer0.tint": [133, 136, 140], - "layer0.opacity": 1.0, - "content_margin": [12, 12] - }, - - - { - "class": "icon_whole_word", - "parents": [{"class": "icon_button_control", "attributes": ["selected"]}], - "layer0.tint": [255, 106, 0] - }, - - // Wrap - - { - "class": "icon_wrap", - "layer0.texture": "ayu/assets/wrap.png", - "layer0.tint": [133, 136, 140], - "layer0.opacity": 1.0, - "content_margin": [12, 12] - }, - - { - "class": "icon_wrap", - "parents": [{"class": "icon_button_control", "attributes": ["selected"]}], - "layer0.tint": [255, 106, 0] - }, - - // In selection - - { - "class": "icon_in_selection", - "layer0.texture": "ayu/assets/inselection.png", - "layer0.tint": [133, 136, 140], - "layer0.opacity": 1.0, - "content_margin": [12, 12] - }, - - { - "class": "icon_in_selection", - "parents": [{"class": "icon_button_control", "attributes": ["selected"]}], - "layer0.tint": [255, 106, 0] - }, - - // Highlight Result - - { - "class": "icon_highlight", - "layer0.texture": "ayu/assets/highlight.png", - "layer0.tint": [133, 136, 140], - "layer0.opacity": 1.0, - "content_margin": [12, 12] - }, - - { - "class": "icon_highlight", - "parents": [{"class": "icon_button_control", "attributes": ["selected"]}], - "layer0.tint": [255, 106, 0] - }, - - // Preserve Case - - { - "class": "icon_preserve_case", - "layer0.texture": "ayu/assets/replace-preserve-case.png", - "layer0.tint": [133, 136, 140], - "layer0.opacity": 1.0, - "content_margin": [12, 12] - }, - - { - "class": "icon_preserve_case", - "parents": [{"class": "icon_button_control", "attributes": ["selected"]}], - "layer0.tint": [255, 106, 0] - }, - - // Show context - - { - "class": "icon_context", - "layer0.texture": "ayu/assets/context.png", - "layer0.tint": [133, 136, 140], - "layer0.opacity": 1.0, - "content_margin": [12, 12] - }, - - - { - "class": "icon_context", - "parents": [{"class": "icon_button_control", "attributes": ["selected"]}], - "layer0.tint": [255, 106, 0] - }, - - // Use buffer - - { - "class": "icon_use_buffer", - "layer0.texture": "ayu/assets/buffer.png", - "layer0.tint": [133, 136, 140], - "layer0.opacity": 1.0, - "content_margin": [12, 12] - }, - - { - "class": "icon_use_buffer", - "parents": [{"class": "icon_button_control", "attributes": ["selected"]}], - "layer0.tint": [255, 106, 0] - }, - - // Reverse direction - - { - "class": "icon_reverse", - "layer0.texture": "ayu/assets/reverse.png", - "layer0.tint": [133, 136, 140], - "layer0.opacity": 1.0, - "content_margin": [12, 12] - }, - - { - "class": "icon_reverse", - "parents": [{"class": "icon_button_control", "attributes": ["selected"]}], - "layer0.tint": [255, 106, 0] - }, - - - /* Visual settings - ===================================================================== */ - - // UI font sizees - // ============== - { - "class": "tab_label", - "settings": ["ui_font_size_small"], - "font.size": 11 - }, - { - "class": "sidebar_label", - "settings": ["ui_font_size_small"], - "font.size": 11 - }, - { - "class": "label_control", - "settings": ["ui_font_size_small"], - "font.size": 11 - }, - { - "class": "tool_tip_label_control", - "settings": ["ui_font_size_small"], - "font.size": 11 - } -] diff --git a/ayu-mirage.sublime-theme b/ayu-mirage.sublime-theme index 832cb4e6..801533ac 100644 --- a/ayu-mirage.sublime-theme +++ b/ayu-mirage.sublime-theme @@ -8,9 +8,9 @@ */ { - "class" : "sheet_container_control", - "layer0.tint" : [33, 39, 51], - "layer0.opacity" : 1 + "class": "sheet_container_control", + "layer0.tint": [33, 39, 51], + "layer0.opacity": 1 }, @@ -21,7 +21,7 @@ { "class": "grid_layout_control", "border_size": 0, - "border_color": [52, 61, 74] + "border_color": [26, 31, 41] }, { "class": "grid_layout_control", @@ -60,7 +60,7 @@ "layer0.texture": "ayu/assets/unfold.png", "layer0.opacity": 1.0, "layer0.inner_margin": 0, - "layer0.tint": [115, 134, 153], + "layer0.tint": [102, 115, 128], "content_margin": [8, 6, 8, 6] }, @@ -82,7 +82,7 @@ */ { "class": "popup_control", - "layer0.tint": [39, 45, 56], + "layer0.tint": [38, 44, 56], "layer0.opacity": 1.0, "content_margin": [0, 0] }, @@ -90,22 +90,22 @@ { "class": "auto_complete", "row_padding": [12, 6], - "layer0.tint": [39, 45, 56], + "layer0.tint": [38, 44, 56], "layer0.opacity": 1.0 }, { "class": "auto_complete_label", - "fg": [115, 134, 153], + "fg": [102, 115, 128], "match_fg": [255, 204, 102], - "selected_fg": [217, 215, 206], + "selected_fg": [204, 201, 194], "selected_match_fg": [255, 204, 102], "fg_blend": true }, { "class": "table_row", - "layer0.tint": [48, 53, 64], + "layer0.tint": [31, 37, 48], "layer0.opacity": 0.0 }, @@ -129,8 +129,7 @@ { "class": "tool_tip_label_control", - "color": [115, 134, 153], - "font.face": "Roboto mono", + "color": [102, 115, 128], "font.size": 13 }, { @@ -140,8 +139,8 @@ }, { "class": "tool_tip_label_control", - "settings": ["ui_font_default"], - "font.face": "" + "settings": ["ui_font_roboto_mono"], + "font.face": "Roboto mono" }, /* OVERLAY PANELS @@ -152,21 +151,21 @@ { "class": "overlay_control", "layer0.texture": "ayu/assets/overlay-shadow.png", - "layer0.inner_margin": [25, 45, 25, 35], - "layer0.opacity": 1.0, - "layer0.tint": [17, 20, 26], + "layer0.inner_margin": [15, 35, 15, 25], + "layer0.opacity": 0.6, + "layer0.tint": [23, 27, 36], "layer1.texture": "ayu/assets/overlay-border.png", - "layer1.inner_margin": [25, 45, 25, 35], + "layer1.inner_margin": [15, 35, 15, 25], "layer1.opacity": 1.0, - "layer1.tint": [217, 215, 206, 30], + "layer1.tint": [20, 23, 31], "layer2.texture": "ayu/assets/overlay-bg.png", - "layer2.inner_margin": [25, 45, 25, 35], + "layer2.inner_margin": [15, 35, 15, 25], "layer2.opacity": 1.0, - "layer2.tint": [39, 45, 56], + "layer2.tint": [38, 44, 56], - "content_margin": [20, 45, 20, 35] + "content_margin": [10, 35, 10, 20] }, // Command Panel list item style (cmd + shift + p) @@ -183,7 +182,7 @@ { "class": "mini_quick_panel_row", "attributes": ["selected"], - "layer0.tint": [48, 53, 64] + "layer0.tint": [31, 37, 48] }, // Quick panel project setting (project manager) (cmd + ctrl + p) @@ -191,7 +190,7 @@ { "class": "quick_panel", "row_padding": [32, 12], - "layer0.tint": [39, 45, 56], + "layer0.tint": [38, 44, 56], "layer0.opacity": 1.0 }, @@ -200,7 +199,7 @@ { "class": "quick_panel_row", "layer0.texture": "", - "layer0.tint": [39, 45, 56], + "layer0.tint": [38, 44, 56], "layer0.inner_margin": 0, "layer0.opacity": 1.0 }, @@ -210,84 +209,77 @@ { "class": "quick_panel_row", "parents": [{"class": "overlay_control"}], - "layer0.tint": [39, 45, 56], + "layer0.tint": [38, 44, 56], "layer0.opacity": 1.0 }, // Quick panel (project) style inside overlay_control (cmd + shift + p) - { "class": "quick_panel", "parents": [{"class": "overlay_control"}], - "row_padding": [20, 5], - "layer0.tint": [39, 45, 56], + "row_padding": [24, 8], + "layer0.tint": [38, 44, 56], "layer0.opacity": 1.0 }, // Quick Panel selected list item style - { "class": "quick_panel_row", "attributes": ["selected"], - "layer0.tint": [48, 53, 64] + "layer0.tint": [31, 37, 48] }, // Panel labels - { "class": "quick_panel_label", - "fg": [115, 134, 153], + "fg": [102, 115, 128], + "font.bold": false, "match_fg": [255, 204, 102], - "selected_fg": [217, 215, 206], + "selected_fg": [204, 201, 194], "selected_match_fg": [255, 204, 102] }, // Panel labels - { "class": "quick_panel_label", "parents": [{"class": "overlay_control"}], - "fg": [115, 134, 153], + "fg": [102, 115, 128], "match_fg": [255, 204, 102], - "selected_fg": [217, 215, 206], + "selected_fg": [204, 201, 194], "selected_match_fg": [255, 204, 102] }, // Panels sublabels - { "class": "quick_panel_path_label", - "fg": [102, 115, 127], - "match_fg": [217, 215, 206], - "selected_fg": [115, 134, 153], - "selected_match_fg": [217, 215, 206] + "fg": [81, 92, 105], + "match_fg": [170, 169, 165], + "selected_fg": [81, 92, 105], + "selected_match_fg": [170, 169, 165] }, // Panels data / score - { "class": "quick_panel_score_label", - "fg": [115, 134, 153], - "selected_fg": [115, 134, 153] + "fg": [102, 115, 128], + "selected_fg": [255, 204, 102] }, - /* TABS * Tabs settings and behavioring */ - { "class": "tabset_control", "mouse_wheel_switch": false, "tab_min_width": 50, "tab_overlap": 0, - "tab_height": 30, + "tab_height": 36, "tab_width": 50, "layer0.tint": [33, 39, 51], "layer0.opacity": 1.0, - "content_margin": [0, 0] // <<<<<<<<<<<<< + "content_margin": [10, 0] }, { "class": "tabset_control", @@ -298,114 +290,107 @@ "class": "tabset_control", "settings": ["ui_separator"], "content_margin": [0, 0, 0, 0], - "layer1.opacity": 0.3, + "layer1.opacity": 1, "layer1.texture": "ayu/assets/separator-bottom.png", - "layer1.tint": [115, 134, 153], + "layer1.tint": [26, 31, 41], "layer1.inner_margin": [1, 0, 1, 2] }, { "class": "tabset_control", "platforms": ["osx"], "settings": ["ui_separator", "!ui_native_titlebar"], - "layer2.opacity": 0.3, + "layer2.opacity": 1, "layer2.texture": "ayu/assets/separator-top.png", - "layer2.tint": [115, 134, 153], + "layer2.tint": [26, 31, 41], "layer2.inner_margin": [1, 2, 1, 0] }, - { - "class": "tabset_control", - "settings": ["ui_big_tabs"], - "tab_height": 40 - }, - // Tabs { "class": "tab_control", - - "layer0.tint": [33, 39, 51, 0], + // Background + "layer0.tint": [33, 39, 51], "layer0.opacity": 1.0, - "layer1.texture": "", + // Top + "layer1.texture": "ayu/assets/separator-top.png", + "layer1.tint": [26, 31, 41], + "layer1.inner_margin": [0, 1, 0, 0], + "layer1.opacity": 0.0, - "layer2.texture": "ayu/assets/separator-bottom.png", - "layer2.tint": [255, 204, 102], - "layer2.inner_margin": [1, 0, 1, 2], + // Right + "layer2.texture": "ayu/assets/separator-right.png", + "layer2.tint": [26, 31, 41], + "layer2.inner_margin": [0, 0, 1, 0], "layer2.opacity": 0.0, - "layer3.texture": "", + // Bottom + "layer3.texture": "ayu/assets/separator-bottom.png", + "layer3.tint": [26, 31, 41], + "layer3.inner_margin": [0, 0, 0, 1], + "layer3.opacity": 0.0, - "content_margin": [10, -2, 10, 0], + "content_margin": [15, -2, 15, 0], "max_margin_trim": 12 }, { "class": "tab_control", "settings": ["ui_separator"], - "layer1.texture": "ayu/assets/separator-right.png", - "layer1.tint": [115, 134, 153], - "layer1.inner_margin": [0, 1, 2, 1], - "layer1.opacity": 0.3, + "layer1.opacity": 1.0, - "layer3.texture": "ayu/assets/separator-bottom.png", - "layer3.tint": [115, 134, 153], - "layer3.inner_margin": [1, 0, 1, 2], - "layer3.opacity": 0.3 - }, - { - "class": "tab_control", - "settings": ["ui_big_tabs"], - "content_margin": [15, -2, 15, 0] + "layer2.opacity": 1.0, + + "layer3.opacity": 1.0 }, // Selected current tab - { "class": "tab_control", "attributes": ["selected"], - "layer2.opacity": 1.0, - "layer3.opacity": 0.0 + "settings": ["!ui_separator"], + "layer3.tint": [255, 204, 102], + "layer3.opacity": 1.0 }, { "class": "tab_control", "attributes": ["selected"], "settings": ["ui_separator"], - "layer0.tint": [115, 134, 153, 15] + "layer1.tint": [255, 204, 102], + "layer3.opacity": 0.0 }, // Hovered current tab - { "class": "tab_control", "attributes": ["hover"], - "layer2.opacity": 0.3 + "settings": ["!ui_separator"], + "layer3.tint": [255, 204, 102], + "layer3.opacity": 0.3 }, { "class": "tab_control", "attributes": ["hover"], "settings": ["ui_separator"], - "layer0.tint": [115, 134, 153, 6], + "layer0.tint": [26, 31, 41, 70], }, // Selected current tab - { "class": "tab_control", "attributes": ["selected", "hover"], - "layer2.opacity": 1.0 + "settings": ["!ui_separator"], + "layer3.opacity": 1.0 }, { "class": "tab_control", "attributes": ["selected", "hover"], "settings": ["ui_separator"], - "layer0.tint": [115, 134, 153, 15] + "layer0.tint": [33, 39, 51] }, // Tab Labels { "class": "tab_label", - "fg": [33, 39, 51, 0], - "shadow_color": [115, 134, 153], - "shadow_offset": [0, -1], + "fg": [102, 115, 128], "font.italic": false, "font.bold": false, - "font.size": 12, - "font.face": "Roboto mono" + "font.size": 12 }, { "class": "tab_label", @@ -414,28 +399,15 @@ }, { "class": "tab_label", - "settings": ["ui_font_default"], - "font.face": "" + "settings": ["ui_font_roboto_mono"], + "font.face": "Roboto mono" }, { "class": "tab_label", "settings": ["highlight_modified_tabs"], "font.italic": true, "attributes": ["dirty"], - "shadow_color": [255, 204, 102] - }, - { - "class": "tab_label", - "fg": [115, 134, 153], - "settings": ["ui_fix_tab_labels"], - "shadow_color": [33, 39, 51, 0], - "shadow_offset": [0, 0] - }, - { - "class": "tab_label", - "fg": [255, 204, 102], - "attributes": ["dirty"], - "settings": ["ui_fix_tab_labels", "highlight_modified_tabs"] + "fg": [255, 204, 102] }, // Tab selected label color @@ -443,17 +415,7 @@ { "class": "tab_label", "parents": [{"class": "tab_control", "attributes": ["selected"]}], - "fg": [33, 39, 51, 0], - "shadow_color": [217, 215, 206], - "shadow_offset": [0, -1], - }, - { - "class": "tab_label", - "settings": ["ui_fix_tab_labels"], - "parents": [{"class": "tab_control", "attributes": ["selected"]}], - "fg": [217, 215, 206], - "shadow_color": [33, 39, 51, 0], - "shadow_offset": [0, 0] + "fg": [204, 201, 194] }, { @@ -469,12 +431,12 @@ // Close Icon "layer0.texture": "ayu/assets/close.png", - "layer0.tint": [115, 134, 153], + "layer0.tint": [102, 115, 128], "layer0.opacity": 1.0, // Dirty Icon "layer1.texture": "ayu/assets/dirty.png", - "layer1.tint": [115, 134, 153], + "layer1.tint": [102, 115, 128], "layer1.opacity": 0, }, @@ -482,7 +444,7 @@ { "class": "tab_close_button", "settings": ["show_tab_close_buttons"], - "content_margin": [8, 8] + "content_margin": [6, 8] }, // Default hover @@ -499,7 +461,7 @@ "parents": [{"class": "tab_control", "attributes": ["dirty"]}], "layer0.opacity": 0, // Close Icon "layer1.opacity": 1.0, // dirty Icon - "content_margin": [8, 8] + "content_margin": [6, 8] }, // Dirty tab on hover @@ -534,7 +496,7 @@ "class": "scroll_tabs_left_button", "content_margin": [12, 15], "layer0.texture": "ayu/assets/arrow-left.png", - "layer0.tint": [62, 75, 89], + "layer0.tint": [71, 81, 93], "layer0.opacity": 1.0 }, @@ -548,16 +510,16 @@ "class": "scroll_tabs_right_button", "content_margin": [12, 15], "layer0.texture": "ayu/assets/arrow-right.png", - "layer0.tint": [62, 75, 89], + "layer0.tint": [71, 81, 93], "layer0.opacity": 1.0 }, { "class": "scroll_tabs_right_button", "settings": ["ui_separator"], "layer2.texture": "ayu/assets/separator-right.png", - "layer2.tint": [115, 134, 153], - "layer2.opacity": 0.3, - "layer2.inner_margin" : [0, 1, 2, 1] + "layer2.tint": [26, 31, 41], + "layer2.opacity": 1, + "layer2.inner_margin": [0, 1, 2, 1] }, { @@ -570,7 +532,7 @@ "class": "show_tabs_dropdown_button", "content_margin": [12, 12], "layer0.texture": "ayu/assets/overflow-menu.png", - "layer0.tint": [62, 75, 89], + "layer0.tint": [71, 81, 93], "layer0.opacity": 1.0, "layer0.inner_margin": [0, 0] }, @@ -588,7 +550,7 @@ { "class": "sidebar_container", - "content_margin": [0, 4, 0, 0], + "content_margin": [0, 6, 0, 0], "layer0.opacity": 1, "layer0.tint": [33, 39, 51] }, @@ -597,32 +559,23 @@ "settings": ["ui_separator"], "layer1.texture": "ayu/assets/separator-right.png", "layer1.inner_margin": [0, 1, 2, 1], - "layer1.opacity": 0.3, - "layer1.tint": [115, 134, 153] - }, - { - "class": "sidebar_container", - "platforms": ["osx"], - "settings": ["ui_separator", "!ui_native_titlebar"], - "layer2.opacity": 0.3, - "layer2.texture": "ayu/assets/separator-top.png", - "layer2.tint": [115, 134, 153], - "layer2.inner_margin": [1, 2, 1, 0] + "layer1.opacity": 1, + "layer1.tint": [26, 31, 41], }, + { "class": "sidebar_tree", "indent_top_level": false, "row_padding": [20, 6], "dark_content": false, "spacer_rows": true, - "indent_offset": 0, - "indent": 12 + "indent_offset": 2, + "indent": 10 }, { "class": "sidebar_heading", - "color": [115, 134, 153], - "font.face": "Roboto mono", + "color": [74, 85, 97], "font.bold": true, "font.size": 11 }, @@ -633,34 +586,33 @@ }, { "class": "sidebar_heading", - "settings": ["ui_font_default"], - "font.face": "" + "settings": ["ui_font_roboto_mono"], + "font.face": "Roboto mono" }, { "class": "tree_row", - "layer1.texture": "ayu/assets/tree-highlight.png", - "layer1.tint": [115, 134, 153, 50], - "layer1.inner_margin": [8, 4, 8, 4], - "layer1.opacity": 0 + "layer0.texture": "ayu/assets/tree-highlight.png", + "layer0.tint": [26, 31, 41], + "layer0.inner_margin": [8, 4, 8, 4], + "layer0.opacity": 0 }, { "class": "tree_row", - "layer1.texture": "ayu/assets/tree-highlight-separators.png", + "layer0.texture": "ayu/assets/tree-highlight-separators.png", "settings": ["ui_separator"] }, { "class": "tree_row", "attributes": ["selected"], - "layer1.opacity": 1 + "layer0.opacity": 1 }, { "class": "sidebar_label", - "color": [115, 134, 153], - "font.face": "Roboto mono", + "color": [102, 115, 128], "font.size": 12 }, { @@ -670,26 +622,26 @@ }, { "class": "sidebar_label", - "settings": ["ui_font_default"], - "font.face": "" + "settings": ["ui_font_roboto_mono"], + "font.face": "Roboto mono" }, { "class": "sidebar_label", "parents": [{"class": "tree_row","attributes": ["hover"]}], - "color": [217, 215, 206] + "color": [204, 201, 194] }, { "class": "sidebar_label", "parents": [{"class": "tree_row","attributes": ["selected"]}], - "color": [217, 215, 206] + "color": [204, 201, 194] }, { "class": "sidebar_label", "parents": [{"class": "tree_row","attributes": ["expandable"]}], - "color": [115, 134, 153], + "color": [102, 115, 128], "font.bold": false }, @@ -703,13 +655,13 @@ { "class": "sidebar_label", "parents": [{"class": "tree_row", "attributes": ["expandable", "hover"]}], - "color": [217, 215, 206] + "color": [204, 201, 194] }, { "class": "sidebar_label", "parents": [{"class": "tree_row", "attributes": ["expanded"]}], - "color": [217, 215, 206] + "color": [204, 201, 194] }, { @@ -722,7 +674,7 @@ // { // "class": "sidebar_label", // "parents": [{"class": "tree_row", "attributes": ["expanded", "selected"]}], - // "color": [217, 215, 206] + // "color": [204, 201, 194] // }, { @@ -745,7 +697,7 @@ "layer0.opacity": 0, "layer1.texture": "ayu/assets/folder.png", - "layer1.tint": [62, 75, 89], + "layer1.tint": [71, 81, 93], "layer1.opacity": 1, "layer2.texture": "ayu/assets/folder-open.png", @@ -829,11 +781,11 @@ "class": "icon_folder_dup", "content_margin": [9, 9], "layer0.texture": "ayu/assets/folder.png", - "layer0.tint": [62, 75, 89], + "layer0.tint": [71, 81, 93], "layer0.opacity": 1.0, "layer1.texture": "ayu/assets/folder-symlink.png", - "layer1.tint": [115, 134, 153], + "layer1.tint": [102, 115, 128], "layer1.opacity": 0.3 }, @@ -859,13 +811,13 @@ // Opened files { "class": "close_button", - "content_margin": [8, 8], + "content_margin": [6, 8], // Default Close icon "layer0.texture": "ayu/assets/close.png", "layer0.opacity": 0, "layer0.inner_margin": [0, 0], - "layer0.tint": [115, 134, 153] + "layer0.tint": [102, 115, 128] }, @@ -874,15 +826,14 @@ { "class": "close_button", "parents": [{ "class": "tree_row", "attributes": ["hover"] }], - // Default Close icon - "layer0.opacity": 0.6 + "layer0.opacity": 1 }, { "class": "close_button", "attributes": ["dirty"], "layer0.texture": "ayu/assets/dirty.png", - "layer0.tint": [115, 134, 153], + "layer0.tint": [102, 115, 128], "layer0.opacity": 1.0 }, @@ -903,7 +854,7 @@ "layer0.opacity": 1.0, "layer1.texture": "ayu/assets/scrollbar-vertical-wide.png", - "layer1.tint": [115, 134, 153], + "layer1.tint": [102, 115, 128], "layer1.opacity": 0.1, "layer1.inner_margin": [0, 10], "blur": false @@ -911,7 +862,7 @@ { "class": "scroll_bar_control", "parents": [{"class": "overlay_control"}], - "layer0.tint": [39, 45, 56], + "layer0.tint": [38, 44, 56], "blur": false }, { @@ -929,7 +880,7 @@ { "class": "puck_control", "layer0.texture": "ayu/assets/scrollbar-vertical-wide.png", - "layer0.tint": [115, 134, 153], + "layer0.tint": [102, 115, 128], "layer0.opacity": 0.3, "layer0.inner_margin": [0, 10], "content_margin": [6, 12], @@ -1017,14 +968,14 @@ { "class": "minimap_control", "settings": ["always_show_minimap_viewport"], - "viewport_color": [100, 100, 100], - "viewport_opacity": 0.3 + "viewport_color": [20, 23, 31], + "viewport_opacity": 0.2 }, { "class": "minimap_control", "settings": ["!always_show_minimap_viewport"], - "viewport_color": [100, 100, 100], + "viewport_color": [20, 23, 31], "viewport_opacity": { "target": 0, "speed": 4.0, "interpolation": "smoothstep" } }, @@ -1044,11 +995,10 @@ { "class": "label_control", - "color": [115, 134, 153], + "color": [102, 115, 128], "shadow_color": [0, 0, 0, 0], "shadow_offset": [0, 0], "font.bold": false, - "font.face": "Roboto mono", "font.size": 12 }, { @@ -1058,8 +1008,8 @@ }, { "class": "label_control", - "settings": ["ui_font_default"], - "font.face": "" + "settings": ["ui_font_roboto_mono"], + "font.face": "Roboto mono" }, // Status bar labels @@ -1067,7 +1017,7 @@ { "class": "label_control", "parents": [{"class": "status_bar"}], - "color": [115, 134, 153], + "color": [102, 115, 128], "font.bold": false }, @@ -1079,14 +1029,15 @@ "layer0.tint": [33, 39, 51], "layer0.opacity": 1, "layer1.texture": "ayu/assets/separator-top.png", + "layer1.tint": [26, 31, 41], "layer1.inner_margin": [1, 2, 1, 0], - "content_margin": [10, 0] + "content_margin": [16, 3] }, { "class": "status_bar", "settings": ["ui_separator"], - "layer0.tint": [39, 45, 56] - // "layer1.opacity": 0.3 + // "layer0.tint": [38, 44, 56], + // "layer1.opacity": 1 }, { @@ -1102,7 +1053,7 @@ { "class": "panel_button_control", "layer0.texture": "ayu/assets/switch-panel.png", - "layer0.tint": [115, 134, 153], + "layer0.tint": [102, 115, 128], "layer0.opacity": 1.0 }, @@ -1127,11 +1078,11 @@ { "class": "panel_control", "settings": ["ui_separator"], - "layer0.tint": [39, 45, 56], + // "layer0.tint": [38, 44, 56], "layer1.texture": "ayu/assets/separator-top.png", - "layer1.tint": [115, 134, 153], + "layer1.tint": [26, 31, 41], "layer1.inner_margin": [1, 2, 1, 0], - "layer1.opacity": 0.3 + "layer1.opacity": 1 }, // Status bar panel close icon @@ -1140,7 +1091,7 @@ "class": "panel_close_button", "layer0.texture": "ayu/assets/close.png", "layer0.opacity": 1.0, - "layer0.tint": [115, 134, 153], + "layer0.tint": [102, 115, 128], "content_margin": [0, 0] // 8,8 to show }, { @@ -1156,12 +1107,12 @@ "layer0.texture": "ayu/assets/input-bg.png", "layer0.opacity": 1, "layer0.inner_margin": [10, 8], - "layer0.tint": [39, 45, 56], + "layer0.tint": [38, 44, 56], "layer1.texture": "ayu/assets/input-border.png", - "layer1.opacity": 0.3, + "layer1.opacity": 1, "layer1.inner_margin": [10, 8], - "layer1.tint": [115, 134, 153], + "layer1.tint": [26, 31, 41], "content_margin": [10, 7, 10, 5] }, @@ -1175,9 +1126,9 @@ "layer0.opacity": 0, "layer1.texture": "ayu/assets/input-search.png", "layer1.opacity": 1, - "layer1.tint": [255, 204, 102], - "layer1.inner_margin": [35, 0, 0, 0], - "content_margin": [43, 7, 10, 4] + "layer1.tint": [102, 115, 128, 100], + "layer1.inner_margin": [60, 0, 0, 0], + "content_margin": [50, 7, 10, 4] }, // Textline input oveflow menu @@ -1185,7 +1136,7 @@ "class": "dropdown_button_control", "content_margin": [12, 12], "layer0.texture": "ayu/assets/overflow-menu.png", - "layer0.tint": [62, 75, 89], + "layer0.tint": [71, 81, 93], "layer0.opacity": 1.0 }, { @@ -1220,7 +1171,7 @@ { "class": "label_control", "parents": [{"class": "button_control"}], - "color": [115, 134, 153] + "color": [102, 115, 128] }, { @@ -1234,7 +1185,7 @@ "class": "icon_button_control", "layer0.tint": [0, 0, 0], "layer0.opacity": 0, - "layer2.tint": [217, 215, 206], + "layer2.tint": [204, 201, 194], "layer2.opacity": { "target": 0.0, "speed": 10.0, "interpolation": "smoothstep" }, "content_margin": [10, 5] }, @@ -1247,7 +1198,7 @@ { "class": "icon_regex", "layer0.texture": "ayu/assets/regex.png", - "layer0.tint": [115, 134, 153], + "layer0.tint": [102, 115, 128], "layer0.opacity": 1.0, "content_margin": [12, 12] }, @@ -1263,7 +1214,7 @@ { "class": "icon_case", "layer0.texture": "ayu/assets/matchcase.png", - "layer0.tint": [115, 134, 153], + "layer0.tint": [102, 115, 128], "layer0.opacity": 1.0, "content_margin": [12, 12] }, @@ -1279,7 +1230,7 @@ { "class": "icon_whole_word", "layer0.texture": "ayu/assets/word.png", - "layer0.tint": [115, 134, 153], + "layer0.tint": [102, 115, 128], "layer0.opacity": 1.0, "content_margin": [12, 12] }, @@ -1295,7 +1246,7 @@ { "class": "icon_wrap", "layer0.texture": "ayu/assets/wrap.png", - "layer0.tint": [115, 134, 153], + "layer0.tint": [102, 115, 128], "layer0.opacity": 1.0, "content_margin": [12, 12] }, @@ -1311,7 +1262,7 @@ { "class": "icon_in_selection", "layer0.texture": "ayu/assets/inselection.png", - "layer0.tint": [115, 134, 153], + "layer0.tint": [102, 115, 128], "layer0.opacity": 1.0, "content_margin": [12, 12] }, @@ -1327,7 +1278,7 @@ { "class": "icon_highlight", "layer0.texture": "ayu/assets/highlight.png", - "layer0.tint": [115, 134, 153], + "layer0.tint": [102, 115, 128], "layer0.opacity": 1.0, "content_margin": [12, 12] }, @@ -1343,7 +1294,7 @@ { "class": "icon_preserve_case", "layer0.texture": "ayu/assets/replace-preserve-case.png", - "layer0.tint": [115, 134, 153], + "layer0.tint": [102, 115, 128], "layer0.opacity": 1.0, "content_margin": [12, 12] }, @@ -1359,7 +1310,7 @@ { "class": "icon_context", "layer0.texture": "ayu/assets/context.png", - "layer0.tint": [115, 134, 153], + "layer0.tint": [102, 115, 128], "layer0.opacity": 1.0, "content_margin": [12, 12] }, @@ -1376,7 +1327,7 @@ { "class": "icon_use_buffer", "layer0.texture": "ayu/assets/buffer.png", - "layer0.tint": [115, 134, 153], + "layer0.tint": [102, 115, 128], "layer0.opacity": 1.0, "content_margin": [12, 12] }, @@ -1392,7 +1343,7 @@ { "class": "icon_reverse", "layer0.texture": "ayu/assets/reverse.png", - "layer0.tint": [115, 134, 153], + "layer0.tint": [102, 115, 128], "layer0.opacity": 1.0, "content_margin": [12, 12] }, @@ -1408,7 +1359,7 @@ { "class": "title_bar", "bg": [33, 39, 51], - "fg": [217, 215, 206] + "fg": [204, 201, 194] }, { "class": "title_bar", diff --git a/ayu-mirage.tmTheme b/ayu-mirage.tmTheme index 9ab803c2..c6a060f8 100644 --- a/ayu-mirage.tmTheme +++ b/ayu-mirage.tmTheme @@ -18,35 +18,35 @@ accent #FFCC66 activeGuide - #737D87 + #515C69 background #212733 caret #FFCC66 findHighlight - #D4BFFF + #FFCC66 findHighlightForeground #212733 foreground - #D9D7CE + #CCC9C2 guide - #434E59 + #363E4A gutter #212733 gutterForeground - #434E59 + #39424E inactiveBackground #212733 inactiveSelection - #343F4C88 + #283543 invisibles - #434E59 + #39424E lineHighlight - #242B38 + #1C222C popupCss html, body { - background-color: #272D38; - color: #D9D7CE; + background-color: #262C38; + color: #CCC9C2; } body { padding: 1px 3px; @@ -56,13 +56,13 @@ a { } selection - #343F4C + #293847 selectionBorder - #343F4C + #2C3D4E shadow #00000010 stackGuide - #39434D + #363E4A @@ -86,7 +86,7 @@ a { settings foreground - #D9D7CE + #CCC9C2 @@ -108,7 +108,7 @@ a { settings foreground - #D4BFFF + #FFCC66 @@ -130,7 +130,7 @@ a { settings foreground - #D4BFFF + #FFCC66 @@ -141,7 +141,7 @@ a { settings foreground - #D4BFFF + #FFCC66 @@ -185,7 +185,7 @@ a { settings foreground - #D9D7CECC + #CCC9C2CC @@ -196,7 +196,7 @@ a { settings foreground - #D9D7CE + #CCC9C2 @@ -218,7 +218,7 @@ a { settings foreground - #D9D7CECC + #CCC9C2CC @@ -297,7 +297,7 @@ a { settings foreground - #D4BFFF + #FFCC66 @@ -698,7 +698,7 @@ a { settings background - #D9D7CE07 + #CCC9C207 @@ -709,7 +709,7 @@ a { settings background - #D9D7CE10 + #CCC9C210 @@ -720,7 +720,7 @@ a { settings background - #D9D7CE10 + #CCC9C210 fontStyle bold foreground @@ -737,7 +737,7 @@ a { fontStyle italic foreground - #D4BFFF + #FFCC66 @@ -781,7 +781,7 @@ a { settings foreground - #FF3333 + #F28779 @@ -803,7 +803,7 @@ a { settings background - #D9D7CE10 + #CCC9C210 foreground #5CCFE6 @@ -838,9 +838,9 @@ a { settings background - #D9D7CE10 + #CCC9C210 foreground - #D9D7CE + #CCC9C2 @@ -851,7 +851,7 @@ a { settings background - #D9D7CE10 + #CCC9C210 foreground #5C6773 @@ -908,7 +908,7 @@ a { settings foreground - #5C6773 + #363E4A @@ -919,7 +919,7 @@ a { settings foreground - #5C6773 + #363E4A diff --git a/ayu-mirage2.sublime-theme b/ayu-mirage2.sublime-theme deleted file mode 100644 index 544c1dcc..00000000 --- a/ayu-mirage2.sublime-theme +++ /dev/null @@ -1,1280 +0,0 @@ -// prefix="" -// sublime="2" -// ext="sublime-theme" -[ - - /* @ EMPTY WINDOW - * Style for empty (no tabs) window - ========================================================================= */ - - { - "class" : "sheet_container_control", - "layer0.tint" : [33, 39, 51], - "layer0.opacity" : 1.0 - }, - - - /* @ GRID LAYOUT - * Grid style - ========================================================================= */ - - { - "class": "grid_layout_control", - "border_size": 0, - "border_color": [52, 61, 74] - }, - { - "class": "grid_layout_control", - "settings": ["ui_separator"], - "border_size": 1 - }, - - /* @ DIALOG POPUP - * Dialog popup style and progressbar - ========================================================================= */ - // !!! - { - "class": "progress_gauge_control", - "layer0.tint": [255, 204, 102], - "layer0.opacity": 1.0, - "content_margin": [0, 6] - }, - - { - "class": "dialog", - "layer0.tint": [33, 39, 51], - "layer0.opacity": 1.0 - }, - - { - "class": "progress_bar_control", - "layer0.tint": [33, 39, 51], - "layer0.opacity": 1.0 - }, - - - /* @ CODE FOLDING - * Folding arrow setting and behavioring - ========================================================================= */ - { - "class": "fold_button_control", - "layer0.texture": "ayu/assets/unfold.png", - "layer0.opacity": 1.0, - "layer0.inner_margin": 0, - "layer0.tint": [115, 134, 153], - "content_margin": [8, 6, 8, 6] - }, - - { - "class": "fold_button_control", - "attributes": ["hover"], - "layer0.tint": [255, 204, 102] - }, - - { - "class": "fold_button_control", - "attributes": ["expanded"], - "layer0.texture": "ayu/assets/fold.png" - }, - - - /* @ AUTOCOMPLETE - * Autocomplete popup setting and behavioring - ========================================================================= */ - - { - "class": "popup_control", - "layer0.tint": [39, 45, 56], - "layer0.opacity": 1.0, - "content_margin": [0, 0] - }, - - { - "class": "auto_complete", - "row_padding": [12, 6], - "layer0.tint": [39, 45, 56], - "layer0.opacity": 1.0 - }, - - { - "class": "auto_complete_label", - "fg": [115, 134, 153], - "match_fg": [255, 204, 102], - "selected_fg": [217, 215, 206], - "selected_match_fg": [255, 204, 102] - }, - - { - "class": "table_row", - "layer0.tint": [48, 53, 64], - "layer0.opacity": 0.0 - }, - - { - "class": "table_row", - "attributes": ["selected"], - "layer0.opacity": 1.0 - }, - - - /* @ TOOLTIP - * Tooltip setting and behavioring - ========================================================================= */ - - { - "class": "tool_tip_control", - "layer0.tint": [33, 39, 51], - "layer0.inner_margin": [0, 0], - "layer0.opacity": 1.0, - "content_margin": [10, 6] - }, - - { - "class": "tool_tip_label_control", - "color": [115, 134, 153], - "font.face": "Roboto mono", - "font.size": 12 - }, - { - "class": "tool_tip_label_control", - "settings": ["ui_font_source_code_pro"], - "font.face": "Source Code Pro" - }, - { - "class": "tool_tip_label_control", - "settings": ["ui_font_default"], - "font.face": "" - }, - - /* @OVERLAY PANELS - * Overlay panels setting and behavioring - ========================================================================= */ - - // Command Panel - { - "class": "overlay_control", - "layer0.texture": "ayu/assets/overlay-shadow.png", - "layer0.inner_margin": [25, 45, 25, 35], - "layer0.opacity": 1.0, - "layer0.tint": [17, 20, 26], - - "layer1.texture": "ayu/assets/overlay-bg.png", - "layer1.inner_margin": [25, 45, 25, 35], - "layer1.opacity": 1.0, - "layer1.tint": [39, 45, 56], - - "content_margin": [20, 45, 20, 35] - }, - - // Command Panel list item style (cmd + shift + p) - - { - "class": "mini_quick_panel_row", - "layer0.tint": [33, 39, 51, 0], - "layer0.inner_margin": [2, 2, 2, 2], - "layer0.opacity": 1.0 - }, - - // Command Panel selected list item style (cmd + p) - - { - "class": "mini_quick_panel_row", - "attributes": ["selected"], - "layer0.tint": [48, 53, 64] - }, - - // Quick panel project setting (project manager) (cmd + ctrl + p) - - { - "class": "quick_panel", - "row_padding": [32, 12], - "layer0.tint": [39, 45, 56], - "layer0.opacity": 1.0 - }, - - // Quick Panel row default style (project manager) - - { - "class": "quick_panel_row", - "layer0.texture": "", - "layer0.tint": [39, 45, 56], - "layer0.inner_margin": 0, - "layer0.opacity": 1.0 - }, - - // Row panel style inside comman panel (cmd + shift + p) - - { - "class": "quick_panel_row", - "parents": [{"class": "overlay_control"}], - "layer0.tint": [39, 45, 56], - "layer0.opacity": 1.0 - }, - - // Quick panel (project) style inside overlay_control (cmd + shift + p) - - { - "class": "quick_panel", - "parents": [{"class": "overlay_control"}], - "row_padding": [10, 7], - "layer0.tint": [39, 45, 56], - "layer0.opacity": 1.0 - }, - - // Quick Panel selected list item style - - { - "class": "quick_panel_row", - "attributes": ["selected"], - "layer0.tint": [48, 53, 64] - }, - - // Panel labels - - { - "class": "quick_panel_label", - "fg": [115, 134, 153], - "match_fg": [255, 204, 102], - "selected_fg": [217, 215, 206], - "selected_match_fg": [255, 204, 102] - }, - - // Panel labels - - { - "class": "quick_panel_label", - "parents": [{"class": "overlay_control"}], - "fg": [115, 134, 153], - "match_fg": [255, 204, 102], - "selected_fg": [217, 215, 206], - "selected_match_fg": [255, 204, 102] - }, - - // Panels sublabels - - { - "class": "quick_panel_path_label", - "fg": [102, 115, 127], - "match_fg": [217, 215, 206], - "selected_fg": [115, 134, 153], - "selected_match_fg": [217, 215, 206] - }, - - // Panels data / score - - { - "class": "quick_panel_score_label", - "fg": [115, 134, 153], - "selected_fg": [115, 134, 153] - }, - - - - /* @ TABS - * Tabs settings and behavioring - ========================================================================= */ - - { - "class": "tabset_control", - "tab_overlap": 0, - "tab_width": 50, - "tab_min_width": 50, - "tab_height": 30, - "mouse_wheel_switch": false, - - "layer0.opacity": 1.0, - "layer0.tint": [33, 39, 51], - "content_margin": [10, 0] - }, - { - "class": "tabset_control", - "settings": ["mouse_wheel_switches_tabs", "!enable_tab_scrolling"], - "mouse_wheel_switch": true - }, - { - "class": "tabset_control", - "settings": ["ui_separator"], - "content_margin": [0, 0, 0, 0], - "layer1.opacity": 0.3, - "layer1.texture": "ayu/assets/separator-bottom.png", - "layer1.tint": [115, 134, 153], - "layer1.inner_margin": [1, 0, 1, 2] - }, - { - "class": "tabset_control", - "settings": ["ui_big_tabs"], - "tab_height": 44 - }, - - // Tabs - { - "class": "tab_control", - - "layer0.tint": [33, 39, 51], - "layer0.opacity": 1.0, - - "layer1.texture": "", - - "layer2.texture": "ayu/assets/separator-bottom.png", - "layer2.tint": [255, 204, 102], - "layer2.inner_margin": [1, 0, 1, 2], - "layer2.opacity": 0.0, - - "layer3.texture": "", - - "content_margin": [10, -2, 10, 0], - "max_margin_trim": 12 - }, - { - "class": "tab_control", - "settings": ["ui_separator"], - - "layer1.texture": "ayu/assets/separator-right.png", - "layer1.tint": [115, 134, 153], - "layer1.inner_margin": [0, 1, 2, 1], - "layer1.opacity": 0.3, - - "layer3.texture": "ayu/assets/separator-bottom.png", - "layer3.tint": [115, 134, 153], - "layer3.inner_margin": [1, 0, 1, 2], - "layer3.opacity": 0.3 - }, - { - "class": "tab_control", - "settings": ["ui_big_tabs"], - "content_margin": [15, -2, 15, 0] - }, - - // Selected current tab - - { - "class": "tab_control", "attributes": ["selected"], - "layer2.opacity": 1.0, - "layer3.opacity": 0.0 - }, - - // Hovered current tab - - { - "class": "tab_control", "attributes": ["hover"], - "layer2.opacity": 0.3 - }, - - // Selected current tab - - { - "class": "tab_control", "attributes": ["selected","hover"], - "layer2.opacity": 1.0 - }, - - // Tab Labels - - { - "class": "tab_label", - "fg": [33, 39, 51, 0], - "shadow_color": [115, 134, 153], - "shadow_offset": [0, -1], - "font.size": 12, - "font.italic": false, - "font.bold": false, - "font.face": "Roboto mono" - }, - { - "class": "tab_label", - "settings": ["ui_font_source_code_pro"], - "font.face": "Source Code Pro" - }, - { - "class": "tab_label", - "settings": ["ui_font_default"], - "font.face": "" - }, - { - "class": "tab_label", - "fg": [115, 134, 153], - "settings": ["ui_fix_tab_labels"], - "shadow_color": [33, 39, 51, 0], - "shadow_offset": [0, 0] - }, - - // Tab selected label color - - { - "class": "tab_label", - "parents": [{"class": "tab_control", "attributes": ["selected"]}], - "fg": [33, 39, 51, 0], - "shadow_color": [217, 215, 206], - "shadow_offset": [0, -1] - }, - { - "class": "tab_label", - "settings": ["ui_fix_tab_labels"], - "parents": [{"class": "tab_control", "attributes": ["selected"]}], - "fg": [217, 215, 206], - "shadow_color": [33, 39, 51, 0], - "shadow_offset": [0, 0] - }, - - { - "class": "tab_label", - "attributes": ["transient"], - "font.italic": true - }, - - // Tab Close Buttons - { - "class": "tab_close_button", - "content_margin": [0, 0], - - // Close Icon - "layer0.texture": "ayu/assets/close.png", - "layer0.tint": [115, 134, 153], - "layer0.opacity": 1.0, - - // Dirty Icon - "layer1.texture": "ayu/assets/dirty.png", - "layer1.tint": [115, 134, 153], - "layer1.opacity": 0 - }, - - // Default - { - "class": "tab_close_button", - "settings": ["show_tab_close_buttons"], - "content_margin": [8, 8] - }, - - // Default hover - { - "class": "tab_close_button", - "settings": ["show_tab_close_buttons"], - "attributes": ["hover"], - "layer0.tint": [255, 204, 102] - }, - - // Dirty tab - { - "class": "tab_close_button", - "parents": [{"class": "tab_control", "attributes": ["dirty"]}], - "layer0.opacity": 0, // Close Icon - "layer1.opacity": 1.0, // dirty Icon - "content_margin": [8, 8] - }, - - // Dirty tab on hover - { - "class": "tab_close_button", - "parents": [{"class": "tab_control", "attributes": ["dirty"]}], - "attributes": ["hover"], - "layer0.opacity": 1.0, // Close Icon - "layer1.opacity": 0 // Close Icon - }, - - // Selected dirty tab - { - "class": "tab_close_button", - "parents": [{"class": "tab_control", "attributes": ["selected", "dirty"]}], - "layer0.opacity": 0, // Close Icon - "layer1.opacity": 1.0, // Dirty Icon - "layer1.tint": [255, 204, 102] - }, - - // Selected dirty tab on hover - { - "class": "tab_close_button", - "parents": [{"class": "tab_control", "attributes": ["selected", "dirty"]}], - "attributes": ["hover"], - "layer0.opacity": 1.0, - "layer1.opacity": 0 - }, - // tab set scroll left | scroll right - { - "class": "scroll_tabs_left_button", - "content_margin": [12, 15], - "layer0.texture": "ayu/assets/arrow-left.png", - "layer0.tint": [62, 75, 89], - "layer0.opacity": 1.0 - }, - - { - "class": "scroll_tabs_left_button", - "attributes": ["hover"], - "layer0.tint": [255, 204, 102] - }, - - { - "class": "scroll_tabs_right_button", - "content_margin": [12, 15], - "layer0.texture": "ayu/assets/arrow-right.png", - "layer0.tint": [62, 75, 89], - "layer0.opacity": 1.0 - }, - { - "class": "scroll_tabs_right_button", - "settings": ["ui_separator"], - "layer2.texture": "ayu/assets/separator-right.png", - "layer2.tint": [115, 134, 153], - "layer2.opacity": 0.3, - "layer2.inner_margin" : [0, 1, 2, 1] - }, - - { - "class": "scroll_tabs_right_button", - "attributes": ["hover"], - "layer0.tint": [255, 204, 102] - }, - - { - "class": "show_tabs_dropdown_button", - "content_margin": [12, 12], - "layer0.texture": "ayu/assets/overflow-menu.png", - "layer0.tint": [62, 75, 89], - "layer0.opacity": 1.0, - "layer0.inner_margin": [0, 0] - }, - - { - "class": "show_tabs_dropdown_button", - "attributes": ["hover"], - "layer0.tint": [255, 204, 102] - }, - - - /* @ SIDEBAR - * Sidebar panel settings and behavioring - ========================================================================= */ - - { - "class": "sidebar_container", - "content_margin": [0, -20, 0, 0], - "layer0.opacity": 1, - "layer0.tint": [33, 39, 51] - }, - { - "class": "sidebar_container", - "settings": ["ui_separator"], - "layer1.texture": "ayu/assets/separator-right.png", - "layer1.tint": [115, 134, 153], - "layer1.inner_margin": [0, 1, 2, 1], - "layer1.opacity": 0.3 - }, - - { - "class": "sidebar_tree", - "row_padding": [30, 6], - "indent": 12, - "indent_offset": 0, - "indent_top_level": false, - "dark_content": true - }, - - { - "class": "sidebar_heading", - "color": [33, 39, 51], - "font.face": "Roboto mono", - "font.bold": true, - "font.size": 11 - }, - { - "class": "sidebar_heading", - "settings": ["ui_font_source_code_pro"], - "font.face": "Source Code Pro" - }, - { - "class": "sidebar_heading", - "settings": ["ui_font_default"], - "font.face": "" - }, - - { - "class": "tree_row", - "layer1.texture": "ayu/assets/tree-highlight.png", - "layer1.opacity": { "target": 0.0, "speed": 5.0, "interpolation": "smoothstep" }, - "layer1.tint": [255, 204, 102], - "layer1.inner_margin": [5, 0, 0, 3], - "layer0.tint": [48, 53, 64], - "layer0.opacity": 0 - }, - - { - "class": "tree_row", - "attributes": ["selected"], - "layer1.opacity": { "target": 1.0, "speed": 5.0, "interpolation": "smoothstep" } - }, - - { - "class": "sidebar_label", - "color": [115, 134, 153], - "shadow_color": [0, 0, 0], - "shadow_offset": [0, 0], - "font.face": "Roboto mono", - "font.size": 12 - }, - { - "class": "sidebar_label", - "settings": ["ui_font_source_code_pro"], - "font.face": "Source Code Pro" - }, - { - "class": "sidebar_label", - "settings": ["ui_font_default"], - "font.face": "" - }, - - { - "class": "sidebar_label", - "parents": [{"class": "tree_row","attributes": ["hover"]}], - "color": [217, 215, 206] - }, - - { - "class": "sidebar_label", - "parents": [{"class": "tree_row","attributes": ["selected"]}], - "color": [217, 215, 206], - "shadow_color": [0, 0, 0], - "shadow_offset": [0, 0] - }, - - { - "class": "sidebar_label", - "parents": [{"class": "tree_row","attributes": ["expandable"]}], - "color": [115, 134, 153], - "font.bold": false - }, - - { - "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", "hover"]}], - "color": [217, 215, 206] - }, - - { - "class": "sidebar_label", - "parents": [{"class": "tree_row", "attributes": ["expanded"]}], - "color": [217, 215, 206] - }, - - { - "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": [217, 215, 206] - // }, - - { - "class": "sidebar_label", - "attributes": ["transient"], - "font.italic": false - }, - - // Hidden arrow icon before folder - - { - "class": "disclosure_button_control", - "layer0.texture": "ayu/assets/arrow-right.png", - "layer0.tint": [62, 75, 89], - "layer0.opacity": 1, - "layer0.inner_margin": 0, - "content_margin": [12, 15] - }, - - { - "class": "disclosure_button_control", - "parents": [{ "class": "tree_row", "attributes": ["hover"]}], - "layer0.tint": [255, 204, 102] - }, - - { - "class": "disclosure_button_control", - "attributes": ["expanded"], - "layer0.texture": "ayu/assets/overflow-menu.png", - "content_margin": [12, 12] - }, - - { - "class": "disclosure_button_control", - "attributes": ["expanded"], - "parents": [{ "class": "tree_row", "attributes": ["hover"]}], - "layer0.tint": [255, 204, 102] - }, - - // Opened files - { - "class": "close_button", - "content_margin": [8, 8], - - // Default Close icon - "layer0.texture": "ayu/assets/close.png", - "layer0.opacity": 0, - "layer0.inner_margin": [0, 0], - "layer0.tint": [115, 134, 153] - }, - - - // Opened file hover - - { - "class": "close_button", - "parents": [{ "class": "tree_row", "attributes": ["hover"] }], - // Default Close icon - "layer0.opacity": 0.6 - }, - - { - "class": "close_button", - "attributes": ["dirty"], - "layer0.texture": "ayu/assets/dirty.png", - "layer0.tint": [115, 134, 153], - "layer0.opacity": 1.0 - }, - - { - "class": "close_button", - "attributes": ["hover"], - "layer0.opacity": 1.0, - "layer0.tint": [255, 204, 102] - }, - - - /* @ SCROLLBARS - * Scrollbars settings and behavioring - ========================================================================= */ - - // Normal Vertical scrollbar track - // !!! - { - "class": "scroll_bar_control", - "layer0.tint" : [33, 39, 51], - "layer0.opacity": 1, - "layer0.inner_margin": [0, 0], - "blur": false - }, - - // Normal Vertical scrollbar track inside overlay panel - - { - "class": "scroll_bar_control", - "parents": [{"class": "overlay_control"}], - "layer0.tint": [33, 39, 51, 0], - "layer0.opacity": 1.0, - "layer0.inner_margin": [0, 2], - "blur": false - }, - - // Normal horizontal scrollbar track - - { - "class": "scroll_bar_control", - "attributes": ["horizontal"], - "layer0.texture": "", - "layer0.tint" : [33, 39, 51], - "layer0.inner_margin": [0, 0], - "blur": false - }, - - // Normal horizontal scrollbar track inside overlay panel - // !!! - // { - // "class": "scroll_bar_control", - // "attributes": ["horizontal"], - // "parents": [{"class": "overlay_control"}], - // "layer0.tint": [33, 39, 51, 0], - // "layer0.opacity": 0.0, - // "layer0.inner_margin": [0, 2], - // "blur": false - // }, - - // Scrollbars corner - - { - "class": "scroll_corner_control", - "layer0.texture": "", - "layer0.tint":[33, 39, 51], - "layer0.inner_margin": [0, 0], - "layer0.opacity": 1, - "blur": false - }, - - // Vertical puck controller - - { - "class": "puck_control", - "layer0.texture": "", - "layer0.tint": [255, 255, 255, 50], - "layer0.opacity": 1, - "layer0.inner_margin": [0, 0], - "content_margin": [1, 12], - "blur": false - }, - - // Horizontal puck controller - - { - "class": "puck_control", - "attributes": ["horizontal"], - "layer0.texture": "", - "layer0.tint": [255, 255, 255, 50], - "layer0.inner_margin": [0, 0], - "content_margin": [12, 1], - "blur": false - }, - - { - "class": "scroll_area_control", - "settings": ["overlay_scroll_bars"], - "overlay": true - }, - - { - "class": "scroll_area_control", - "settings": ["!overlay_scroll_bars"], - "overlay": false // set to false for the original behavior - }, - - - { - "class": "scroll_area_control", - "parents": [{"class": "overlay_control"}], - "settings": ["overlay_scroll_bars"], - "overlay": true // set to false for the original behavior - }, - - { - "class": "scroll_area_control", - "parents": [{"class": "sidebar_container"}], - "settings": ["!overlay_scroll_bars"], - "overlay": false // set to false for the original behavior - }, - - { - "class": "scroll_bar_control", - "settings": ["overlay_scroll_bars"], - "layer0.tint": [28, 31, 38], - "layer0.inner_margin": [0, 5], - "blur": false - }, - - { - "class": "scroll_bar_control", - "settings": ["overlay_scroll_bars"], - "attributes": ["horizontal"], - "layer0.inner_margin": [5, 0], - "blur": true - }, - - - /* @ MINIMAP - * Minimap settings and behavioring - ========================================================================= */ - - { - "class": "minimap_control", - "settings": ["always_show_minimap_viewport"], - "viewport_color": [100, 100, 100] - }, - - { - "class": "minimap_control", - "settings": ["!always_show_minimap_viewport"], - "viewport_color": [100, 100, 100, 20] - }, - - - /* @ STATUS BAR - * Status bar settings and behavioring - ========================================================================= */ - - // All labels - - { - "class": "label_control", - "color": [115, 134, 153], - "shadow_color": [0, 0, 0, 0], - "shadow_offset": [0, 0], - "font.bold": false, - "font.face": "Roboto mono", - "font.size": 12 - }, - { - "class": "label_control", - "settings": ["ui_font_source_code_pro"], - "font.face": "Source Code Pro" - }, - { - "class": "label_control", - "settings": ["ui_font_default"], - "font.face": "" - }, - - // Status bar labels - - { - "class": "label_control", - "parents": [{"class": "status_bar"}], - "color": [115, 134, 153], - "font.bold": false - }, - - // Text field labels - - { - "class": "status_bar", - "layer0.texture": "", - "layer0.tint": [33, 39, 51], - "layer0.opacity": 1, - "layer1.texture": "ayu/assets/separator-top.png", - "layer1.inner_margin": [1, 2, 1, 0], - "content_margin": [10, 5] - }, - { - "class": "status_bar", - "settings": ["ui_separator"], - "layer0.tint": [39, 45, 56] - // "layer1.opacity": 0.3 - }, - - { - "class": "status_container", - "content_margin": [0, 5] - }, - - { - "class": "status_button", - "min_size": [100, 0] - }, - - - /* @ WIDGET PANEL - * Widget, input, buttons settings and behavioring - ========================================================================= */ - - - // Status bar panel - { - "class": "panel_control", - "layer0.tint": [33, 39, 51], - "layer0.opacity": 1.0, - "content_margin": [0, 5] - }, - { - "class": "panel_control", - "settings": ["ui_separator"], - "layer0.tint": [39, 45, 56], - "layer1.texture": "ayu/assets/separator-top.png", - "layer1.tint": [115, 134, 153], - "layer1.inner_margin": [1, 2, 1, 0], - "layer1.opacity": 0.3 - }, - - // Status bar panel close icon - - { - "class": "panel_close_button", - "layer0.texture": "ayu/assets/close.png", - "layer0.opacity": 1.0, - "layer0.tint": [115, 134, 153], - "content_margin": [0, 0] // 8,8 to show - }, - // !!! - { - "class": "panel_close_button", - "attributes": ["hover"], - "layer0.tint": [255, 204, 102] - }, - - // Texline input - - { - "class": "text_line_control", - "layer0.texture": "ayu/assets/input-bg.png", - "layer0.opacity": 1, - "layer0.inner_margin": [10, 8], - "layer0.tint": [39, 45, 56], - - "layer1.texture": "ayu/assets/input-border.png", - "layer1.opacity": 0.3, - "layer1.inner_margin": [10, 8], - "layer1.tint": [115, 134, 153], - "content_margin": [10, 7, 10, 5] - }, - - - // Textline input inside overlay panels - - { - "class": "text_line_control", - "parents": [{"class": "overlay_control"}], - "layer0.texture": "", - "layer0.opacity": 0, - "layer1.texture": "ayu/assets/input-search.png", - "layer1.opacity": 1, - "layer1.tint": [255, 204, 102], - "layer1.inner_margin": [35, 0, 0, 0], - "content_margin": [43, 7, 10, 4] - }, - - // Textline input oveflow menu - { - "class": "dropdown_button_control", - "content_margin": [12, 12], - "layer0.texture": "ayu/assets/overflow-menu.png", - "layer0.tint": [62, 75, 89], - "layer0.opacity": 1.0 - }, - { - "class": "dropdown_button_control", - "attributes": ["hover"], - "layer0.tint": [255, 204, 102] - }, - - - /* @ BUTTONS - * Buttons panels settings and behavioring - ========================================================================= */ - - - // Button labels - - { - "class": "button_control", - "content_margin": [15, 9, 15, 10], - "min_size": [60, 0], - "layer0.tint": [255, 204, 102, 10], - "layer0.texture": "ayu/assets/input-bg.png", - "layer0.inner_margin": [10, 8], - "layer0.opacity": 0 - }, - { - "class": "button_control", - "attributes": ["hover"], - "layer0.opacity": 1 - }, - - { - "class": "label_control", - "parents": [{"class": "button_control"}], - "color": [115, 134, 153] - }, - - { - "class": "label_control", - "parents": [{"class": "button_control", "attributes": ["hover"]}], - "color": [255, 204, 102] - }, - - // !!! - // Small Icon Buttons - { - "class": "icon_button_control", - "layer0.tint": [0, 0, 0], - "layer0.opacity": 0, - "layer2.tint": [217, 215, 206], - "layer2.opacity": { "target": 0.0, "speed": 10.0, "interpolation": "smoothstep" }, - "content_margin": [10, 5] - }, - - - /* Buttons icons settings - ===================================================================== */ - - // Regex Icon - { - "class": "icon_regex", - "layer0.texture": "ayu/assets/regex.png", - "layer0.tint": [115, 134, 153], - "layer0.opacity": 1.0, - "content_margin": [12, 12] - }, - - { - "class": "icon_regex", - "parents": [{"class": "icon_button_control", "attributes": ["selected"]}], - "layer0.tint": [255, 204, 102] - }, - - // Preserve case sensitive - - { - "class": "icon_case", - "layer0.texture": "ayu/assets/matchcase.png", - "layer0.tint": [115, 134, 153], - "layer0.opacity": 1.0, - "content_margin": [12, 12] - }, - - { - "class": "icon_case", - "parents": [{"class": "icon_button_control", "attributes": ["selected"]}], - "layer0.tint": [255, 204, 102] - }, - - // Wholeword - - { - "class": "icon_whole_word", - "layer0.texture": "ayu/assets/word.png", - "layer0.tint": [115, 134, 153], - "layer0.opacity": 1.0, - "content_margin": [12, 12] - }, - - - { - "class": "icon_whole_word", - "parents": [{"class": "icon_button_control", "attributes": ["selected"]}], - "layer0.tint": [255, 204, 102] - }, - - // Wrap - - { - "class": "icon_wrap", - "layer0.texture": "ayu/assets/wrap.png", - "layer0.tint": [115, 134, 153], - "layer0.opacity": 1.0, - "content_margin": [12, 12] - }, - - { - "class": "icon_wrap", - "parents": [{"class": "icon_button_control", "attributes": ["selected"]}], - "layer0.tint": [255, 204, 102] - }, - - // In selection - - { - "class": "icon_in_selection", - "layer0.texture": "ayu/assets/inselection.png", - "layer0.tint": [115, 134, 153], - "layer0.opacity": 1.0, - "content_margin": [12, 12] - }, - - { - "class": "icon_in_selection", - "parents": [{"class": "icon_button_control", "attributes": ["selected"]}], - "layer0.tint": [255, 204, 102] - }, - - // Highlight Result - - { - "class": "icon_highlight", - "layer0.texture": "ayu/assets/highlight.png", - "layer0.tint": [115, 134, 153], - "layer0.opacity": 1.0, - "content_margin": [12, 12] - }, - - { - "class": "icon_highlight", - "parents": [{"class": "icon_button_control", "attributes": ["selected"]}], - "layer0.tint": [255, 204, 102] - }, - - // Preserve Case - - { - "class": "icon_preserve_case", - "layer0.texture": "ayu/assets/replace-preserve-case.png", - "layer0.tint": [115, 134, 153], - "layer0.opacity": 1.0, - "content_margin": [12, 12] - }, - - { - "class": "icon_preserve_case", - "parents": [{"class": "icon_button_control", "attributes": ["selected"]}], - "layer0.tint": [255, 204, 102] - }, - - // Show context - - { - "class": "icon_context", - "layer0.texture": "ayu/assets/context.png", - "layer0.tint": [115, 134, 153], - "layer0.opacity": 1.0, - "content_margin": [12, 12] - }, - - - { - "class": "icon_context", - "parents": [{"class": "icon_button_control", "attributes": ["selected"]}], - "layer0.tint": [255, 204, 102] - }, - - // Use buffer - - { - "class": "icon_use_buffer", - "layer0.texture": "ayu/assets/buffer.png", - "layer0.tint": [115, 134, 153], - "layer0.opacity": 1.0, - "content_margin": [12, 12] - }, - - { - "class": "icon_use_buffer", - "parents": [{"class": "icon_button_control", "attributes": ["selected"]}], - "layer0.tint": [255, 204, 102] - }, - - // Reverse direction - - { - "class": "icon_reverse", - "layer0.texture": "ayu/assets/reverse.png", - "layer0.tint": [115, 134, 153], - "layer0.opacity": 1.0, - "content_margin": [12, 12] - }, - - { - "class": "icon_reverse", - "parents": [{"class": "icon_button_control", "attributes": ["selected"]}], - "layer0.tint": [255, 204, 102] - }, - - - /* Visual settings - ===================================================================== */ - - // UI font sizees - // ============== - { - "class": "tab_label", - "settings": ["ui_font_size_small"], - "font.size": 11 - }, - { - "class": "sidebar_label", - "settings": ["ui_font_size_small"], - "font.size": 11 - }, - { - "class": "label_control", - "settings": ["ui_font_size_small"], - "font.size": 11 - }, - { - "class": "tool_tip_label_control", - "settings": ["ui_font_size_small"], - "font.size": 11 - } -] diff --git a/gulpfile.js b/gulpfile.js index 35eb84b1..a7e3cb19 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -6,10 +6,16 @@ const yaml = require('yamljs') const fs = require('fs-jetpack') const exec = require('gulp-exec') const through = require('through2') +const clearRequire = require('clear-require') const hexRx = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i -_.templateSettings.interpolate = /"{([\s\S]+?)}"/g; +_.templateSettings.interpolate = /"{([\s\S]+?)}"/g + +function colors(path) { + clearRequire(`./src/themes/${path}`) + return require(`./src/themes/${path}`) +} function templates (type) { return fs.find('./src/templates', { matching: '*' + type }) @@ -30,26 +36,6 @@ function fileNmae (str, theme) { return path.join(process.cwd(), name) } -function tryRbg (hex) { - const n16 = (c) => parseInt(c, 16) - const isRgb = hexRx.test(hex) - const cs = isRgb ? hexRx.exec(hex) : [] - const rgb = `${n16(cs[1])}, ${n16(cs[2])}, ${n16(cs[3])}` - return isRgb ? { hex, rgb } : hex -} - -function convertColors (obj) { - return _.mapValues(obj, col => { - return _.isString(col) ? tryRbg(col) : convertColors(col) - }) -} - -function colors (file) { - const content = file.contents.toString('ascii') - const defs = yaml.parse(content) - return convertColors(defs) -} - function build (types, defs) { const base = process.cwd() const themes = _.concat([], types).map(templates) @@ -61,15 +47,13 @@ function build (types, defs) { } function widgets (file, enc, next) { - const defs = colors(file) - build(['widget.xml', 'widget.json'], defs) + build(['widget.xml', 'widget.json'], colors(file.relative)) .map(this.push.bind(this)) next() } function themes (file, enc, next) { - const defs = colors(file) - build(['syntax.xml', 'ui.json'], defs) + build(['syntax.xml', 'ui.json'], colors(file.relative)) .map(this.push.bind(this)) next() } @@ -80,17 +64,19 @@ gulp.task('clean', () => { }) gulp.task('widgets', () => - gulp.src('./src/themes/*.yml') + gulp.src('./src/themes/!(color).js') .pipe(through.obj(widgets)) .pipe(gulp.dest('./widgets')) ) gulp.task('themes', () => - gulp.src('./src/themes/*.yml') + gulp.src('./src/themes/!(color).js') .pipe(through.obj(themes)) .pipe(gulp.dest('./')) ) -gulp.task('default', ['themes', 'widgets']) +gulp.task('watch', () => + gulp.watch('./src/**/*', ['themes', 'widgets']) +) -gulp.task('watch', () => gulp.watch('./src/**/*', ['themes', 'widgets'])) +gulp.task('default', ['themes', 'widgets']) diff --git a/messages.json b/messages.json index f4370548..ad1561c6 100644 --- a/messages.json +++ b/messages.json @@ -24,5 +24,6 @@ "3.1.6": "messages/3.1.6.md", "3.1.8": "messages/3.1.8.md", "3.2.0": "messages/3.2.0.md", - "3.2.1": "messages/3.2.1.md" + "3.2.1": "messages/3.2.1.md", + "4.0.0": "messages/4.0.0.md" } diff --git a/messages/4.0.0.md b/messages/4.0.0.md new file mode 100644 index 00000000..6fa798f3 --- /dev/null +++ b/messages/4.0.0.md @@ -0,0 +1,22 @@ +**ayu theme for Sublime Text** +https://github.com/dempfi/ayu/releases + +******************************************************************************** +ayu from version 3.0.0 supports customization via A File Icon package +(https://github.com/ihodev/a-file-icon). Please install it for better expereince. +******************************************************************************** + +# Version 4.0.0 + +🎉 Comepletely updated UI themes +🎉 Redrawn icons +...and a lot of minor changes + +Breaking changes: +******************************************************* +- Default UI font is no longer Roboto Mono but the system font. To have + Roboto Mono again use `ui_font_roboto_mono: true` setting. + +- Ayu no longer supports Sublime Text version 2 since version 3 + is officially released. + diff --git a/package.json b/package.json index 33d8e00e..84b864e5 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ }, "scripts": { "watch": "gulp watch", - "b": "gulp", + "build": "gulp", "c": "gulp clean" }, "homepage": "https://github.com/dempfi/ayu#readme", @@ -24,6 +24,10 @@ "lodash": "^4.16.4", "through2": "^2.0.1", "vinyl": "^2.0.0", - "yamljs": "^0.2.8" + "yamljs": "^0.2.8", + "clear-require": "^2.0.0", + "color": "^2.0.0" + }, + "dependencies": { } } diff --git a/src/templates/sublime.syntax.xml b/src/templates/sublime.syntax.xml index 0a9e07f3..abff4aa9 100644 --- a/src/templates/sublime.syntax.xml +++ b/src/templates/sublime.syntax.xml @@ -16,37 +16,37 @@ settings accent - #"{common.accent.hex}" + "{common.accent.hex}" activeGuide - #"{syntax.active_guide.hex}" + "{editor.guide.active.hex}" background - #"{common.bg.hex}" + "{common.bg.hex}" caret - #"{common.accent.hex}" + "{common.accent.hex}" findHighlight - #"{syntax.constant.hex}" + "{common.accent.hex}" findHighlightForeground - #"{common.bg.hex}" + "{common.bg.hex}" foreground - #"{common.fg.hex}" + "{common.fg.hex}" guide - #"{syntax.gutter.hex}" + "{editor.guide.normal.hex}" gutter - #"{common.bg.hex}" + "{common.bg.hex}" gutterForeground - #"{syntax.gutter.hex}" + "{editor.gutter.hex}" inactiveBackground - #"{common.bg.hex}" + "{common.bg.hex}" inactiveSelection - #"{syntax.selection.hex}"88 + "{editor.selection.inactive.hex}" invisibles - #"{syntax.gutter.hex}" + "{editor.gutter.hex}" lineHighlight - #"{syntax.line.hex}" + "{editor.line.hex}" popupCss html, body { - background-color: #"{ui.panel.bg.hex}"; - color: #"{common.fg.hex}"; + background-color: "{ui.panel.bg.hex}"; + color: "{common.fg.hex}"; } body { padding: 1px 3px; @@ -56,13 +56,13 @@ a { } selection - #"{syntax.selection.hex}" + "{editor.selection.bg.hex}" selectionBorder - #"{syntax.selection.hex}" + "{editor.selection.border.hex}" shadow #00000010 stackGuide - #"{syntax.stack_guide.hex}" + "{editor.guide.stack.hex}" @@ -75,7 +75,7 @@ a { fontStyle italic foreground - #"{syntax.comment.hex}" + "{syntax.comment.hex}" @@ -86,7 +86,7 @@ a { settings foreground - #"{common.fg.hex}" + "{common.fg.hex}" @@ -97,7 +97,7 @@ a { settings foreground - #"{syntax.string.hex}" + "{syntax.string.hex}" @@ -108,7 +108,7 @@ a { settings foreground - #"{syntax.constant.hex}" + "{common.accent.hex}" @@ -119,7 +119,7 @@ a { settings foreground - #"{syntax.regexp.hex}" + "{syntax.regexp.hex}" @@ -130,7 +130,7 @@ a { settings foreground - #"{syntax.constant.hex}" + "{common.accent.hex}" @@ -141,7 +141,7 @@ a { settings foreground - #"{syntax.constant.hex}" + "{common.accent.hex}" @@ -163,7 +163,7 @@ a { settings foreground - #"{syntax.keyword.hex}" + "{syntax.keyword.hex}" @@ -174,7 +174,7 @@ a { settings foreground - #"{syntax.operator.hex}" + "{syntax.operator.hex}" @@ -185,7 +185,7 @@ a { settings foreground - #"{common.fg.hex}"CC + "{common.fg.hex}"CC @@ -196,7 +196,7 @@ a { settings foreground - #"{common.fg.hex}" + "{common.fg.hex}" @@ -207,7 +207,7 @@ a { settings foreground - #"{syntax.operator.hex}" + "{syntax.operator.hex}" @@ -218,7 +218,7 @@ a { settings foreground - #"{common.fg.hex}"CC + "{common.fg.hex}"CC @@ -229,7 +229,7 @@ a { settings foreground - #"{syntax.special.hex}" + "{syntax.special.hex}" @@ -240,7 +240,7 @@ a { settings foreground - #"{syntax.keyword.hex}" + "{syntax.keyword.hex}" @@ -251,7 +251,7 @@ a { settings foreground - #"{syntax.keyword.hex}" + "{syntax.keyword.hex}" @@ -262,7 +262,7 @@ a { settings foreground - #"{syntax.func.hex}" + "{syntax.func.hex}" @@ -273,7 +273,7 @@ a { settings foreground - #"{syntax.entity.hex}" + "{syntax.entity.hex}" @@ -286,7 +286,7 @@ a { fontStyle underline foreground - #"{syntax.entity.hex}" + "{syntax.entity.hex}" @@ -297,7 +297,7 @@ a { settings foreground - #"{syntax.constant.hex}" + "{common.accent.hex}" @@ -310,7 +310,7 @@ a { fontStyle italic foreground - #"{syntax.tag.hex}" + "{syntax.tag.hex}" @@ -321,7 +321,7 @@ a { settings foreground - #"{syntax.tag.hex}" + "{syntax.tag.hex}" @@ -332,7 +332,7 @@ a { settings foreground - #"{syntax.tag.hex}"90 + "{syntax.tag.hex}"90 @@ -343,7 +343,7 @@ a { settings foreground - #"{syntax.func.hex}" + "{syntax.func.hex}" @@ -354,7 +354,7 @@ a { settings foreground - #"{syntax.func.hex}" + "{syntax.func.hex}" @@ -365,7 +365,7 @@ a { settings foreground - #"{syntax.markup.hex}" + "{syntax.markup.hex}" @@ -378,7 +378,7 @@ a { fontStyle italic foreground - #"{syntax.operator.hex}" + "{syntax.operator.hex}" @@ -391,7 +391,7 @@ a { fontStyle italic foreground - #"{syntax.tag.hex}" + "{syntax.tag.hex}" @@ -402,7 +402,7 @@ a { settings foreground - #"{syntax.error.hex}" + "{syntax.error.hex}" @@ -413,7 +413,7 @@ a { settings background - #"{syntax.keyword.hex}" + "{syntax.keyword.hex}" foreground #FFFFFF @@ -437,7 +437,7 @@ a { settings foreground - #"{syntax.func.hex}" + "{syntax.func.hex}" @@ -448,7 +448,7 @@ a { settings foreground - #"{syntax.entity.hex}" + "{syntax.entity.hex}" @@ -459,7 +459,7 @@ a { settings foreground - #"{syntax.comment.hex}" + "{syntax.comment.hex}" @@ -472,7 +472,7 @@ a { fontStyle normal foreground - #"{syntax.tag.hex}" + "{syntax.tag.hex}" @@ -483,7 +483,7 @@ a { settings foreground - #"{syntax.comment.hex}" + "{syntax.comment.hex}" @@ -494,7 +494,7 @@ a { settings foreground - #"{syntax.keyword.hex}" + "{syntax.keyword.hex}" @@ -505,7 +505,7 @@ a { settings foreground - #"{syntax.string.hex}" + "{syntax.string.hex}" @@ -514,7 +514,7 @@ a { settings foreground - #"{syntax.error.hex}" + "{syntax.error.hex}" @@ -525,7 +525,7 @@ a { settings foreground - #"{syntax.tag.hex}" + "{syntax.tag.hex}" @@ -536,7 +536,7 @@ a { settings foreground - #"{syntax.tag.hex}" + "{syntax.tag.hex}" @@ -547,7 +547,7 @@ a { settings foreground - #"{syntax.tag.hex}" + "{syntax.tag.hex}" @@ -558,7 +558,7 @@ a { settings foreground - #"{syntax.tag.hex}" + "{syntax.tag.hex}" @@ -569,7 +569,7 @@ a { settings foreground - #"{syntax.tag.hex}" + "{syntax.tag.hex}" @@ -580,7 +580,7 @@ a { settings foreground - #"{syntax.tag.hex}" + "{syntax.tag.hex}" @@ -591,7 +591,7 @@ a { settings foreground - #"{syntax.tag.hex}" + "{syntax.tag.hex}" @@ -602,7 +602,7 @@ a { settings foreground - #"{syntax.tag.hex}" + "{syntax.tag.hex}" @@ -613,7 +613,7 @@ a { settings foreground - #"{syntax.tag.hex}" + "{syntax.tag.hex}" @@ -626,7 +626,7 @@ a { fontStyle bold foreground - #"{syntax.keyword.hex}" + "{syntax.keyword.hex}" @@ -639,7 +639,7 @@ a { fontStyle italic underline foreground - #"{syntax.regexp.hex}" + "{syntax.regexp.hex}" @@ -650,7 +650,7 @@ a { settings foreground - #"{syntax.func.hex}" + "{syntax.func.hex}" @@ -663,7 +663,7 @@ a { fontStyle italic foreground - #"{syntax.markup.hex}" + "{syntax.markup.hex}" @@ -676,7 +676,7 @@ a { fontStyle bold foreground - #"{syntax.markup.hex}" + "{syntax.markup.hex}" @@ -698,7 +698,7 @@ a { settings background - #"{common.fg.hex}"07 + "{common.fg.hex}"07 @@ -709,7 +709,7 @@ a { settings background - #"{common.fg.hex}"10 + "{common.fg.hex}"10 @@ -720,11 +720,11 @@ a { settings background - #"{common.fg.hex}"10 + "{common.fg.hex}"10 fontStyle bold foreground - #"{syntax.comment.hex}" + "{syntax.comment.hex}" @@ -737,7 +737,7 @@ a { fontStyle italic foreground - #"{syntax.constant.hex}" + "{common.accent.hex}" @@ -748,7 +748,7 @@ a { settings foreground - #"{syntax.regexp.hex}" + "{syntax.regexp.hex}" @@ -759,7 +759,7 @@ a { settings foreground - #"{syntax.string.hex}" + "{syntax.string.hex}" @@ -770,7 +770,7 @@ a { settings foreground - #"{syntax.tag.hex}" + "{syntax.tag.hex}" @@ -781,7 +781,7 @@ a { settings foreground - #"{syntax.error.hex}" + "{syntax.markup.hex}" @@ -792,7 +792,7 @@ a { settings foreground - #"{syntax.special.hex}" + "{syntax.special.hex}" @@ -803,9 +803,9 @@ a { settings background - #"{common.fg.hex}"10 + "{common.fg.hex}"10 foreground - #"{syntax.tag.hex}" + "{syntax.tag.hex}" @@ -816,7 +816,7 @@ a { settings foreground - #"{syntax.operator.hex}" + "{syntax.operator.hex}" @@ -827,7 +827,7 @@ a { settings foreground - #"{syntax.comment.hex}" + "{syntax.comment.hex}" @@ -838,9 +838,9 @@ a { settings background - #"{common.fg.hex}"10 + "{common.fg.hex}"10 foreground - #"{common.fg.hex}" + "{common.fg.hex}" @@ -851,9 +851,9 @@ a { settings background - #"{common.fg.hex}"10 + "{common.fg.hex}"10 foreground - #"{syntax.comment.hex}" + "{syntax.comment.hex}" @@ -864,7 +864,7 @@ a { settings foreground - #"{syntax.comment.hex}" + "{syntax.comment.hex}" @@ -875,7 +875,7 @@ a { settings foreground - #"{syntax.string.hex}" + "{syntax.string.hex}" @@ -886,7 +886,7 @@ a { settings foreground - #"{syntax.tag.hex}" + "{syntax.tag.hex}" @@ -897,7 +897,7 @@ a { settings foreground - #"{syntax.error.hex}" + "{syntax.error.hex}" @@ -908,7 +908,7 @@ a { settings foreground - #"{syntax.comment.hex}" + "{common.ui.fade30.hex}" @@ -919,7 +919,7 @@ a { settings foreground - #"{syntax.comment.hex}" + "{common.ui.fade30.hex}" @@ -941,7 +941,7 @@ a { settings background - #"{syntax.tag.hex}" + "{syntax.tag.hex}" foreground #FFFFFF @@ -954,7 +954,7 @@ a { settings background - #"{syntax.string.hex}" + "{syntax.string.hex}" foreground #FFFFFF @@ -967,7 +967,7 @@ a { settings background - #"{syntax.keyword.hex}" + "{syntax.keyword.hex}" foreground #FFFFFF @@ -980,7 +980,7 @@ a { settings background - #"{syntax.markup.hex}" + "{syntax.markup.hex}" foreground #FFFFFF @@ -993,7 +993,7 @@ a { settings foreground - #"{syntax.tag.hex}" + "{syntax.tag.hex}" @@ -1015,7 +1015,7 @@ a { settings foreground - #"{syntax.error.hex}" + "{syntax.error.hex}" diff --git a/src/templates/sublime.syntax.yml b/src/templates/sublime.syntax.yml index c4423c0a..6ef96ee8 100644 --- a/src/templates/sublime.syntax.yml +++ b/src/templates/sublime.syntax.yml @@ -13,28 +13,28 @@ semanticClass: ayu."{theme}" settings: - settings: - activeGuide: '#"{syntax.active_guide.hex}"' - background: &bg '#"{common.bg.hex}"' + background: &bg '"{common.bg.hex}"' inactiveBackground: *bg - caret: &accent '#"{common.accent.hex}"' - findHighlight: &constant '#"{syntax.constant.hex}"' + caret: &accent '"{common.accent.hex}"' + findHighlight: &constant '"{common.accent.hex}"' findHighlightForeground: *bg - foreground: &fg '#"{common.fg.hex}"' - guide: &gutter '#"{syntax.gutter.hex}"' + foreground: &fg '"{common.fg.hex}"' accent: *accent gutter: *bg - gutterForeground: *gutter + gutterForeground: &gutter '"{editor.gutter.hex}"' invisibles: *gutter - lineHighlight: '#"{syntax.line.hex}"' - selection: &selection '#"{syntax.selection.hex}"' - selectionBorder: *selection - inactiveSelection: '#"{syntax.selection.hex}"88' + lineHighlight: '"{editor.line.hex}"' shadow: '#00000010' - stackGuide: '#"{syntax.stack_guide.hex}"' + selection: '"{editor.selection.bg.hex}"' + selectionBorder: '"{editor.selection.border.hex}"' + inactiveSelection: '"{editor.selection.inactive.hex}"' + guide: '"{editor.guide.normal.hex}"' + activeGuide: '"{editor.guide.active.hex}"' + stackGuide: '"{editor.guide.stack.hex}"' popupCss: | html, body { - background-color: #"{ui.panel.bg.hex}"; - color: #"{common.fg.hex}"; + background-color: "{ui.panel.bg.hex}"; + color: "{common.fg.hex}"; } body { padding: 1px 3px; @@ -47,7 +47,7 @@ settings: scope: comment, punctuation.definition.comment settings: fontStyle: italic - foreground: &comment '#"{syntax.comment.hex}"' + foreground: &comment '"{syntax.comment.hex}"' - name: Variable scope: variable @@ -57,7 +57,7 @@ settings: - name: String scope: string, constant.other.symbol settings: - foreground: &string '#"{syntax.string.hex}"' + foreground: &string '"{syntax.string.hex}"' - name: Number scope: constant.numeric @@ -67,7 +67,7 @@ settings: - name: Regular Expressions and Escape Characters scope: string.regexp, constant.character.escape settings: - foreground: ®exp '#"{syntax.regexp.hex}"' + foreground: ®exp '"{syntax.regexp.hex}"' - name: Built-in constant scope: constant.language @@ -87,17 +87,17 @@ settings: - name: Keyword scope: keyword - keyword.operator, keyword.operator.word settings: - foreground: &keyword '#"{syntax.keyword.hex}"' + foreground: &keyword '"{syntax.keyword.hex}"' - name: Operators scope: keyword.operator settings: - foreground: &operator '#"{syntax.operator.hex}"' + foreground: &operator '"{syntax.operator.hex}"' - name: Punctuation scope: punctuation.separator, punctuation.terminator settings: - foreground: '#"{common.fg.hex}"CC' + foreground: '"{common.fg.hex}"CC' - name: Punctuation scope: punctuation.section @@ -112,13 +112,13 @@ settings: - name: Annotation Punctuation scope: punctuation.definition.annotation settings: - foreground: '#"{common.fg.hex}"CC' + foreground: '"{common.fg.hex}"CC' - name: JavaScript Dollar scope: variable.other.dollar.only.js, variable.other.object.dollar.only.js, variable.type.dollar.only.js, support.class.dollar.only.js settings: - foreground: &special '#"{syntax.special.hex}"' + foreground: &special '"{syntax.special.hex}"' - name: Storage scope: storage @@ -133,12 +133,12 @@ settings: - name: Function name scope: entity.name.function settings: - foreground: &function '#"{syntax.func.hex}"' + foreground: &function '"{syntax.func.hex}"' - name: Entity name scope: entity.name - (entity.name.section | entity.name.tag | entity.name.label) settings: - foreground: &entity '#"{syntax.entity.hex}"' + foreground: &entity '"{syntax.entity.hex}"' - name: Inherited class scope: entity.other.inherited-class @@ -155,7 +155,7 @@ settings: scope: variable.language settings: fontStyle: italic - foreground: &tag '#"{syntax.tag.hex}"' + foreground: &tag '"{syntax.tag.hex}"' - name: Tag scope: entity.name.tag, meta.tag.sgml @@ -165,7 +165,7 @@ settings: - name: Tag start/end scope: punctuation.definition.tag.end, punctuation.definition.tag.begin, punctuation.definition.tag settings: - foreground: '#"{syntax.tag.hex}"90' # opacity of tag verson of &tag_punctag + foreground: '"{syntax.tag.hex}"90' # opacity of tag verson of &tag_punctag - name: Tag attribute scope: entity.other.attribute-name @@ -180,7 +180,7 @@ settings: - name: Library function scope: support.function, support.macro settings: - foreground: &markup '#"{syntax.markup.hex}"' + foreground: &markup '"{syntax.markup.hex}"' - name: Library constant scope: support.constant @@ -197,7 +197,7 @@ settings: - name: Invalid scope: invalid settings: - foreground: &error '#"{syntax.error.hex}"' + foreground: &error '"{syntax.error.hex}"' - name: Invalid deprecated scope: invalid.deprecated @@ -337,17 +337,17 @@ settings: - name: Markup Code scope: markup.raw settings: - background: '#"{common.fg.hex}"07' + background: '"{common.fg.hex}"07' - name: Markup Code Inline scope: markup.raw.inline settings: - background: '#"{common.fg.hex}"10' + background: '"{common.fg.hex}"10' - name: Markdown Separator scope: meta.separator settings: - background: '#"{common.fg.hex}"10' + background: '"{common.fg.hex}"10' fontStyle: bold foreground: *comment @@ -375,7 +375,7 @@ settings: - name: Markup Deleted scope: markup.deleted settings: - foreground: *error + foreground: *markup - name: Markup Strike scope: markup.strike @@ -385,7 +385,7 @@ settings: - name: Markup Table scope: markup.table settings: - background: '#"{common.fg.hex}"10' + background: '"{common.fg.hex}"10' foreground: *tag - name: Markup Raw Inline @@ -401,13 +401,13 @@ settings: - name: Markdown - Raw Block Fenced scope: markup.raw.block.fenced.markdown settings: - background: '#"{common.fg.hex}"10' + background: '"{common.fg.hex}"10' foreground: *fg - name: Markdown - Fenced Bode Block scope: punctuation.definition.fenced.markdown, variable.language.fenced.markdown settings: - background: '#"{common.fg.hex}"10' + background: '"{common.fg.hex}"10' foreground: *comment - name: Markdown - Fenced Language @@ -434,12 +434,12 @@ settings: - name: GitGutter Ignored scope: markup.ignored.git_gutter settings: - foreground: *comment + foreground: '"{common.ui.fade30.hex}"' - name: GitGutter Untracked scope: markup.untracked.git_gutter settings: - foreground: *comment + foreground: '"{common.ui.fade30.hex}"' - name: GutterColor scope: gutter_color diff --git a/src/templates/sublime.ui.json b/src/templates/sublime.ui.json index 61f81395..45170fed 100644 --- a/src/templates/sublime.ui.json +++ b/src/templates/sublime.ui.json @@ -8,9 +8,9 @@ */ { - "class" : "sheet_container_control", - "layer0.tint" : ["{common.bg.rgb}"], - "layer0.opacity" : 1 + "class": "sheet_container_control", + "layer0.tint": ["{common.bg.rgb}"], + "layer0.opacity": 1 }, @@ -21,7 +21,7 @@ { "class": "grid_layout_control", "border_size": 0, - "border_color": ["{ui.grid_divider.rgb}"] + "border_color": ["{ui.separator.rgb}"] }, { "class": "grid_layout_control", @@ -60,7 +60,7 @@ "layer0.texture": "ayu/assets/unfold.png", "layer0.opacity": 1.0, "layer0.inner_margin": 0, - "layer0.tint": ["{ui.fg.rgb}"], + "layer0.tint": ["{common.ui.rgb}"], "content_margin": [8, 6, 8, 6] }, @@ -96,7 +96,7 @@ { "class": "auto_complete_label", - "fg": ["{ui.fg.rgb}"], + "fg": ["{common.ui.rgb}"], "match_fg": ["{common.accent.rgb}"], "selected_fg": ["{common.fg.rgb}"], "selected_match_fg": ["{common.accent.rgb}"], @@ -105,7 +105,7 @@ { "class": "table_row", - "layer0.tint": ["{ui.panel.row_bg.rgb}"], + "layer0.tint": ["{ui.panel.row.rgb}"], "layer0.opacity": 0.0 }, @@ -129,8 +129,7 @@ { "class": "tool_tip_label_control", - "color": ["{ui.fg.rgb}"], - "font.face": "Roboto mono", + "color": ["{common.ui.rgb}"], "font.size": 13 }, { @@ -140,8 +139,8 @@ }, { "class": "tool_tip_label_control", - "settings": ["ui_font_default"], - "font.face": "" + "settings": ["ui_font_roboto_mono"], + "font.face": "Roboto mono" }, /* OVERLAY PANELS @@ -152,21 +151,21 @@ { "class": "overlay_control", "layer0.texture": "ayu/assets/overlay-shadow.png", - "layer0.inner_margin": [25, 45, 25, 35], - "layer0.opacity": 1.0, + "layer0.inner_margin": [15, 35, 15, 25], + "layer0.opacity": 0.6, "layer0.tint": ["{ui.panel.shadow.rgb}"], "layer1.texture": "ayu/assets/overlay-border.png", - "layer1.inner_margin": [25, 45, 25, 35], + "layer1.inner_margin": [15, 35, 15, 25], "layer1.opacity": 1.0, - "layer1.tint": ["{common.fg.rgb}", 30], + "layer1.tint": ["{ui.panel.border.rgb}"], "layer2.texture": "ayu/assets/overlay-bg.png", - "layer2.inner_margin": [25, 45, 25, 35], + "layer2.inner_margin": [15, 35, 15, 25], "layer2.opacity": 1.0, "layer2.tint": ["{ui.panel.bg.rgb}"], - "content_margin": [20, 45, 20, 35] + "content_margin": [10, 35, 10, 20] }, // Command Panel list item style (cmd + shift + p) @@ -183,7 +182,7 @@ { "class": "mini_quick_panel_row", "attributes": ["selected"], - "layer0.tint": ["{ui.panel.row_bg.rgb}"] + "layer0.tint": ["{ui.panel.row.rgb}"] }, // Quick panel project setting (project manager) (cmd + ctrl + p) @@ -215,79 +214,72 @@ }, // Quick panel (project) style inside overlay_control (cmd + shift + p) - { "class": "quick_panel", "parents": [{"class": "overlay_control"}], - "row_padding": [20, 5], + "row_padding": [24, 8], "layer0.tint": ["{ui.panel.bg.rgb}"], "layer0.opacity": 1.0 }, // Quick Panel selected list item style - { "class": "quick_panel_row", "attributes": ["selected"], - "layer0.tint": ["{ui.panel.row_bg.rgb}"] + "layer0.tint": ["{ui.panel.row.rgb}"] }, // Panel labels - { "class": "quick_panel_label", - "fg": ["{ui.fg.rgb}"], + "fg": ["{common.ui.rgb}"], + "font.bold": false, "match_fg": ["{common.accent.rgb}"], "selected_fg": ["{common.fg.rgb}"], "selected_match_fg": ["{common.accent.rgb}"] }, // Panel labels - { "class": "quick_panel_label", "parents": [{"class": "overlay_control"}], - "fg": ["{ui.fg.rgb}"], + "fg": ["{common.ui.rgb}"], "match_fg": ["{common.accent.rgb}"], "selected_fg": ["{common.fg.rgb}"], "selected_match_fg": ["{common.accent.rgb}"] }, // Panels sublabels - { "class": "quick_panel_path_label", - "fg": ["{ui.panel.path_fg.rgb}"], - "match_fg": ["{common.fg.rgb}"], - "selected_fg": ["{ui.fg.rgb}"], - "selected_match_fg": ["{common.fg.rgb}"] + "fg": ["{common.ui.fade70.rgb}"], + "match_fg": ["{common.fg.fade80.rgb}"], + "selected_fg": ["{common.ui.fade70.rgb}"], + "selected_match_fg": ["{common.fg.fade80.rgb}"] }, // Panels data / score - { "class": "quick_panel_score_label", - "fg": ["{ui.fg.rgb}"], - "selected_fg": ["{ui.fg.rgb}"] + "fg": ["{common.ui.rgb}"], + "selected_fg": ["{common.accent.rgb}"] }, - /* TABS * Tabs settings and behavioring */ - { "class": "tabset_control", "mouse_wheel_switch": false, "tab_min_width": 50, "tab_overlap": 0, - "tab_height": 30, + "tab_height": 36, "tab_width": 50, "layer0.tint": ["{common.bg.rgb}"], "layer0.opacity": 1.0, - "content_margin": [0, 0] // <<<<<<<<<<<<< + "content_margin": [10, 0] }, { "class": "tabset_control", @@ -300,7 +292,7 @@ "content_margin": [0, 0, 0, 0], "layer1.opacity": "{ui.opacity}", "layer1.texture": "ayu/assets/separator-bottom.png", - "layer1.tint": ["{ui.fg.rgb}"], + "layer1.tint": ["{ui.separator.rgb}"], "layer1.inner_margin": [1, 0, 1, 2] }, { @@ -309,103 +301,96 @@ "settings": ["ui_separator", "!ui_native_titlebar"], "layer2.opacity": "{ui.opacity}", "layer2.texture": "ayu/assets/separator-top.png", - "layer2.tint": ["{ui.fg.rgb}"], + "layer2.tint": ["{ui.separator.rgb}"], "layer2.inner_margin": [1, 2, 1, 0] }, - { - "class": "tabset_control", - "settings": ["ui_big_tabs"], - "tab_height": 40 - }, - // Tabs { "class": "tab_control", - - "layer0.tint": ["{common.bg.rgb}", 0], + // Background + "layer0.tint": ["{common.bg.rgb}"], "layer0.opacity": 1.0, - "layer1.texture": "", + // Top + "layer1.texture": "ayu/assets/separator-top.png", + "layer1.tint": ["{ui.separator.rgb}"], + "layer1.inner_margin": [0, 1, 0, 0], + "layer1.opacity": 0.0, - "layer2.texture": "ayu/assets/separator-bottom.png", - "layer2.tint": ["{common.accent.rgb}"], - "layer2.inner_margin": [1, 0, 1, 2], + // Right + "layer2.texture": "ayu/assets/separator-right.png", + "layer2.tint": ["{ui.separator.rgb}"], + "layer2.inner_margin": [0, 0, 1, 0], "layer2.opacity": 0.0, - "layer3.texture": "", + // Bottom + "layer3.texture": "ayu/assets/separator-bottom.png", + "layer3.tint": ["{ui.separator.rgb}"], + "layer3.inner_margin": [0, 0, 0, 1], + "layer3.opacity": 0.0, - "content_margin": [10, -2, 10, 0], + "content_margin": [15, -2, 15, 0], "max_margin_trim": 12 }, { "class": "tab_control", "settings": ["ui_separator"], - "layer1.texture": "ayu/assets/separator-right.png", - "layer1.tint": ["{ui.fg.rgb}"], - "layer1.inner_margin": [0, 1, 2, 1], - "layer1.opacity": "{ui.opacity}", + "layer1.opacity": 1.0, - "layer3.texture": "ayu/assets/separator-bottom.png", - "layer3.tint": ["{ui.fg.rgb}"], - "layer3.inner_margin": [1, 0, 1, 2], - "layer3.opacity": "{ui.opacity}" - }, - { - "class": "tab_control", - "settings": ["ui_big_tabs"], - "content_margin": [15, -2, 15, 0] + "layer2.opacity": 1.0, + + "layer3.opacity": 1.0 }, // Selected current tab - { "class": "tab_control", "attributes": ["selected"], - "layer2.opacity": 1.0, - "layer3.opacity": 0.0 + "settings": ["!ui_separator"], + "layer3.tint": ["{common.accent.rgb}"], + "layer3.opacity": 1.0 }, { "class": "tab_control", "attributes": ["selected"], "settings": ["ui_separator"], - "layer0.tint": ["{ui.fg.rgb}", 15] + "layer1.tint": ["{common.accent.rgb}"], + "layer3.opacity": 0.0 }, // Hovered current tab - { "class": "tab_control", "attributes": ["hover"], - "layer2.opacity": 0.3 + "settings": ["!ui_separator"], + "layer3.tint": ["{common.accent.rgb}"], + "layer3.opacity": 0.3 }, { "class": "tab_control", "attributes": ["hover"], "settings": ["ui_separator"], - "layer0.tint": ["{ui.fg.rgb}", 6], + "layer0.tint": ["{ui.separator.rgb}", 70], }, // Selected current tab - { "class": "tab_control", "attributes": ["selected", "hover"], - "layer2.opacity": 1.0 + "settings": ["!ui_separator"], + "layer3.opacity": 1.0 }, { "class": "tab_control", "attributes": ["selected", "hover"], "settings": ["ui_separator"], - "layer0.tint": ["{ui.fg.rgb}", 15] + "layer0.tint": ["{common.bg.rgb}"] }, // Tab Labels { "class": "tab_label", - "fg": ["{common.bg.rgb}", 0], - "shadow_color": ["{ui.fg.rgb}"], - "shadow_offset": [0, -1], + "fg": ["{common.ui.rgb}"], "font.italic": false, "font.bold": false, - "font.size": 12, - "font.face": "Roboto mono" + "font.size": 12 }, { "class": "tab_label", @@ -414,28 +399,15 @@ }, { "class": "tab_label", - "settings": ["ui_font_default"], - "font.face": "" + "settings": ["ui_font_roboto_mono"], + "font.face": "Roboto mono" }, { "class": "tab_label", "settings": ["highlight_modified_tabs"], "font.italic": true, "attributes": ["dirty"], - "shadow_color": ["{common.accent.rgb}"] - }, - { - "class": "tab_label", - "fg": ["{ui.fg.rgb}"], - "settings": ["ui_fix_tab_labels"], - "shadow_color": ["{common.bg.rgb}", 0], - "shadow_offset": [0, 0] - }, - { - "class": "tab_label", - "fg": ["{common.accent.rgb}"], - "attributes": ["dirty"], - "settings": ["ui_fix_tab_labels", "highlight_modified_tabs"] + "fg": ["{common.accent.rgb}"] }, // Tab selected label color @@ -443,17 +415,7 @@ { "class": "tab_label", "parents": [{"class": "tab_control", "attributes": ["selected"]}], - "fg": ["{common.bg.rgb}", 0], - "shadow_color": ["{common.fg.rgb}"], - "shadow_offset": [0, -1], - }, - { - "class": "tab_label", - "settings": ["ui_fix_tab_labels"], - "parents": [{"class": "tab_control", "attributes": ["selected"]}], - "fg": ["{common.fg.rgb}"], - "shadow_color": ["{common.bg.rgb}", 0], - "shadow_offset": [0, 0] + "fg": ["{common.fg.rgb}"] }, { @@ -469,12 +431,12 @@ // Close Icon "layer0.texture": "ayu/assets/close.png", - "layer0.tint": ["{ui.fg.rgb}"], + "layer0.tint": ["{common.ui.rgb}"], "layer0.opacity": 1.0, // Dirty Icon "layer1.texture": "ayu/assets/dirty.png", - "layer1.tint": ["{ui.fg.rgb}"], + "layer1.tint": ["{common.ui.rgb}"], "layer1.opacity": 0, }, @@ -482,7 +444,7 @@ { "class": "tab_close_button", "settings": ["show_tab_close_buttons"], - "content_margin": [8, 8] + "content_margin": [6, 8] }, // Default hover @@ -499,7 +461,7 @@ "parents": [{"class": "tab_control", "attributes": ["dirty"]}], "layer0.opacity": 0, // Close Icon "layer1.opacity": 1.0, // dirty Icon - "content_margin": [8, 8] + "content_margin": [6, 8] }, // Dirty tab on hover @@ -534,7 +496,7 @@ "class": "scroll_tabs_left_button", "content_margin": [12, 15], "layer0.texture": "ayu/assets/arrow-left.png", - "layer0.tint": ["{ui.folder.normal.rgb}"], + "layer0.tint": ["{ui.icon.rgb}"], "layer0.opacity": 1.0 }, @@ -548,16 +510,16 @@ "class": "scroll_tabs_right_button", "content_margin": [12, 15], "layer0.texture": "ayu/assets/arrow-right.png", - "layer0.tint": ["{ui.folder.normal.rgb}"], + "layer0.tint": ["{ui.icon.rgb}"], "layer0.opacity": 1.0 }, { "class": "scroll_tabs_right_button", "settings": ["ui_separator"], "layer2.texture": "ayu/assets/separator-right.png", - "layer2.tint": ["{ui.fg.rgb}"], + "layer2.tint": ["{ui.separator.rgb}"], "layer2.opacity": "{ui.opacity}", - "layer2.inner_margin" : [0, 1, 2, 1] + "layer2.inner_margin": [0, 1, 2, 1] }, { @@ -570,7 +532,7 @@ "class": "show_tabs_dropdown_button", "content_margin": [12, 12], "layer0.texture": "ayu/assets/overflow-menu.png", - "layer0.tint": ["{ui.folder.normal.rgb}"], + "layer0.tint": ["{ui.icon.rgb}"], "layer0.opacity": 1.0, "layer0.inner_margin": [0, 0] }, @@ -588,7 +550,7 @@ { "class": "sidebar_container", - "content_margin": [0, 4, 0, 0], + "content_margin": [0, 6, 0, 0], "layer0.opacity": 1, "layer0.tint": ["{common.bg.rgb}"] }, @@ -598,31 +560,22 @@ "layer1.texture": "ayu/assets/separator-right.png", "layer1.inner_margin": [0, 1, 2, 1], "layer1.opacity": "{ui.opacity}", - "layer1.tint": ["{ui.fg.rgb}"] - }, - { - "class": "sidebar_container", - "platforms": ["osx"], - "settings": ["ui_separator", "!ui_native_titlebar"], - "layer2.opacity": "{ui.opacity}", - "layer2.texture": "ayu/assets/separator-top.png", - "layer2.tint": ["{ui.fg.rgb}"], - "layer2.inner_margin": [1, 2, 1, 0] + "layer1.tint": ["{ui.separator.rgb}"], }, + { "class": "sidebar_tree", "indent_top_level": false, "row_padding": [20, 6], "dark_content": false, "spacer_rows": true, - "indent_offset": 0, - "indent": 12 + "indent_offset": 2, + "indent": 10 }, { "class": "sidebar_heading", - "color": ["{ui.fg.rgb}"], - "font.face": "Roboto mono", + "color": ["{common.ui.fade60.rgb}"], "font.bold": true, "font.size": 11 }, @@ -633,34 +586,33 @@ }, { "class": "sidebar_heading", - "settings": ["ui_font_default"], - "font.face": "" + "settings": ["ui_font_roboto_mono"], + "font.face": "Roboto mono" }, { "class": "tree_row", - "layer1.texture": "ayu/assets/tree-highlight.png", - "layer1.tint": ["{ui.fg.rgb}", 50], - "layer1.inner_margin": [8, 4, 8, 4], - "layer1.opacity": 0 + "layer0.texture": "ayu/assets/tree-highlight.png", + "layer0.tint": ["{ui.separator.rgb}"], + "layer0.inner_margin": [8, 4, 8, 4], + "layer0.opacity": 0 }, { "class": "tree_row", - "layer1.texture": "ayu/assets/tree-highlight-separators.png", + "layer0.texture": "ayu/assets/tree-highlight-separators.png", "settings": ["ui_separator"] }, { "class": "tree_row", "attributes": ["selected"], - "layer1.opacity": 1 + "layer0.opacity": 1 }, { "class": "sidebar_label", - "color": ["{ui.fg.rgb}"], - "font.face": "Roboto mono", + "color": ["{common.ui.rgb}"], "font.size": 12 }, { @@ -670,8 +622,8 @@ }, { "class": "sidebar_label", - "settings": ["ui_font_default"], - "font.face": "" + "settings": ["ui_font_roboto_mono"], + "font.face": "Roboto mono" }, { @@ -689,7 +641,7 @@ { "class": "sidebar_label", "parents": [{"class": "tree_row","attributes": ["expandable"]}], - "color": ["{ui.fg.rgb}"], + "color": ["{common.ui.rgb}"], "font.bold": false }, @@ -745,7 +697,7 @@ "layer0.opacity": 0, "layer1.texture": "ayu/assets/folder.png", - "layer1.tint": ["{ui.folder.normal.rgb}"], + "layer1.tint": ["{ui.icon.rgb}"], "layer1.opacity": 1, "layer2.texture": "ayu/assets/folder-open.png", @@ -829,11 +781,11 @@ "class": "icon_folder_dup", "content_margin": [9, 9], "layer0.texture": "ayu/assets/folder.png", - "layer0.tint": ["{ui.folder.normal.rgb}"], + "layer0.tint": ["{ui.icon.rgb}"], "layer0.opacity": 1.0, "layer1.texture": "ayu/assets/folder-symlink.png", - "layer1.tint": ["{ui.fg.rgb}"], + "layer1.tint": ["{common.ui.rgb}"], "layer1.opacity": 0.3 }, @@ -859,13 +811,13 @@ // Opened files { "class": "close_button", - "content_margin": [8, 8], + "content_margin": [6, 8], // Default Close icon "layer0.texture": "ayu/assets/close.png", "layer0.opacity": 0, "layer0.inner_margin": [0, 0], - "layer0.tint": ["{ui.fg.rgb}"] + "layer0.tint": ["{common.ui.rgb}"] }, @@ -874,15 +826,14 @@ { "class": "close_button", "parents": [{ "class": "tree_row", "attributes": ["hover"] }], - // Default Close icon - "layer0.opacity": 0.6 + "layer0.opacity": 1 }, { "class": "close_button", "attributes": ["dirty"], "layer0.texture": "ayu/assets/dirty.png", - "layer0.tint": ["{ui.fg.rgb}"], + "layer0.tint": ["{common.ui.rgb}"], "layer0.opacity": 1.0 }, @@ -903,7 +854,7 @@ "layer0.opacity": 1.0, "layer1.texture": "ayu/assets/scrollbar-vertical-wide.png", - "layer1.tint": ["{ui.fg.rgb}"], + "layer1.tint": ["{common.ui.rgb}"], "layer1.opacity": 0.1, "layer1.inner_margin": [0, 10], "blur": false @@ -929,7 +880,7 @@ { "class": "puck_control", "layer0.texture": "ayu/assets/scrollbar-vertical-wide.png", - "layer0.tint": ["{ui.fg.rgb}"], + "layer0.tint": ["{common.ui.rgb}"], "layer0.opacity": 0.3, "layer0.inner_margin": [0, 10], "content_margin": [6, 12], @@ -1017,14 +968,14 @@ { "class": "minimap_control", "settings": ["always_show_minimap_viewport"], - "viewport_color": ["{ui.minimap}"], - "viewport_opacity": "{ui.opacity}" + "viewport_color": ["{ui.minimap.rgb}"], + "viewport_opacity": 0.2 }, { "class": "minimap_control", "settings": ["!always_show_minimap_viewport"], - "viewport_color": ["{ui.minimap}"], + "viewport_color": ["{ui.minimap.rgb}"], "viewport_opacity": { "target": 0, "speed": 4.0, "interpolation": "smoothstep" } }, @@ -1044,11 +995,10 @@ { "class": "label_control", - "color": ["{ui.fg.rgb}"], + "color": ["{common.ui.rgb}"], "shadow_color": [0, 0, 0, 0], "shadow_offset": [0, 0], "font.bold": false, - "font.face": "Roboto mono", "font.size": 12 }, { @@ -1058,8 +1008,8 @@ }, { "class": "label_control", - "settings": ["ui_font_default"], - "font.face": "" + "settings": ["ui_font_roboto_mono"], + "font.face": "Roboto mono" }, // Status bar labels @@ -1067,7 +1017,7 @@ { "class": "label_control", "parents": [{"class": "status_bar"}], - "color": ["{ui.fg.rgb}"], + "color": ["{common.ui.rgb}"], "font.bold": false }, @@ -1079,13 +1029,14 @@ "layer0.tint": ["{common.bg.rgb}"], "layer0.opacity": 1, "layer1.texture": "ayu/assets/separator-top.png", + "layer1.tint": ["{ui.separator.rgb}"], "layer1.inner_margin": [1, 2, 1, 0], - "content_margin": [10, 0] + "content_margin": [16, 3] }, { "class": "status_bar", "settings": ["ui_separator"], - "layer0.tint": ["{ui.panel.bg.rgb}"] + // "layer0.tint": ["{ui.panel.bg.rgb}"], // "layer1.opacity": "{ui.opacity}" }, @@ -1102,7 +1053,7 @@ { "class": "panel_button_control", "layer0.texture": "ayu/assets/switch-panel.png", - "layer0.tint": ["{ui.fg.rgb}"], + "layer0.tint": ["{common.ui.rgb}"], "layer0.opacity": 1.0 }, @@ -1127,9 +1078,9 @@ { "class": "panel_control", "settings": ["ui_separator"], - "layer0.tint": ["{ui.panel.bg.rgb}"], + // "layer0.tint": ["{ui.panel.bg.rgb}"], "layer1.texture": "ayu/assets/separator-top.png", - "layer1.tint": ["{ui.fg.rgb}"], + "layer1.tint": ["{ui.separator.rgb}"], "layer1.inner_margin": [1, 2, 1, 0], "layer1.opacity": "{ui.opacity}" }, @@ -1140,7 +1091,7 @@ "class": "panel_close_button", "layer0.texture": "ayu/assets/close.png", "layer0.opacity": 1.0, - "layer0.tint": ["{ui.fg.rgb}"], + "layer0.tint": ["{common.ui.rgb}"], "content_margin": [0, 0] // 8,8 to show }, { @@ -1161,7 +1112,7 @@ "layer1.texture": "ayu/assets/input-border.png", "layer1.opacity": "{ui.opacity}", "layer1.inner_margin": [10, 8], - "layer1.tint": ["{ui.fg.rgb}"], + "layer1.tint": ["{ui.separator.rgb}"], "content_margin": [10, 7, 10, 5] }, @@ -1175,9 +1126,9 @@ "layer0.opacity": 0, "layer1.texture": "ayu/assets/input-search.png", "layer1.opacity": 1, - "layer1.tint": ["{common.accent.rgb}"], - "layer1.inner_margin": [35, 0, 0, 0], - "content_margin": [43, 7, 10, 4] + "layer1.tint": ["{common.ui.rgb}", 100], + "layer1.inner_margin": [60, 0, 0, 0], + "content_margin": [50, 7, 10, 4] }, // Textline input oveflow menu @@ -1185,7 +1136,7 @@ "class": "dropdown_button_control", "content_margin": [12, 12], "layer0.texture": "ayu/assets/overflow-menu.png", - "layer0.tint": ["{ui.folder.normal.rgb}"], + "layer0.tint": ["{ui.icon.rgb}"], "layer0.opacity": 1.0 }, { @@ -1220,7 +1171,7 @@ { "class": "label_control", "parents": [{"class": "button_control"}], - "color": ["{ui.fg.rgb}"] + "color": ["{common.ui.rgb}"] }, { @@ -1247,7 +1198,7 @@ { "class": "icon_regex", "layer0.texture": "ayu/assets/regex.png", - "layer0.tint": ["{ui.fg.rgb}"], + "layer0.tint": ["{common.ui.rgb}"], "layer0.opacity": 1.0, "content_margin": [12, 12] }, @@ -1263,7 +1214,7 @@ { "class": "icon_case", "layer0.texture": "ayu/assets/matchcase.png", - "layer0.tint": ["{ui.fg.rgb}"], + "layer0.tint": ["{common.ui.rgb}"], "layer0.opacity": 1.0, "content_margin": [12, 12] }, @@ -1279,7 +1230,7 @@ { "class": "icon_whole_word", "layer0.texture": "ayu/assets/word.png", - "layer0.tint": ["{ui.fg.rgb}"], + "layer0.tint": ["{common.ui.rgb}"], "layer0.opacity": 1.0, "content_margin": [12, 12] }, @@ -1295,7 +1246,7 @@ { "class": "icon_wrap", "layer0.texture": "ayu/assets/wrap.png", - "layer0.tint": ["{ui.fg.rgb}"], + "layer0.tint": ["{common.ui.rgb}"], "layer0.opacity": 1.0, "content_margin": [12, 12] }, @@ -1311,7 +1262,7 @@ { "class": "icon_in_selection", "layer0.texture": "ayu/assets/inselection.png", - "layer0.tint": ["{ui.fg.rgb}"], + "layer0.tint": ["{common.ui.rgb}"], "layer0.opacity": 1.0, "content_margin": [12, 12] }, @@ -1327,7 +1278,7 @@ { "class": "icon_highlight", "layer0.texture": "ayu/assets/highlight.png", - "layer0.tint": ["{ui.fg.rgb}"], + "layer0.tint": ["{common.ui.rgb}"], "layer0.opacity": 1.0, "content_margin": [12, 12] }, @@ -1343,7 +1294,7 @@ { "class": "icon_preserve_case", "layer0.texture": "ayu/assets/replace-preserve-case.png", - "layer0.tint": ["{ui.fg.rgb}"], + "layer0.tint": ["{common.ui.rgb}"], "layer0.opacity": 1.0, "content_margin": [12, 12] }, @@ -1359,7 +1310,7 @@ { "class": "icon_context", "layer0.texture": "ayu/assets/context.png", - "layer0.tint": ["{ui.fg.rgb}"], + "layer0.tint": ["{common.ui.rgb}"], "layer0.opacity": 1.0, "content_margin": [12, 12] }, @@ -1376,7 +1327,7 @@ { "class": "icon_use_buffer", "layer0.texture": "ayu/assets/buffer.png", - "layer0.tint": ["{ui.fg.rgb}"], + "layer0.tint": ["{common.ui.rgb}"], "layer0.opacity": 1.0, "content_margin": [12, 12] }, @@ -1392,7 +1343,7 @@ { "class": "icon_reverse", "layer0.texture": "ayu/assets/reverse.png", - "layer0.tint": ["{ui.fg.rgb}"], + "layer0.tint": ["{common.ui.rgb}"], "layer0.opacity": 1.0, "content_margin": [12, 12] }, diff --git a/src/templates/sublime2.ui.json b/src/templates/sublime2.ui.json deleted file mode 100644 index c4246098..00000000 --- a/src/templates/sublime2.ui.json +++ /dev/null @@ -1,1280 +0,0 @@ -// prefix="" -// sublime="2" -// ext="sublime-theme" -[ - - /* @ EMPTY WINDOW - * Style for empty (no tabs) window - ========================================================================= */ - - { - "class" : "sheet_container_control", - "layer0.tint" : ["{common.bg.rgb}"], - "layer0.opacity" : 1.0 - }, - - - /* @ GRID LAYOUT - * Grid style - ========================================================================= */ - - { - "class": "grid_layout_control", - "border_size": 0, - "border_color": ["{ui.grid_divider.rgb}"] - }, - { - "class": "grid_layout_control", - "settings": ["ui_separator"], - "border_size": 1 - }, - - /* @ DIALOG POPUP - * Dialog popup style and progressbar - ========================================================================= */ - // !!! - { - "class": "progress_gauge_control", - "layer0.tint": ["{common.accent.rgb}"], - "layer0.opacity": 1.0, - "content_margin": [0, 6] - }, - - { - "class": "dialog", - "layer0.tint": ["{common.bg.rgb}"], - "layer0.opacity": 1.0 - }, - - { - "class": "progress_bar_control", - "layer0.tint": ["{common.bg.rgb}"], - "layer0.opacity": 1.0 - }, - - - /* @ CODE FOLDING - * Folding arrow setting and behavioring - ========================================================================= */ - { - "class": "fold_button_control", - "layer0.texture": "ayu/assets/unfold.png", - "layer0.opacity": 1.0, - "layer0.inner_margin": 0, - "layer0.tint": ["{ui.fg.rgb}"], - "content_margin": [8, 6, 8, 6] - }, - - { - "class": "fold_button_control", - "attributes": ["hover"], - "layer0.tint": ["{common.accent.rgb}"] - }, - - { - "class": "fold_button_control", - "attributes": ["expanded"], - "layer0.texture": "ayu/assets/fold.png" - }, - - - /* @ AUTOCOMPLETE - * Autocomplete popup setting and behavioring - ========================================================================= */ - - { - "class": "popup_control", - "layer0.tint": ["{ui.panel.bg.rgb}"], - "layer0.opacity": 1.0, - "content_margin": [0, 0] - }, - - { - "class": "auto_complete", - "row_padding": [12, 6], - "layer0.tint": ["{ui.panel.bg.rgb}"], - "layer0.opacity": 1.0 - }, - - { - "class": "auto_complete_label", - "fg": ["{ui.fg.rgb}"], - "match_fg": ["{common.accent.rgb}"], - "selected_fg": ["{common.fg.rgb}"], - "selected_match_fg": ["{common.accent.rgb}"] - }, - - { - "class": "table_row", - "layer0.tint": ["{ui.panel.row_bg.rgb}"], - "layer0.opacity": 0.0 - }, - - { - "class": "table_row", - "attributes": ["selected"], - "layer0.opacity": 1.0 - }, - - - /* @ TOOLTIP - * Tooltip setting and behavioring - ========================================================================= */ - - { - "class": "tool_tip_control", - "layer0.tint": ["{common.bg.rgb}"], - "layer0.inner_margin": [0, 0], - "layer0.opacity": 1.0, - "content_margin": [10, 6] - }, - - { - "class": "tool_tip_label_control", - "color": ["{ui.fg.rgb}"], - "font.face": "Roboto mono", - "font.size": 12 - }, - { - "class": "tool_tip_label_control", - "settings": ["ui_font_source_code_pro"], - "font.face": "Source Code Pro" - }, - { - "class": "tool_tip_label_control", - "settings": ["ui_font_default"], - "font.face": "" - }, - - /* @OVERLAY PANELS - * Overlay panels setting and behavioring - ========================================================================= */ - - // Command Panel - { - "class": "overlay_control", - "layer0.texture": "ayu/assets/overlay-shadow.png", - "layer0.inner_margin": [25, 45, 25, 35], - "layer0.opacity": 1.0, - "layer0.tint": ["{ui.panel.shadow.rgb}"], - - "layer1.texture": "ayu/assets/overlay-bg.png", - "layer1.inner_margin": [25, 45, 25, 35], - "layer1.opacity": 1.0, - "layer1.tint": ["{ui.panel.bg.rgb}"], - - "content_margin": [20, 45, 20, 35] - }, - - // Command Panel list item style (cmd + shift + p) - - { - "class": "mini_quick_panel_row", - "layer0.tint": ["{common.bg.rgb}", 0], - "layer0.inner_margin": [2, 2, 2, 2], - "layer0.opacity": 1.0 - }, - - // Command Panel selected list item style (cmd + p) - - { - "class": "mini_quick_panel_row", - "attributes": ["selected"], - "layer0.tint": ["{ui.panel.row_bg.rgb}"] - }, - - // Quick panel project setting (project manager) (cmd + ctrl + p) - - { - "class": "quick_panel", - "row_padding": [32, 12], - "layer0.tint": ["{ui.panel.bg.rgb}"], - "layer0.opacity": 1.0 - }, - - // Quick Panel row default style (project manager) - - { - "class": "quick_panel_row", - "layer0.texture": "", - "layer0.tint": ["{ui.panel.bg.rgb}"], - "layer0.inner_margin": 0, - "layer0.opacity": 1.0 - }, - - // Row panel style inside comman panel (cmd + shift + p) - - { - "class": "quick_panel_row", - "parents": [{"class": "overlay_control"}], - "layer0.tint": ["{ui.panel.bg.rgb}"], - "layer0.opacity": 1.0 - }, - - // Quick panel (project) style inside overlay_control (cmd + shift + p) - - { - "class": "quick_panel", - "parents": [{"class": "overlay_control"}], - "row_padding": [10, 7], - "layer0.tint": ["{ui.panel.bg.rgb}"], - "layer0.opacity": 1.0 - }, - - // Quick Panel selected list item style - - { - "class": "quick_panel_row", - "attributes": ["selected"], - "layer0.tint": ["{ui.panel.row_bg.rgb}"] - }, - - // Panel labels - - { - "class": "quick_panel_label", - "fg": ["{ui.fg.rgb}"], - "match_fg": ["{common.accent.rgb}"], - "selected_fg": ["{common.fg.rgb}"], - "selected_match_fg": ["{common.accent.rgb}"] - }, - - // Panel labels - - { - "class": "quick_panel_label", - "parents": [{"class": "overlay_control"}], - "fg": ["{ui.fg.rgb}"], - "match_fg": ["{common.accent.rgb}"], - "selected_fg": ["{common.fg.rgb}"], - "selected_match_fg": ["{common.accent.rgb}"] - }, - - // Panels sublabels - - { - "class": "quick_panel_path_label", - "fg": ["{ui.panel.path_fg.rgb}"], - "match_fg": ["{common.fg.rgb}"], - "selected_fg": ["{ui.fg.rgb}"], - "selected_match_fg": ["{common.fg.rgb}"] - }, - - // Panels data / score - - { - "class": "quick_panel_score_label", - "fg": ["{ui.fg.rgb}"], - "selected_fg": ["{ui.fg.rgb}"] - }, - - - - /* @ TABS - * Tabs settings and behavioring - ========================================================================= */ - - { - "class": "tabset_control", - "tab_overlap": 0, - "tab_width": 50, - "tab_min_width": 50, - "tab_height": 30, - "mouse_wheel_switch": false, - - "layer0.opacity": 1.0, - "layer0.tint": ["{common.bg.rgb}"], - "content_margin": [10, 0] - }, - { - "class": "tabset_control", - "settings": ["mouse_wheel_switches_tabs", "!enable_tab_scrolling"], - "mouse_wheel_switch": true - }, - { - "class": "tabset_control", - "settings": ["ui_separator"], - "content_margin": [0, 0, 0, 0], - "layer1.opacity": "{ui.opacity}", - "layer1.texture": "ayu/assets/separator-bottom.png", - "layer1.tint": ["{ui.fg.rgb}"], - "layer1.inner_margin": [1, 0, 1, 2] - }, - { - "class": "tabset_control", - "settings": ["ui_big_tabs"], - "tab_height": 44 - }, - - // Tabs - { - "class": "tab_control", - - "layer0.tint": ["{common.bg.rgb}"], - "layer0.opacity": 1.0, - - "layer1.texture": "", - - "layer2.texture": "ayu/assets/separator-bottom.png", - "layer2.tint": ["{common.accent.rgb}"], - "layer2.inner_margin": [1, 0, 1, 2], - "layer2.opacity": 0.0, - - "layer3.texture": "", - - "content_margin": [10, -2, 10, 0], - "max_margin_trim": 12 - }, - { - "class": "tab_control", - "settings": ["ui_separator"], - - "layer1.texture": "ayu/assets/separator-right.png", - "layer1.tint": ["{ui.fg.rgb}"], - "layer1.inner_margin": [0, 1, 2, 1], - "layer1.opacity": "{ui.opacity}", - - "layer3.texture": "ayu/assets/separator-bottom.png", - "layer3.tint": ["{ui.fg.rgb}"], - "layer3.inner_margin": [1, 0, 1, 2], - "layer3.opacity": "{ui.opacity}" - }, - { - "class": "tab_control", - "settings": ["ui_big_tabs"], - "content_margin": [15, -2, 15, 0] - }, - - // Selected current tab - - { - "class": "tab_control", "attributes": ["selected"], - "layer2.opacity": 1.0, - "layer3.opacity": 0.0 - }, - - // Hovered current tab - - { - "class": "tab_control", "attributes": ["hover"], - "layer2.opacity": 0.3 - }, - - // Selected current tab - - { - "class": "tab_control", "attributes": ["selected","hover"], - "layer2.opacity": 1.0 - }, - - // Tab Labels - - { - "class": "tab_label", - "fg": ["{common.bg.rgb}", 0], - "shadow_color": ["{ui.fg.rgb}"], - "shadow_offset": [0, -1], - "font.size": 12, - "font.italic": false, - "font.bold": false, - "font.face": "Roboto mono" - }, - { - "class": "tab_label", - "settings": ["ui_font_source_code_pro"], - "font.face": "Source Code Pro" - }, - { - "class": "tab_label", - "settings": ["ui_font_default"], - "font.face": "" - }, - { - "class": "tab_label", - "fg": ["{ui.fg.rgb}"], - "settings": ["ui_fix_tab_labels"], - "shadow_color": ["{common.bg.rgb}", 0], - "shadow_offset": [0, 0] - }, - - // Tab selected label color - - { - "class": "tab_label", - "parents": [{"class": "tab_control", "attributes": ["selected"]}], - "fg": ["{common.bg.rgb}", 0], - "shadow_color": ["{common.fg.rgb}"], - "shadow_offset": [0, -1] - }, - { - "class": "tab_label", - "settings": ["ui_fix_tab_labels"], - "parents": [{"class": "tab_control", "attributes": ["selected"]}], - "fg": ["{common.fg.rgb}"], - "shadow_color": ["{common.bg.rgb}", 0], - "shadow_offset": [0, 0] - }, - - { - "class": "tab_label", - "attributes": ["transient"], - "font.italic": true - }, - - // Tab Close Buttons - { - "class": "tab_close_button", - "content_margin": [0, 0], - - // Close Icon - "layer0.texture": "ayu/assets/close.png", - "layer0.tint": ["{ui.fg.rgb}"], - "layer0.opacity": 1.0, - - // Dirty Icon - "layer1.texture": "ayu/assets/dirty.png", - "layer1.tint": ["{ui.fg.rgb}"], - "layer1.opacity": 0 - }, - - // Default - { - "class": "tab_close_button", - "settings": ["show_tab_close_buttons"], - "content_margin": [8, 8] - }, - - // Default hover - { - "class": "tab_close_button", - "settings": ["show_tab_close_buttons"], - "attributes": ["hover"], - "layer0.tint": ["{common.accent.rgb}"] - }, - - // Dirty tab - { - "class": "tab_close_button", - "parents": [{"class": "tab_control", "attributes": ["dirty"]}], - "layer0.opacity": 0, // Close Icon - "layer1.opacity": 1.0, // dirty Icon - "content_margin": [8, 8] - }, - - // Dirty tab on hover - { - "class": "tab_close_button", - "parents": [{"class": "tab_control", "attributes": ["dirty"]}], - "attributes": ["hover"], - "layer0.opacity": 1.0, // Close Icon - "layer1.opacity": 0 // Close Icon - }, - - // Selected dirty tab - { - "class": "tab_close_button", - "parents": [{"class": "tab_control", "attributes": ["selected", "dirty"]}], - "layer0.opacity": 0, // Close Icon - "layer1.opacity": 1.0, // Dirty Icon - "layer1.tint": ["{common.accent.rgb}"] - }, - - // Selected dirty tab on hover - { - "class": "tab_close_button", - "parents": [{"class": "tab_control", "attributes": ["selected", "dirty"]}], - "attributes": ["hover"], - "layer0.opacity": 1.0, - "layer1.opacity": 0 - }, - // tab set scroll left | scroll right - { - "class": "scroll_tabs_left_button", - "content_margin": [12, 15], - "layer0.texture": "ayu/assets/arrow-left.png", - "layer0.tint": ["{ui.folder.normal.rgb}"], - "layer0.opacity": 1.0 - }, - - { - "class": "scroll_tabs_left_button", - "attributes": ["hover"], - "layer0.tint": ["{common.accent.rgb}"] - }, - - { - "class": "scroll_tabs_right_button", - "content_margin": [12, 15], - "layer0.texture": "ayu/assets/arrow-right.png", - "layer0.tint": ["{ui.folder.normal.rgb}"], - "layer0.opacity": 1.0 - }, - { - "class": "scroll_tabs_right_button", - "settings": ["ui_separator"], - "layer2.texture": "ayu/assets/separator-right.png", - "layer2.tint": ["{ui.fg.rgb}"], - "layer2.opacity": "{ui.opacity}", - "layer2.inner_margin" : [0, 1, 2, 1] - }, - - { - "class": "scroll_tabs_right_button", - "attributes": ["hover"], - "layer0.tint": ["{common.accent.rgb}"] - }, - - { - "class": "show_tabs_dropdown_button", - "content_margin": [12, 12], - "layer0.texture": "ayu/assets/overflow-menu.png", - "layer0.tint": ["{ui.folder.normal.rgb}"], - "layer0.opacity": 1.0, - "layer0.inner_margin": [0, 0] - }, - - { - "class": "show_tabs_dropdown_button", - "attributes": ["hover"], - "layer0.tint": ["{common.accent.rgb}"] - }, - - - /* @ SIDEBAR - * Sidebar panel settings and behavioring - ========================================================================= */ - - { - "class": "sidebar_container", - "content_margin": [0, -20, 0, 0], - "layer0.opacity": 1, - "layer0.tint": ["{common.bg.rgb}"] - }, - { - "class": "sidebar_container", - "settings": ["ui_separator"], - "layer1.texture": "ayu/assets/separator-right.png", - "layer1.tint": ["{ui.fg.rgb}"], - "layer1.inner_margin": [0, 1, 2, 1], - "layer1.opacity": "{ui.opacity}" - }, - - { - "class": "sidebar_tree", - "row_padding": [30, 6], - "indent": 12, - "indent_offset": 0, - "indent_top_level": false, - "dark_content": true - }, - - { - "class": "sidebar_heading", - "color": ["{common.bg.rgb}"], - "font.face": "Roboto mono", - "font.bold": true, - "font.size": 11 - }, - { - "class": "sidebar_heading", - "settings": ["ui_font_source_code_pro"], - "font.face": "Source Code Pro" - }, - { - "class": "sidebar_heading", - "settings": ["ui_font_default"], - "font.face": "" - }, - - { - "class": "tree_row", - "layer1.texture": "ayu/assets/tree-highlight.png", - "layer1.opacity": { "target": 0.0, "speed": 5.0, "interpolation": "smoothstep" }, - "layer1.tint": ["{common.accent.rgb}"], - "layer1.inner_margin": [5, 0, 0, 3], - "layer0.tint": ["{ui.panel.row_bg.rgb}"], - "layer0.opacity": 0 - }, - - { - "class": "tree_row", - "attributes": ["selected"], - "layer1.opacity": { "target": 1.0, "speed": 5.0, "interpolation": "smoothstep" } - }, - - { - "class": "sidebar_label", - "color": ["{ui.fg.rgb}"], - "shadow_color": [0, 0, 0], - "shadow_offset": [0, 0], - "font.face": "Roboto mono", - "font.size": 12 - }, - { - "class": "sidebar_label", - "settings": ["ui_font_source_code_pro"], - "font.face": "Source Code Pro" - }, - { - "class": "sidebar_label", - "settings": ["ui_font_default"], - "font.face": "" - }, - - { - "class": "sidebar_label", - "parents": [{"class": "tree_row","attributes": ["hover"]}], - "color": ["{common.fg.rgb}"] - }, - - { - "class": "sidebar_label", - "parents": [{"class": "tree_row","attributes": ["selected"]}], - "color": ["{common.fg.rgb}"], - "shadow_color": [0, 0, 0], - "shadow_offset": [0, 0] - }, - - { - "class": "sidebar_label", - "parents": [{"class": "tree_row","attributes": ["expandable"]}], - "color": ["{ui.fg.rgb}"], - "font.bold": false - }, - - { - "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", "hover"]}], - "color": ["{common.fg.rgb}"] - }, - - { - "class": "sidebar_label", - "parents": [{"class": "tree_row", "attributes": ["expanded"]}], - "color": ["{common.fg.rgb}"] - }, - - { - "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": ["{common.fg.rgb}"] - // }, - - { - "class": "sidebar_label", - "attributes": ["transient"], - "font.italic": false - }, - - // Hidden arrow icon before folder - - { - "class": "disclosure_button_control", - "layer0.texture": "ayu/assets/arrow-right.png", - "layer0.tint": ["{ui.folder.normal.rgb}"], - "layer0.opacity": 1, - "layer0.inner_margin": 0, - "content_margin": [12, 15] - }, - - { - "class": "disclosure_button_control", - "parents": [{ "class": "tree_row", "attributes": ["hover"]}], - "layer0.tint": ["{common.accent.rgb}"] - }, - - { - "class": "disclosure_button_control", - "attributes": ["expanded"], - "layer0.texture": "ayu/assets/overflow-menu.png", - "content_margin": [12, 12] - }, - - { - "class": "disclosure_button_control", - "attributes": ["expanded"], - "parents": [{ "class": "tree_row", "attributes": ["hover"]}], - "layer0.tint": ["{common.accent.rgb}"] - }, - - // Opened files - { - "class": "close_button", - "content_margin": [8, 8], - - // Default Close icon - "layer0.texture": "ayu/assets/close.png", - "layer0.opacity": 0, - "layer0.inner_margin": [0, 0], - "layer0.tint": ["{ui.fg.rgb}"] - }, - - - // Opened file hover - - { - "class": "close_button", - "parents": [{ "class": "tree_row", "attributes": ["hover"] }], - // Default Close icon - "layer0.opacity": 0.6 - }, - - { - "class": "close_button", - "attributes": ["dirty"], - "layer0.texture": "ayu/assets/dirty.png", - "layer0.tint": ["{ui.fg.rgb}"], - "layer0.opacity": 1.0 - }, - - { - "class": "close_button", - "attributes": ["hover"], - "layer0.opacity": 1.0, - "layer0.tint": ["{common.accent.rgb}"] - }, - - - /* @ SCROLLBARS - * Scrollbars settings and behavioring - ========================================================================= */ - - // Normal Vertical scrollbar track - // !!! - { - "class": "scroll_bar_control", - "layer0.tint" : ["{common.bg.rgb}"], - "layer0.opacity": 1, - "layer0.inner_margin": [0, 0], - "blur": false - }, - - // Normal Vertical scrollbar track inside overlay panel - - { - "class": "scroll_bar_control", - "parents": [{"class": "overlay_control"}], - "layer0.tint": ["{common.bg.rgb}", 0], - "layer0.opacity": 1.0, - "layer0.inner_margin": [0, 2], - "blur": false - }, - - // Normal horizontal scrollbar track - - { - "class": "scroll_bar_control", - "attributes": ["horizontal"], - "layer0.texture": "", - "layer0.tint" : ["{common.bg.rgb}"], - "layer0.inner_margin": [0, 0], - "blur": false - }, - - // Normal horizontal scrollbar track inside overlay panel - // !!! - // { - // "class": "scroll_bar_control", - // "attributes": ["horizontal"], - // "parents": [{"class": "overlay_control"}], - // "layer0.tint": ["{common.bg.rgb}", 0], - // "layer0.opacity": 0.0, - // "layer0.inner_margin": [0, 2], - // "blur": false - // }, - - // Scrollbars corner - - { - "class": "scroll_corner_control", - "layer0.texture": "", - "layer0.tint":["{common.bg.rgb}"], - "layer0.inner_margin": [0, 0], - "layer0.opacity": 1, - "blur": false - }, - - // Vertical puck controller - - { - "class": "puck_control", - "layer0.texture": "", - "layer0.tint": ["{ui.scrollbar.puck.rgb}", 50], - "layer0.opacity": 1, - "layer0.inner_margin": [0, 0], - "content_margin": [1, 12], - "blur": false - }, - - // Horizontal puck controller - - { - "class": "puck_control", - "attributes": ["horizontal"], - "layer0.texture": "", - "layer0.tint": ["{ui.scrollbar.puck.rgb}", 50], - "layer0.inner_margin": [0, 0], - "content_margin": [12, 1], - "blur": false - }, - - { - "class": "scroll_area_control", - "settings": ["overlay_scroll_bars"], - "overlay": true - }, - - { - "class": "scroll_area_control", - "settings": ["!overlay_scroll_bars"], - "overlay": false // set to false for the original behavior - }, - - - { - "class": "scroll_area_control", - "parents": [{"class": "overlay_control"}], - "settings": ["overlay_scroll_bars"], - "overlay": true // set to false for the original behavior - }, - - { - "class": "scroll_area_control", - "parents": [{"class": "sidebar_container"}], - "settings": ["!overlay_scroll_bars"], - "overlay": false // set to false for the original behavior - }, - - { - "class": "scroll_bar_control", - "settings": ["overlay_scroll_bars"], - "layer0.tint": [28, 31, 38], - "layer0.inner_margin": [0, 5], - "blur": false - }, - - { - "class": "scroll_bar_control", - "settings": ["overlay_scroll_bars"], - "attributes": ["horizontal"], - "layer0.inner_margin": [5, 0], - "blur": true - }, - - - /* @ MINIMAP - * Minimap settings and behavioring - ========================================================================= */ - - { - "class": "minimap_control", - "settings": ["always_show_minimap_viewport"], - "viewport_color": ["{ui.minimap}"] - }, - - { - "class": "minimap_control", - "settings": ["!always_show_minimap_viewport"], - "viewport_color": ["{ui.minimap}", 20] - }, - - - /* @ STATUS BAR - * Status bar settings and behavioring - ========================================================================= */ - - // All labels - - { - "class": "label_control", - "color": ["{ui.fg.rgb}"], - "shadow_color": [0, 0, 0, 0], - "shadow_offset": [0, 0], - "font.bold": false, - "font.face": "Roboto mono", - "font.size": 12 - }, - { - "class": "label_control", - "settings": ["ui_font_source_code_pro"], - "font.face": "Source Code Pro" - }, - { - "class": "label_control", - "settings": ["ui_font_default"], - "font.face": "" - }, - - // Status bar labels - - { - "class": "label_control", - "parents": [{"class": "status_bar"}], - "color": ["{ui.fg.rgb}"], - "font.bold": false - }, - - // Text field labels - - { - "class": "status_bar", - "layer0.texture": "", - "layer0.tint": ["{common.bg.rgb}"], - "layer0.opacity": 1, - "layer1.texture": "ayu/assets/separator-top.png", - "layer1.inner_margin": [1, 2, 1, 0], - "content_margin": [10, 5] - }, - { - "class": "status_bar", - "settings": ["ui_separator"], - "layer0.tint": ["{ui.panel.bg.rgb}"] - // "layer1.opacity": "{ui.opacity}" - }, - - { - "class": "status_container", - "content_margin": [0, 5] - }, - - { - "class": "status_button", - "min_size": [100, 0] - }, - - - /* @ WIDGET PANEL - * Widget, input, buttons settings and behavioring - ========================================================================= */ - - - // Status bar panel - { - "class": "panel_control", - "layer0.tint": ["{common.bg.rgb}"], - "layer0.opacity": 1.0, - "content_margin": [0, 5] - }, - { - "class": "panel_control", - "settings": ["ui_separator"], - "layer0.tint": ["{ui.panel.bg.rgb}"], - "layer1.texture": "ayu/assets/separator-top.png", - "layer1.tint": ["{ui.fg.rgb}"], - "layer1.inner_margin": [1, 2, 1, 0], - "layer1.opacity": "{ui.opacity}" - }, - - // Status bar panel close icon - - { - "class": "panel_close_button", - "layer0.texture": "ayu/assets/close.png", - "layer0.opacity": 1.0, - "layer0.tint": ["{ui.fg.rgb}"], - "content_margin": [0, 0] // 8,8 to show - }, - // !!! - { - "class": "panel_close_button", - "attributes": ["hover"], - "layer0.tint": ["{common.accent.rgb}"] - }, - - // Texline input - - { - "class": "text_line_control", - "layer0.texture": "ayu/assets/input-bg.png", - "layer0.opacity": 1, - "layer0.inner_margin": [10, 8], - "layer0.tint": ["{ui.panel.bg.rgb}"], - - "layer1.texture": "ayu/assets/input-border.png", - "layer1.opacity": "{ui.opacity}", - "layer1.inner_margin": [10, 8], - "layer1.tint": ["{ui.fg.rgb}"], - "content_margin": [10, 7, 10, 5] - }, - - - // Textline input inside overlay panels - - { - "class": "text_line_control", - "parents": [{"class": "overlay_control"}], - "layer0.texture": "", - "layer0.opacity": 0, - "layer1.texture": "ayu/assets/input-search.png", - "layer1.opacity": 1, - "layer1.tint": ["{common.accent.rgb}"], - "layer1.inner_margin": [35, 0, 0, 0], - "content_margin": [43, 7, 10, 4] - }, - - // Textline input oveflow menu - { - "class": "dropdown_button_control", - "content_margin": [12, 12], - "layer0.texture": "ayu/assets/overflow-menu.png", - "layer0.tint": ["{ui.folder.normal.rgb}"], - "layer0.opacity": 1.0 - }, - { - "class": "dropdown_button_control", - "attributes": ["hover"], - "layer0.tint": ["{common.accent.rgb}"] - }, - - - /* @ BUTTONS - * Buttons panels settings and behavioring - ========================================================================= */ - - - // Button labels - - { - "class": "button_control", - "content_margin": [15, 9, 15, 10], - "min_size": [60, 0], - "layer0.tint": ["{common.accent.rgb}", 10], - "layer0.texture": "ayu/assets/input-bg.png", - "layer0.inner_margin": [10, 8], - "layer0.opacity": 0 - }, - { - "class": "button_control", - "attributes": ["hover"], - "layer0.opacity": 1 - }, - - { - "class": "label_control", - "parents": [{"class": "button_control"}], - "color": ["{ui.fg.rgb}"] - }, - - { - "class": "label_control", - "parents": [{"class": "button_control", "attributes": ["hover"]}], - "color": ["{common.accent.rgb}"] - }, - - // !!! - // Small Icon Buttons - { - "class": "icon_button_control", - "layer0.tint": [0, 0, 0], - "layer0.opacity": 0, - "layer2.tint": ["{common.fg.rgb}"], - "layer2.opacity": { "target": 0.0, "speed": 10.0, "interpolation": "smoothstep" }, - "content_margin": [10, 5] - }, - - - /* Buttons icons settings - ===================================================================== */ - - // Regex Icon - { - "class": "icon_regex", - "layer0.texture": "ayu/assets/regex.png", - "layer0.tint": ["{ui.fg.rgb}"], - "layer0.opacity": 1.0, - "content_margin": [12, 12] - }, - - { - "class": "icon_regex", - "parents": [{"class": "icon_button_control", "attributes": ["selected"]}], - "layer0.tint": ["{common.accent.rgb}"] - }, - - // Preserve case sensitive - - { - "class": "icon_case", - "layer0.texture": "ayu/assets/matchcase.png", - "layer0.tint": ["{ui.fg.rgb}"], - "layer0.opacity": 1.0, - "content_margin": [12, 12] - }, - - { - "class": "icon_case", - "parents": [{"class": "icon_button_control", "attributes": ["selected"]}], - "layer0.tint": ["{common.accent.rgb}"] - }, - - // Wholeword - - { - "class": "icon_whole_word", - "layer0.texture": "ayu/assets/word.png", - "layer0.tint": ["{ui.fg.rgb}"], - "layer0.opacity": 1.0, - "content_margin": [12, 12] - }, - - - { - "class": "icon_whole_word", - "parents": [{"class": "icon_button_control", "attributes": ["selected"]}], - "layer0.tint": ["{common.accent.rgb}"] - }, - - // Wrap - - { - "class": "icon_wrap", - "layer0.texture": "ayu/assets/wrap.png", - "layer0.tint": ["{ui.fg.rgb}"], - "layer0.opacity": 1.0, - "content_margin": [12, 12] - }, - - { - "class": "icon_wrap", - "parents": [{"class": "icon_button_control", "attributes": ["selected"]}], - "layer0.tint": ["{common.accent.rgb}"] - }, - - // In selection - - { - "class": "icon_in_selection", - "layer0.texture": "ayu/assets/inselection.png", - "layer0.tint": ["{ui.fg.rgb}"], - "layer0.opacity": 1.0, - "content_margin": [12, 12] - }, - - { - "class": "icon_in_selection", - "parents": [{"class": "icon_button_control", "attributes": ["selected"]}], - "layer0.tint": ["{common.accent.rgb}"] - }, - - // Highlight Result - - { - "class": "icon_highlight", - "layer0.texture": "ayu/assets/highlight.png", - "layer0.tint": ["{ui.fg.rgb}"], - "layer0.opacity": 1.0, - "content_margin": [12, 12] - }, - - { - "class": "icon_highlight", - "parents": [{"class": "icon_button_control", "attributes": ["selected"]}], - "layer0.tint": ["{common.accent.rgb}"] - }, - - // Preserve Case - - { - "class": "icon_preserve_case", - "layer0.texture": "ayu/assets/replace-preserve-case.png", - "layer0.tint": ["{ui.fg.rgb}"], - "layer0.opacity": 1.0, - "content_margin": [12, 12] - }, - - { - "class": "icon_preserve_case", - "parents": [{"class": "icon_button_control", "attributes": ["selected"]}], - "layer0.tint": ["{common.accent.rgb}"] - }, - - // Show context - - { - "class": "icon_context", - "layer0.texture": "ayu/assets/context.png", - "layer0.tint": ["{ui.fg.rgb}"], - "layer0.opacity": 1.0, - "content_margin": [12, 12] - }, - - - { - "class": "icon_context", - "parents": [{"class": "icon_button_control", "attributes": ["selected"]}], - "layer0.tint": ["{common.accent.rgb}"] - }, - - // Use buffer - - { - "class": "icon_use_buffer", - "layer0.texture": "ayu/assets/buffer.png", - "layer0.tint": ["{ui.fg.rgb}"], - "layer0.opacity": 1.0, - "content_margin": [12, 12] - }, - - { - "class": "icon_use_buffer", - "parents": [{"class": "icon_button_control", "attributes": ["selected"]}], - "layer0.tint": ["{common.accent.rgb}"] - }, - - // Reverse direction - - { - "class": "icon_reverse", - "layer0.texture": "ayu/assets/reverse.png", - "layer0.tint": ["{ui.fg.rgb}"], - "layer0.opacity": 1.0, - "content_margin": [12, 12] - }, - - { - "class": "icon_reverse", - "parents": [{"class": "icon_button_control", "attributes": ["selected"]}], - "layer0.tint": ["{common.accent.rgb}"] - }, - - - /* Visual settings - ===================================================================== */ - - // UI font sizees - // ============== - { - "class": "tab_label", - "settings": ["ui_font_size_small"], - "font.size": 11 - }, - { - "class": "sidebar_label", - "settings": ["ui_font_size_small"], - "font.size": 11 - }, - { - "class": "label_control", - "settings": ["ui_font_size_small"], - "font.size": 11 - }, - { - "class": "tool_tip_label_control", - "settings": ["ui_font_size_small"], - "font.size": 11 - } -] diff --git a/src/templates/sublime2.widget.json b/src/templates/sublime2.widget.json deleted file mode 100644 index 2cf9cfd3..00000000 --- a/src/templates/sublime2.widget.json +++ /dev/null @@ -1,9 +0,0 @@ -// prefix="Widget - " -// sublime="2" -// ext="sublime-settings" -{ - "color_scheme": "Packages/ayu/widgets/Widget - ayu-"{theme}".stTheme", - "draw_shadows": false, - "font_options": ["subpixel_antialias"], - "line_padding_top": 3 -} diff --git a/src/templates/widget.xml b/src/templates/widget.xml index b2325f57..7881bb3c 100644 --- a/src/templates/widget.xml +++ b/src/templates/widget.xml @@ -19,21 +19,21 @@ settings background - #"{ui.panel.bg.hex}" + "{ui.panel.bg.hex}" caret - #"{common.accent.hex}" + "{common.accent.hex}" foreground - #"{common.fg.hex}" - inactiveSelection - #"{syntax.selection.hex}"88 + "{common.fg.hex}" invisibles - #343434 + "{editor.gutter.hex}" lineHighlight - #"{syntax.line.hex}" + "{editor.line.hex}" + inactiveSelection + "{editor.selection.inactive.hex}" selection - #"{syntax.selection.hex}" + "{editor.selection.bg.hex}" selectionBorder - #"{syntax.selection.hex}" + "{editor.selection.border.hex}" @@ -46,7 +46,7 @@ fontStyle italic foreground - #"{syntax.comment.hex}" + "{syntax.comment.hex}" @@ -57,7 +57,7 @@ settings foreground - #"{syntax.keyword.hex}" + "{syntax.keyword.hex}" @@ -68,7 +68,7 @@ settings foreground - #"{syntax.constant.hex}" + "{syntax.constant.hex}" @@ -79,7 +79,7 @@ settings foreground - #"{syntax.string.hex}" + "{syntax.string.hex}" @@ -90,7 +90,7 @@ settings foreground - #"{syntax.regexp.hex}" + "{syntax.regexp.hex}" diff --git a/src/themes/color.js b/src/themes/color.js new file mode 100644 index 00000000..bdabc26f --- /dev/null +++ b/src/themes/color.js @@ -0,0 +1,47 @@ +const C = require('color') +let BASE + +class Color { + constructor(a) { this.color = a } + static from(hex) { return new Color(C('#' + hex)) } + get rgb() { return this.color.rgb().array().map(Math.round).join(', ') } + get hex() { return this.color.hex() } +} + +const parseFunction = prop => { + for (const func of ['fade', 'darken']) { + const m = prop.match(new RegExp(`(${func})(\\d{1,})`)) + if (m && m.length === 3) return [m[1], m[2]] + } +} + +const proxy = color => new Proxy(color, { + get(target, property, receiver) { + const result = Reflect.get(target, property, receiver) + if (result || typeof property !== 'string') return result + + const parsed = parseFunction(property) + if (!parsed) return + switch (parsed[0]) { + case 'fade': return fade(target, parseInt(parsed[1])) + case 'darken': return darken(target, parseInt(parsed[1])) + } + } +}) + +const fade = (color, value) => { + const level = 1 - value / 100 + const mixed = color.color.mix(BASE.color, level) + return proxy(new Color(mixed)) +} + +const darken = (color, value) => { + const darker = color.color.darken(value / 100) + return proxy(new Color(darker)) +} + +module.exports = color => proxy(Color.from(color)) +module.exports.base = color => { + BASE = Color.from(color) + return proxy(BASE) +} diff --git a/src/themes/dark.js b/src/themes/dark.js new file mode 100644 index 00000000..b67b4b95 --- /dev/null +++ b/src/themes/dark.js @@ -0,0 +1,60 @@ +const $ = require('./color') + +const common = { + accent: $`F29718`, + bg: $.base`0F1419`, + fg: $`BFBAB0`, + ui: $`475259` +} + +const syntax = { + tag: $`39BAE6`, + func: $`FFB454`, + entity: $`59C2FF`, + string: $`C2D94C`, + regexp: $`95E6CB`, + markup: $`F07178`, + keyword: $`FF7733`, + special: $`E6B673`, + comment: $`5C6773`, + constant: $`FFEE99`, + operator: $`F29668`, + error: $`FF3333` +} + +const ui = { + panel: { + bg: common.ui.fade7, + shadow: common.bg.darken30, + border: common.bg.darken80, + row: common.bg.darken20 + }, + icon: common.ui.fade55, + scrollbar: { puck: $`FFFFFF` }, + separator: common.bg.darken36, + minimap: common.bg.darken70, + opacity: 1.0 +} + +const editor = { + line: common.bg.darken30, + gutter: common.ui.fade40, + selection: { + bg: syntax.entity.fade9, + inactive: syntax.entity.fade6, + border: syntax.entity.fade13 + }, + guide: { + stack: common.ui.fade30, + active: common.ui.fade70, + normal: common.ui.fade30 + }, +} + +module.exports = { + theme: 'dark', + common, + syntax, + ui, + editor +} diff --git a/src/themes/dark.yml b/src/themes/dark.yml deleted file mode 100644 index 4d1148ef..00000000 --- a/src/themes/dark.yml +++ /dev/null @@ -1,44 +0,0 @@ -theme: dark - -common: - bg: 0F1419 - fg: E6E1CF - accent: F29718 - -ui: - fg: '515C66' - panel: - bg: 14191F - shadow: '000000' - path_fg: 42505E - row_bg: 191F26 - - folder: - normal: '3E4B59' - - scrollbar: - puck: 'FFFFFF' - - grid_divider: '1D242C' # {fg} at {opacity} - minimap: '100, 100, 100' - opacity: '0.3' - -syntax: - line: 151A1F - error: FF3333 - gutter: 35404C - selection: '253340' - stack_guide: 1A2633 - active_guide: '314559' - - tag: 39BAE6 - func: FFB454 - entity: 59C2FF - string: C2D94C - regexp: 95E6CB - markup: F07178 - keyword: FF7733 - special: E6B673 - comment: 5C6773 - constant: FFEE99 - operator: F29668 diff --git a/src/themes/light.js b/src/themes/light.js new file mode 100644 index 00000000..961f0a29 --- /dev/null +++ b/src/themes/light.js @@ -0,0 +1,60 @@ +const $ = require('./color') + +const common = { + accent: $`FF8F40`, + bg: $.base`FAFAFA`, + fg: $`61676C`, + ui: $`9DA2A6` +} + +const syntax = { + tag: $`55B4D4`, + func: $`F29718`, + entity: $`399EE6`, + string: $`86B300`, + regexp: $`4CBF99`, + markup: $`F07171`, + keyword: $`FA6E32`, + special: $`E6B673`, + comment: $`ABB0B6`, + constant: $`A37ACC`, + operator: $`ED9366`, + error: $`F51818` +} + +const ui = { + panel: { + bg: $`FFFFFF`, + shadow: common.bg.darken20, + border: common.bg.darken20, + row: common.bg.darken2 + }, + icon: common.ui.fade60, + scrollbar: { puck: $`000000` }, + separator: common.bg.darken5, + minimap: common.bg.darken10, + opacity: 1 +} + +const editor = { + line: common.bg.darken3, + gutter: common.ui.fade35, + selection: { + bg: syntax.entity.fade9, + inactive: syntax.entity.fade7, + border: syntax.entity.fade12 + }, + guide: { + stack: common.ui.fade30, + active: common.ui.fade70, + normal: common.ui.fade30 + }, +} + +module.exports = { + theme: 'light', + common, + syntax, + ui, + editor +} diff --git a/src/themes/light.yml b/src/themes/light.yml deleted file mode 100644 index fa929ac5..00000000 --- a/src/themes/light.yml +++ /dev/null @@ -1,44 +0,0 @@ -theme: light - -common: - accent: 'FF6A00' - bg: 'FAFAFA' - fg: '6E7580' - -ui: - fg: '85888C' - panel: - bg: FFFFFF - row_bg: F5F5F5 - shadow: '7E848C' - path_fg: 959CA6 - - folder: - normal: '878F99' - - scrollbar: - puck: '000000' - - grid_divider: 'E2E4E7' # {fg} at {opacity} - minimap: '130, 140, 153' - opacity: '0.2' - -syntax: - line: F2F2F2 - error: F51818 - gutter: D9D8D7 - selection: F0EEE4 - stack_guide: DEDDDC - active_guide: B3B2B1 - - tag: 55B4D4 - func: F29718 - entity: 399EE6 - string: 86B300 - regexp: 4CBF99 - markup: F07171 - keyword: FA6E32 - special: E6B673 - comment: ABB0B6 - constant: A37ACC - operator: ED9366 diff --git a/src/themes/mirage.js b/src/themes/mirage.js new file mode 100644 index 00000000..0672f8e7 --- /dev/null +++ b/src/themes/mirage.js @@ -0,0 +1,60 @@ +const $ = require('./color') + +const common = { + accent: $`FFCC66`, + bg: $.base`212733`, + fg: $`CCC9C2`, + ui: $`667380` +} + +const syntax = { + tag: $`5CCFE6`, + func: $`FFD580`, + entity: $`73D0FF`, + string: $`BAE67E`, + regexp: $`95E6CB`, + markup: $`F28779`, + keyword: $`FFA759`, + special: $`FFC44C`, + comment: $`5C6773`, + constant: $`D4BFFF`, + operator: $`F29E74`, + error: $`FF3333` +} + +const ui = { + panel: { + bg: common.ui.fade7, + shadow: common.bg.darken30, + border: common.bg.darken40, + row: common.bg.darken5 + }, + icon: common.ui.fade55, + scrollbar: { puck: $`FFFFFF` }, + separator: common.bg.darken20, + minimap: common.bg.darken40, + opacity: 1.0 +} + +const editor = { + line: common.bg.darken14, + gutter: common.ui.fade35, + selection: { + bg: syntax.entity.fade10, + inactive: syntax.entity.fade8, + border: syntax.entity.fade13 + }, + guide: { + stack: common.ui.fade30, + active: common.ui.fade70, + normal: common.ui.fade30 + }, +} + +module.exports = { + theme: 'mirage', + common, + syntax, + ui, + editor +} diff --git a/src/themes/mirage.yml b/src/themes/mirage.yml deleted file mode 100644 index 37b32a2f..00000000 --- a/src/themes/mirage.yml +++ /dev/null @@ -1,44 +0,0 @@ -theme: mirage - -common: - bg: '212733' - fg: D9D7CE - accent: FFCC66 - -ui: - fg: '738699' - panel: - bg: 272D38 - shadow: '11141A' - path_fg: '66737F' - row_bg: '303540' - - folder: - normal: '3E4B59' - - scrollbar: - puck: 'FFFFFF' - - grid_divider: '343D4A' # {fg} at {opacity} - minimap: '100, 100, 100' - opacity: '0.3' - -syntax: - line: '242B38' - error: FF3333 - gutter: '434E59' - selection: '343F4C' - stack_guide: '39434D' - active_guide: '737D87' - - tag: 5CCFE6 - func: FFD580 - entity: 73D0FF - string: BAE67E - regexp: 95E6CB - markup: F28779 - keyword: FFA759 - special: FFC44C - comment: 5C6773 - constant: D4BFFF - operator: F29E74 diff --git a/widgets/Widget - ayu-dark.stTheme b/widgets/Widget - ayu-dark.stTheme index 8ed0294f..d68383a6 100644 --- a/widgets/Widget - ayu-dark.stTheme +++ b/widgets/Widget - ayu-dark.stTheme @@ -19,21 +19,21 @@ settings background - #14191F + #13181D caret #F29718 foreground - #E6E1CF - inactiveSelection - #25334088 + #BFBAB0 invisibles - #343434 + #252D33 lineHighlight - #151A1F + #0A0E12 + inactiveSelection + #131E27 selection - #253340 + #16242E selectionBorder - #253340 + #192B37 diff --git a/widgets/Widget - ayu-light.stTheme b/widgets/Widget - ayu-light.stTheme index a8bf3424..8f8ac4cf 100644 --- a/widgets/Widget - ayu-light.stTheme +++ b/widgets/Widget - ayu-light.stTheme @@ -21,19 +21,19 @@ background #FFFFFF caret - #FF6A00 + #FF8F40 foreground - #6E7580 - inactiveSelection - #F0EEE488 + #61676C invisibles - #343434 + #D9DBDD lineHighlight - #F2F2F2 + #F3F3F3 + inactiveSelection + #ECF4F9 selection - #F0EEE4 + #E9F2F8 selectionBorder - #F0EEE4 + #E3EFF8 diff --git a/widgets/Widget - ayu-mirage.stTheme b/widgets/Widget - ayu-mirage.stTheme index 28054674..e288a1f0 100644 --- a/widgets/Widget - ayu-mirage.stTheme +++ b/widgets/Widget - ayu-mirage.stTheme @@ -19,21 +19,21 @@ settings background - #272D38 + #262C38 caret #FFCC66 foreground - #D9D7CE - inactiveSelection - #343F4C88 + #CCC9C2 invisibles - #343434 + #39424E lineHighlight - #242B38 + #1C222C + inactiveSelection + #283543 selection - #343F4C + #293847 selectionBorder - #343F4C + #2C3D4E diff --git a/yarn.lock b/yarn.lock deleted file mode 100644 index 0fc5ab85..00000000 --- a/yarn.lock +++ /dev/null @@ -1,1095 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - -ansi-regex@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" - -ansi-styles@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" - -archy@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40" - -argparse@^1.0.7: - version "1.0.9" - resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.9.tgz#73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86" - dependencies: - sprintf-js "~1.0.2" - -arr-diff@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf" - dependencies: - arr-flatten "^1.0.1" - -arr-flatten@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.0.1.tgz#e5ffe54d45e19f32f216e91eb99c8ce892bb604b" - -array-differ@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-1.0.0.tgz#eff52e3758249d33be402b8bb8e564bb2b5d4031" - -array-uniq@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6" - -array-unique@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53" - -balanced-match@^0.4.1: - version "0.4.2" - resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838" - -beeper@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/beeper/-/beeper-1.1.1.tgz#e6d5ea8c5dad001304a70b22638447f69cb2f809" - -brace-expansion@^1.0.0: - version "1.1.6" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.6.tgz#7197d7eaa9b87e648390ea61fc66c84427420df9" - dependencies: - balanced-match "^0.4.1" - concat-map "0.0.1" - -braces@^1.8.2: - version "1.8.5" - resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7" - dependencies: - expand-range "^1.8.1" - preserve "^0.2.0" - repeat-element "^1.1.2" - -buffer-shims@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/buffer-shims/-/buffer-shims-1.0.0.tgz#9978ce317388c649ad8793028c3477ef044a8b51" - -chalk@^1.0.0, chalk@^1.1.1: - version "1.1.3" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" - dependencies: - ansi-styles "^2.2.1" - escape-string-regexp "^1.0.2" - has-ansi "^2.0.0" - strip-ansi "^3.0.0" - supports-color "^2.0.0" - -clone-buffer@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58" - -clone-stats@^0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-0.0.1.tgz#b88f94a82cf38b8791d58046ea4029ad88ca99d1" - -clone-stats@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-1.0.0.tgz#b3782dff8bb5474e18b9b6bf0fdfe782f8777680" - -clone@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/clone/-/clone-0.2.0.tgz#c6126a90ad4f72dbf5acdb243cc37724fe93fc1f" - -clone@^1.0.0, clone@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.2.tgz#260b7a99ebb1edfe247538175f783243cb19d149" - -cloneable-readable@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/cloneable-readable/-/cloneable-readable-1.0.0.tgz#a6290d413f217a61232f95e458ff38418cfb0117" - dependencies: - inherits "^2.0.1" - process-nextick-args "^1.0.6" - through2 "^2.0.1" - -concat-map@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" - -core-util-is@~1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" - -dateformat@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-2.0.0.tgz#2743e3abb5c3fc2462e527dca445e04e9f4dee17" - -defaults@^1.0.0: - version "1.0.3" - resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d" - dependencies: - clone "^1.0.2" - -deprecated@^0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/deprecated/-/deprecated-0.0.1.tgz#f9c9af5464afa1e7a971458a8bdef2aa94d5bb19" - -detect-file@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-0.1.0.tgz#4935dedfd9488648e006b0129566e9386711ea63" - dependencies: - fs-exists-sync "^0.1.0" - -duplexer2@0.0.2: - version "0.0.2" - resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.0.2.tgz#c614dcf67e2fb14995a91711e5a617e8a60a31db" - dependencies: - readable-stream "~1.1.9" - -end-of-stream@~0.1.5: - version "0.1.5" - resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-0.1.5.tgz#8e177206c3c80837d85632e8b9359dfe8b2f6eaf" - dependencies: - once "~1.3.0" - -escape-string-regexp@^1.0.2: - version "1.0.5" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" - -expand-brackets@^0.1.4: - version "0.1.5" - resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b" - dependencies: - is-posix-bracket "^0.1.0" - -expand-range@^1.8.1: - version "1.8.2" - resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337" - dependencies: - fill-range "^2.1.0" - -expand-tilde@^1.2.1, expand-tilde@^1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-1.2.2.tgz#0b81eba897e5a3d31d1c3d102f8f01441e559449" - dependencies: - os-homedir "^1.0.1" - -extend@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.0.tgz#5a474353b9f3353ddd8176dfd37b91c83a46f1d4" - -extglob@^0.3.1: - version "0.3.2" - resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1" - dependencies: - is-extglob "^1.0.0" - -fancy-log@^1.1.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.0.tgz#45be17d02bb9917d60ccffd4995c999e6c8c9948" - dependencies: - chalk "^1.1.1" - time-stamp "^1.0.0" - -filename-regex@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.0.tgz#996e3e80479b98b9897f15a8a58b3d084e926775" - -fill-range@^2.1.0: - version "2.2.3" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.3.tgz#50b77dfd7e469bc7492470963699fe7a8485a723" - dependencies: - is-number "^2.1.0" - isobject "^2.0.0" - randomatic "^1.1.3" - repeat-element "^1.1.2" - repeat-string "^1.5.2" - -find-index@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/find-index/-/find-index-0.1.1.tgz#675d358b2ca3892d795a1ab47232f8b6e2e0dde4" - -findup-sync@^0.4.2: - version "0.4.3" - resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-0.4.3.tgz#40043929e7bc60adf0b7f4827c4c6e75a0deca12" - dependencies: - detect-file "^0.1.0" - is-glob "^2.0.1" - micromatch "^2.3.7" - resolve-dir "^0.1.0" - -fined@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/fined/-/fined-1.0.2.tgz#5b28424b760d7598960b7ef8480dff8ad3660e97" - dependencies: - expand-tilde "^1.2.1" - lodash.assignwith "^4.0.7" - lodash.isempty "^4.2.1" - lodash.isplainobject "^4.0.4" - lodash.isstring "^4.0.1" - lodash.pick "^4.2.1" - parse-filepath "^1.0.1" - -first-chunk-stream@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz#59bfb50cd905f60d7c394cd3d9acaab4e6ad934e" - -flagged-respawn@^0.3.2: - version "0.3.2" - resolved "https://registry.yarnpkg.com/flagged-respawn/-/flagged-respawn-0.3.2.tgz#ff191eddcd7088a675b2610fffc976be9b8074b5" - -for-in@^0.1.5: - version "0.1.6" - resolved "https://registry.yarnpkg.com/for-in/-/for-in-0.1.6.tgz#c9f96e89bfad18a545af5ec3ed352a1d9e5b4dc8" - -for-own@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.4.tgz#0149b41a39088c7515f51ebe1c1386d45f935072" - dependencies: - for-in "^0.1.5" - -fs-exists-sync@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz#982d6893af918e72d08dec9e8673ff2b5a8d6add" - -fs-jetpack@^0.10.0: - version "0.10.5" - resolved "https://registry.yarnpkg.com/fs-jetpack/-/fs-jetpack-0.10.5.tgz#c9db5a8fc2b8a2a5f02b878b52d52fa93b3ae3ec" - dependencies: - minimatch "^3.0.2" - mkdirp "^0.5.1" - q "^1.0.1" - rimraf "^2.2.8" - -fs.realpath@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" - -gaze@^0.5.1: - version "0.5.2" - resolved "https://registry.yarnpkg.com/gaze/-/gaze-0.5.2.tgz#40b709537d24d1d45767db5a908689dfe69ac44f" - dependencies: - globule "~0.1.0" - -glob-base@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4" - dependencies: - glob-parent "^2.0.0" - is-glob "^2.0.0" - -glob-parent@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28" - dependencies: - is-glob "^2.0.0" - -glob-stream@^3.1.5: - version "3.1.18" - resolved "https://registry.yarnpkg.com/glob-stream/-/glob-stream-3.1.18.tgz#9170a5f12b790306fdfe598f313f8f7954fd143b" - dependencies: - glob "^4.3.1" - glob2base "^0.0.12" - minimatch "^2.0.1" - ordered-read-streams "^0.1.0" - through2 "^0.6.1" - unique-stream "^1.0.0" - -glob-watcher@^0.0.6: - version "0.0.6" - resolved "https://registry.yarnpkg.com/glob-watcher/-/glob-watcher-0.0.6.tgz#b95b4a8df74b39c83298b0c05c978b4d9a3b710b" - dependencies: - gaze "^0.5.1" - -glob2base@^0.0.12: - version "0.0.12" - resolved "https://registry.yarnpkg.com/glob2base/-/glob2base-0.0.12.tgz#9d419b3e28f12e83a362164a277055922c9c0d56" - dependencies: - find-index "^0.1.1" - -glob@^4.3.1: - version "4.5.3" - resolved "https://registry.yarnpkg.com/glob/-/glob-4.5.3.tgz#c6cb73d3226c1efef04de3c56d012f03377ee15f" - dependencies: - inflight "^1.0.4" - inherits "2" - minimatch "^2.0.1" - once "^1.3.0" - -glob@^7.0.5: - version "7.1.1" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8" - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.2" - once "^1.3.0" - path-is-absolute "^1.0.0" - -glob@~3.1.21: - version "3.1.21" - resolved "https://registry.yarnpkg.com/glob/-/glob-3.1.21.tgz#d29e0a055dea5138f4d07ed40e8982e83c2066cd" - dependencies: - graceful-fs "~1.2.0" - inherits "1" - minimatch "~0.2.11" - -global-modules@^0.2.3: - version "0.2.3" - resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-0.2.3.tgz#ea5a3bed42c6d6ce995a4f8a1269b5dae223828d" - dependencies: - global-prefix "^0.1.4" - is-windows "^0.2.0" - -global-prefix@^0.1.4: - version "0.1.5" - resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-0.1.5.tgz#8d3bc6b8da3ca8112a160d8d496ff0462bfef78f" - dependencies: - homedir-polyfill "^1.0.0" - ini "^1.3.4" - is-windows "^0.2.0" - which "^1.2.12" - -globule@~0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/globule/-/globule-0.1.0.tgz#d9c8edde1da79d125a151b79533b978676346ae5" - dependencies: - glob "~3.1.21" - lodash "~1.0.1" - minimatch "~0.2.11" - -glogg@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/glogg/-/glogg-1.0.0.tgz#7fe0f199f57ac906cf512feead8f90ee4a284fc5" - dependencies: - sparkles "^1.0.0" - -graceful-fs@^3.0.0: - version "3.0.11" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-3.0.11.tgz#7613c778a1afea62f25c630a086d7f3acbbdd818" - dependencies: - natives "^1.1.0" - -graceful-fs@~1.2.0: - version "1.2.3" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-1.2.3.tgz#15a4806a57547cb2d2dbf27f42e89a8c3451b364" - -gulp-exec@^2.1.2: - version "2.1.3" - resolved "https://registry.yarnpkg.com/gulp-exec/-/gulp-exec-2.1.3.tgz#460a4ec8df86841d1738bc74958c68e5769342d9" - dependencies: - gulp-util "^3.0.7" - gulplog "^1.0.0" - through2 "^2.0.1" - -gulp-util@^3.0.0, gulp-util@^3.0.7: - version "3.0.8" - resolved "https://registry.yarnpkg.com/gulp-util/-/gulp-util-3.0.8.tgz#0054e1e744502e27c04c187c3ecc505dd54bbb4f" - dependencies: - array-differ "^1.0.0" - array-uniq "^1.0.2" - beeper "^1.0.0" - chalk "^1.0.0" - dateformat "^2.0.0" - fancy-log "^1.1.0" - gulplog "^1.0.0" - has-gulplog "^0.1.0" - lodash._reescape "^3.0.0" - lodash._reevaluate "^3.0.0" - lodash._reinterpolate "^3.0.0" - lodash.template "^3.0.0" - minimist "^1.1.0" - multipipe "^0.1.2" - object-assign "^3.0.0" - replace-ext "0.0.1" - through2 "^2.0.0" - vinyl "^0.5.0" - -gulp@^3.9.1: - version "3.9.1" - resolved "https://registry.yarnpkg.com/gulp/-/gulp-3.9.1.tgz#571ce45928dd40af6514fc4011866016c13845b4" - dependencies: - archy "^1.0.0" - chalk "^1.0.0" - deprecated "^0.0.1" - gulp-util "^3.0.0" - interpret "^1.0.0" - liftoff "^2.1.0" - minimist "^1.1.0" - orchestrator "^0.3.0" - pretty-hrtime "^1.0.0" - semver "^4.1.0" - tildify "^1.0.0" - v8flags "^2.0.2" - vinyl-fs "^0.3.0" - -gulplog@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/gulplog/-/gulplog-1.0.0.tgz#e28c4d45d05ecbbed818363ce8f9c5926229ffe5" - dependencies: - glogg "^1.0.0" - -has-ansi@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91" - dependencies: - ansi-regex "^2.0.0" - -has-gulplog@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/has-gulplog/-/has-gulplog-0.1.0.tgz#6414c82913697da51590397dafb12f22967811ce" - dependencies: - sparkles "^1.0.0" - -homedir-polyfill@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz#4c2bbc8a758998feebf5ed68580f76d46768b4bc" - dependencies: - parse-passwd "^1.0.0" - -inflight@^1.0.4: - version "1.0.6" - resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" - dependencies: - once "^1.3.0" - wrappy "1" - -inherits@1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-1.0.2.tgz#ca4309dadee6b54cc0b8d247e8d7c7a0975bdc9b" - -inherits@2, inherits@^2.0.1, inherits@~2.0.1: - version "2.0.3" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" - -ini@^1.3.4: - version "1.3.4" - resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.4.tgz#0537cb79daf59b59a1a517dff706c86ec039162e" - -interpret@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.1.tgz#d579fb7f693b858004947af39fa0db49f795602c" - -is-absolute@^0.2.3: - version "0.2.6" - resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-0.2.6.tgz#20de69f3db942ef2d87b9c2da36f172235b1b5eb" - dependencies: - is-relative "^0.2.1" - is-windows "^0.2.0" - -is-buffer@^1.0.2: - version "1.1.4" - resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.4.tgz#cfc86ccd5dc5a52fa80489111c6920c457e2d98b" - -is-dotfile@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.2.tgz#2c132383f39199f8edc268ca01b9b007d205cc4d" - -is-equal-shallow@^0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534" - dependencies: - is-primitive "^2.0.0" - -is-extendable@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" - -is-extglob@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0" - -is-glob@^2.0.0, is-glob@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863" - dependencies: - is-extglob "^1.0.0" - -is-number@^2.0.2, is-number@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f" - dependencies: - kind-of "^3.0.2" - -is-posix-bracket@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4" - -is-primitive@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575" - -is-relative@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-0.2.1.tgz#d27f4c7d516d175fb610db84bbeef23c3bc97aa5" - dependencies: - is-unc-path "^0.1.1" - -is-stream@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" - -is-unc-path@^0.1.1: - version "0.1.2" - resolved "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-0.1.2.tgz#6ab053a72573c10250ff416a3814c35178af39b9" - dependencies: - unc-path-regex "^0.1.0" - -is-utf8@^0.2.0: - version "0.2.1" - resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72" - -is-windows@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-0.2.0.tgz#de1aa6d63ea29dd248737b69f1ff8b8002d2108c" - -isarray@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" - -isarray@1.0.0, isarray@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" - -isexe@^1.1.1: - version "1.1.2" - resolved "https://registry.yarnpkg.com/isexe/-/isexe-1.1.2.tgz#36f3e22e60750920f5e7241a476a8c6a42275ad0" - -isobject@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89" - dependencies: - isarray "1.0.0" - -kind-of@^3.0.2: - version "3.1.0" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.1.0.tgz#475d698a5e49ff5e53d14e3e732429dc8bf4cf47" - dependencies: - is-buffer "^1.0.2" - -liftoff@^2.1.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/liftoff/-/liftoff-2.3.0.tgz#a98f2ff67183d8ba7cfaca10548bd7ff0550b385" - dependencies: - extend "^3.0.0" - findup-sync "^0.4.2" - fined "^1.0.1" - flagged-respawn "^0.3.2" - lodash.isplainobject "^4.0.4" - lodash.isstring "^4.0.1" - lodash.mapvalues "^4.4.0" - rechoir "^0.6.2" - resolve "^1.1.7" - -lodash._basecopy@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz#8da0e6a876cf344c0ad8a54882111dd3c5c7ca36" - -lodash._basetostring@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz#d1861d877f824a52f669832dcaf3ee15566a07d5" - -lodash._basevalues@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz#5b775762802bde3d3297503e26300820fdf661b7" - -lodash._getnative@^3.0.0: - version "3.9.1" - resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5" - -lodash._isiterateecall@^3.0.0: - version "3.0.9" - resolved "https://registry.yarnpkg.com/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz#5203ad7ba425fae842460e696db9cf3e6aac057c" - -lodash._reescape@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/lodash._reescape/-/lodash._reescape-3.0.0.tgz#2b1d6f5dfe07c8a355753e5f27fac7f1cde1616a" - -lodash._reevaluate@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz#58bc74c40664953ae0b124d806996daca431e2ed" - -lodash._reinterpolate@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d" - -lodash._root@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/lodash._root/-/lodash._root-3.0.1.tgz#fba1c4524c19ee9a5f8136b4609f017cf4ded692" - -lodash.assignwith@^4.0.7: - version "4.2.0" - resolved "https://registry.yarnpkg.com/lodash.assignwith/-/lodash.assignwith-4.2.0.tgz#127a97f02adc41751a954d24b0de17e100e038eb" - -lodash.escape@^3.0.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-3.2.0.tgz#995ee0dc18c1b48cc92effae71a10aab5b487698" - dependencies: - lodash._root "^3.0.0" - -lodash.isarguments@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a" - -lodash.isarray@^3.0.0: - version "3.0.4" - resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55" - -lodash.isempty@^4.2.1: - version "4.4.0" - resolved "https://registry.yarnpkg.com/lodash.isempty/-/lodash.isempty-4.4.0.tgz#6f86cbedd8be4ec987be9aaf33c9684db1b31e7e" - -lodash.isplainobject@^4.0.4: - version "4.0.6" - resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb" - -lodash.isstring@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451" - -lodash.keys@^3.0.0: - version "3.1.2" - resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a" - dependencies: - lodash._getnative "^3.0.0" - lodash.isarguments "^3.0.0" - lodash.isarray "^3.0.0" - -lodash.mapvalues@^4.4.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.mapvalues/-/lodash.mapvalues-4.6.0.tgz#1bafa5005de9dd6f4f26668c30ca37230cc9689c" - -lodash.pick@^4.2.1: - version "4.4.0" - resolved "https://registry.yarnpkg.com/lodash.pick/-/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3" - -lodash.restparam@^3.0.0: - version "3.6.1" - resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805" - -lodash.template@^3.0.0: - version "3.6.2" - resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-3.6.2.tgz#f8cdecc6169a255be9098ae8b0c53d378931d14f" - dependencies: - lodash._basecopy "^3.0.0" - lodash._basetostring "^3.0.0" - lodash._basevalues "^3.0.0" - lodash._isiterateecall "^3.0.0" - lodash._reinterpolate "^3.0.0" - lodash.escape "^3.0.0" - lodash.keys "^3.0.0" - lodash.restparam "^3.0.0" - lodash.templatesettings "^3.0.0" - -lodash.templatesettings@^3.0.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz#fb307844753b66b9f1afa54e262c745307dba8e5" - dependencies: - lodash._reinterpolate "^3.0.0" - lodash.escape "^3.0.0" - -lodash@^4.16.4: - version "4.17.4" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae" - -lodash@~1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-1.0.2.tgz#8f57560c83b59fc270bd3d561b690043430e2551" - -lru-cache@2: - version "2.7.3" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.7.3.tgz#6d4524e8b955f95d4f5b58851ce21dd72fb4e952" - -map-cache@^0.2.0: - version "0.2.2" - resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf" - -micromatch@^2.3.7: - version "2.3.11" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565" - dependencies: - arr-diff "^2.0.0" - array-unique "^0.2.1" - braces "^1.8.2" - expand-brackets "^0.1.4" - extglob "^0.3.1" - filename-regex "^2.0.0" - is-extglob "^1.0.0" - is-glob "^2.0.1" - kind-of "^3.0.2" - normalize-path "^2.0.1" - object.omit "^2.0.0" - parse-glob "^3.0.4" - regex-cache "^0.4.2" - -minimatch@^2.0.1: - version "2.0.10" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-2.0.10.tgz#8d087c39c6b38c001b97fca7ce6d0e1e80afbac7" - dependencies: - brace-expansion "^1.0.0" - -minimatch@^3.0.2: - version "3.0.3" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.3.tgz#2a4e4090b96b2db06a9d7df01055a62a77c9b774" - dependencies: - brace-expansion "^1.0.0" - -minimatch@~0.2.11: - version "0.2.14" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-0.2.14.tgz#c74e780574f63c6f9a090e90efbe6ef53a6a756a" - dependencies: - lru-cache "2" - sigmund "~1.0.0" - -minimist@0.0.8: - version "0.0.8" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" - -minimist@^1.1.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" - -mkdirp@^0.5.0, mkdirp@^0.5.1: - version "0.5.1" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" - dependencies: - minimist "0.0.8" - -multipipe@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/multipipe/-/multipipe-0.1.2.tgz#2a8f2ddf70eed564dff2d57f1e1a137d9f05078b" - dependencies: - duplexer2 "0.0.2" - -natives@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/natives/-/natives-1.1.0.tgz#e9ff841418a6b2ec7a495e939984f78f163e6e31" - -normalize-path@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.0.1.tgz#47886ac1662760d4261b7d979d241709d3ce3f7a" - -object-assign@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-3.0.0.tgz#9bedd5ca0897949bca47e7ff408062d549f587f2" - -object.omit@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa" - dependencies: - for-own "^0.1.4" - is-extendable "^0.1.1" - -once@^1.3.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" - dependencies: - wrappy "1" - -once@~1.3.0: - version "1.3.3" - resolved "https://registry.yarnpkg.com/once/-/once-1.3.3.tgz#b2e261557ce4c314ec8304f3fa82663e4297ca20" - dependencies: - wrappy "1" - -orchestrator@^0.3.0: - version "0.3.8" - resolved "https://registry.yarnpkg.com/orchestrator/-/orchestrator-0.3.8.tgz#14e7e9e2764f7315fbac184e506c7aa6df94ad7e" - dependencies: - end-of-stream "~0.1.5" - sequencify "~0.0.7" - stream-consume "~0.1.0" - -ordered-read-streams@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz#fd565a9af8eb4473ba69b6ed8a34352cb552f126" - -os-homedir@^1.0.0, os-homedir@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" - -parse-filepath@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/parse-filepath/-/parse-filepath-1.0.1.tgz#159d6155d43904d16c10ef698911da1e91969b73" - dependencies: - is-absolute "^0.2.3" - map-cache "^0.2.0" - path-root "^0.1.1" - -parse-glob@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c" - dependencies: - glob-base "^0.3.0" - is-dotfile "^1.0.0" - is-extglob "^1.0.0" - is-glob "^2.0.0" - -parse-passwd@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6" - -path-is-absolute@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" - -path-root-regex@^0.1.0: - version "0.1.2" - resolved "https://registry.yarnpkg.com/path-root-regex/-/path-root-regex-0.1.2.tgz#bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d" - -path-root@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/path-root/-/path-root-0.1.1.tgz#9a4a6814cac1c0cd73360a95f32083c8ea4745b7" - dependencies: - path-root-regex "^0.1.0" - -preserve@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b" - -pretty-hrtime@^1.0.0: - version "1.0.3" - resolved "https://registry.yarnpkg.com/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1" - -process-nextick-args@^1.0.6, process-nextick-args@~1.0.6: - version "1.0.7" - resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3" - -q@^1.0.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/q/-/q-1.4.1.tgz#55705bcd93c5f3673530c2c2cbc0c2b3addc286e" - -randomatic@^1.1.3: - version "1.1.6" - resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.6.tgz#110dcabff397e9dcff7c0789ccc0a49adf1ec5bb" - dependencies: - is-number "^2.0.2" - kind-of "^3.0.2" - -"readable-stream@>=1.0.33-1 <1.1.0-0": - version "1.0.34" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c" - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.1" - isarray "0.0.1" - string_decoder "~0.10.x" - -readable-stream@^2.1.5: - version "2.2.2" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.2.tgz#a9e6fec3c7dda85f8bb1b3ba7028604556fc825e" - dependencies: - buffer-shims "^1.0.0" - core-util-is "~1.0.0" - inherits "~2.0.1" - isarray "~1.0.0" - process-nextick-args "~1.0.6" - string_decoder "~0.10.x" - util-deprecate "~1.0.1" - -readable-stream@~1.1.9: - version "1.1.14" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9" - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.1" - isarray "0.0.1" - string_decoder "~0.10.x" - -rechoir@^0.6.2: - version "0.6.2" - resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384" - dependencies: - resolve "^1.1.6" - -regex-cache@^0.4.2: - version "0.4.3" - resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.3.tgz#9b1a6c35d4d0dfcef5711ae651e8e9d3d7114145" - dependencies: - is-equal-shallow "^0.1.3" - is-primitive "^2.0.0" - -remove-trailing-separator@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.0.1.tgz#615ebb96af559552d4bf4057c8436d486ab63cc4" - -repeat-element@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.2.tgz#ef089a178d1483baae4d93eb98b4f9e4e11d990a" - -repeat-string@^1.5.2: - version "1.6.1" - resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" - -replace-ext@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-0.0.1.tgz#29bbd92078a739f0bcce2b4ee41e837953522924" - -replace-ext@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.0.tgz#de63128373fcbf7c3ccfa4de5a480c45a67958eb" - -resolve-dir@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-0.1.1.tgz#b219259a5602fac5c5c496ad894a6e8cc430261e" - dependencies: - expand-tilde "^1.2.2" - global-modules "^0.2.3" - -resolve@^1.1.6, resolve@^1.1.7: - version "1.2.0" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.2.0.tgz#9589c3f2f6149d1417a40becc1663db6ec6bc26c" - -rimraf@^2.2.8: - version "2.5.4" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.5.4.tgz#96800093cbf1a0c86bd95b4625467535c29dfa04" - dependencies: - glob "^7.0.5" - -semver@^4.1.0: - version "4.3.6" - resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da" - -sequencify@~0.0.7: - version "0.0.7" - resolved "https://registry.yarnpkg.com/sequencify/-/sequencify-0.0.7.tgz#90cff19d02e07027fd767f5ead3e7b95d1e7380c" - -sigmund@~1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590" - -sparkles@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/sparkles/-/sparkles-1.0.0.tgz#1acbbfb592436d10bbe8f785b7cc6f82815012c3" - -sprintf-js@~1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" - -stream-consume@~0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/stream-consume/-/stream-consume-0.1.0.tgz#a41ead1a6d6081ceb79f65b061901b6d8f3d1d0f" - -string_decoder@~0.10.x: - version "0.10.31" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" - -strip-ansi@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" - dependencies: - ansi-regex "^2.0.0" - -strip-bom@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-1.0.0.tgz#85b8862f3844b5a6d5ec8467a93598173a36f794" - dependencies: - first-chunk-stream "^1.0.0" - is-utf8 "^0.2.0" - -supports-color@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" - -through2@^0.6.1: - version "0.6.5" - resolved "https://registry.yarnpkg.com/through2/-/through2-0.6.5.tgz#41ab9c67b29d57209071410e1d7a7a968cd3ad48" - dependencies: - readable-stream ">=1.0.33-1 <1.1.0-0" - xtend ">=4.0.0 <4.1.0-0" - -through2@^2.0.0, through2@^2.0.1: - version "2.0.3" - resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be" - dependencies: - readable-stream "^2.1.5" - xtend "~4.0.1" - -tildify@^1.0.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/tildify/-/tildify-1.2.0.tgz#dcec03f55dca9b7aa3e5b04f21817eb56e63588a" - dependencies: - os-homedir "^1.0.0" - -time-stamp@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-1.0.1.tgz#9f4bd23559c9365966f3302dbba2b07c6b99b151" - -unc-path-regex@^0.1.0: - version "0.1.2" - resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa" - -unique-stream@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/unique-stream/-/unique-stream-1.0.0.tgz#d59a4a75427447d9aa6c91e70263f8d26a4b104b" - -user-home@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/user-home/-/user-home-1.1.1.tgz#2b5be23a32b63a7c9deb8d0f28d485724a3df190" - -util-deprecate@~1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" - -v8flags@^2.0.2: - version "2.0.11" - resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-2.0.11.tgz#bca8f30f0d6d60612cc2c00641e6962d42ae6881" - dependencies: - user-home "^1.1.1" - -vinyl-fs@^0.3.0: - version "0.3.14" - resolved "https://registry.yarnpkg.com/vinyl-fs/-/vinyl-fs-0.3.14.tgz#9a6851ce1cac1c1cea5fe86c0931d620c2cfa9e6" - dependencies: - defaults "^1.0.0" - glob-stream "^3.1.5" - glob-watcher "^0.0.6" - graceful-fs "^3.0.0" - mkdirp "^0.5.0" - strip-bom "^1.0.0" - through2 "^0.6.1" - vinyl "^0.4.0" - -vinyl@^0.4.0: - version "0.4.6" - resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-0.4.6.tgz#2f356c87a550a255461f36bbeb2a5ba8bf784847" - dependencies: - clone "^0.2.0" - clone-stats "^0.0.1" - -vinyl@^0.5.0: - version "0.5.3" - resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-0.5.3.tgz#b0455b38fc5e0cf30d4325132e461970c2091cde" - dependencies: - clone "^1.0.0" - clone-stats "^0.0.1" - replace-ext "0.0.1" - -vinyl@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.0.1.tgz#1c3b4931e7ac4c1efee743f3b91a74c094407bb6" - dependencies: - clone "^1.0.0" - clone-buffer "^1.0.0" - clone-stats "^1.0.0" - cloneable-readable "^1.0.0" - is-stream "^1.1.0" - remove-trailing-separator "^1.0.1" - replace-ext "^1.0.0" - -which@^1.2.12: - version "1.2.12" - resolved "https://registry.yarnpkg.com/which/-/which-1.2.12.tgz#de67b5e450269f194909ef23ece4ebe416fa1192" - dependencies: - isexe "^1.1.1" - -wrappy@1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" - -"xtend@>=4.0.0 <4.1.0-0", xtend@~4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af" - -yamljs@^0.2.8: - version "0.2.8" - resolved "https://registry.yarnpkg.com/yamljs/-/yamljs-0.2.8.tgz#ef23fb006e62f6ae07b406aa2a949561f336ea5c" - dependencies: - argparse "^1.0.7" - glob "^7.0.5"