diff --git a/Mariana-Theme.sublime-theme b/Mariana-Theme.sublime-theme
index 860aae18..bee995ef 100644
--- a/Mariana-Theme.sublime-theme
+++ b/Mariana-Theme.sublime-theme
@@ -36,9 +36,9 @@
255
],
"match_fg": [
- 128,
- 203,
- 196,
+ 198,
+ 149,
+ 198,
255
],
"selected_fg": [
@@ -48,9 +48,9 @@
255
],
"selected_match_fg": [
- 128,
- 203,
- 196,
+ 198,
+ 149,
+ 198,
255
]
},
@@ -461,37 +461,6 @@
],
"layer0.opacity": 0.9
},
- {
- "class": "fold_button_control",
- "layer0.texture": "mariana-theme/assets/common/light/fold_right.png",
- "layer0.opacity": 1,
- "layer0.inner_margin": 0,
- "layer1.texture": "mariana-theme/assets/common/light/fold_right_hover.png",
- "layer1.opacity": 0,
- "layer1.inner_margin": 0,
- "content_margin": [
- 9,
- 7,
- 8,
- 6
- ]
- },
- {
- "class": "fold_button_control",
- "attributes": [
- "hover"
- ],
- "layer0.opacity": 0,
- "layer1.opacity": 1
- },
- {
- "class": "fold_button_control",
- "attributes": [
- "expanded"
- ],
- "layer0.texture": "mariana-theme/assets/common/light/fold_down.png",
- "layer1.texture": "mariana-theme/assets/common/light/fold_down_hover.png"
- },
{
"class": "disclosure_button_control",
"layer0.texture": "mariana-theme/assets/common/light/disclosure_unexpanded.png",
@@ -643,48 +612,36 @@
]
},
{
- "class": "text_line_control",
- "layer0.tint": [
- 235,
- 237,
- 239
- ],
- "layer0.opacity": 1,
- "layer0.inner_margin": [
- 18,
- 12,
- 10,
- 12
- ],
- "tint_index": 1,
- "content_margin": 0
- },
- {
- "class": "dropdown_button_control",
- "content_margin": [
- 12,
- 12
- ],
- "layer0.texture": "mariana-theme/assets/common/light/overflow_menu.png",
+ "class": "fold_button_control",
+ "layer0.texture": "mariana-theme/assets/common/light/fold_right.png",
"layer0.opacity": 1,
- "layer0.inner_margin": [
- 0,
- 0
- ],
- "layer1.texture": "mariana-theme/assets/common/light/overflow_menu_hover.png",
+ "layer0.inner_margin": 0,
+ "layer1.texture": "mariana-theme/assets/common/light/fold_right_hover.png",
"layer1.opacity": 0,
- "layer1.inner_margin": [
- 0,
- 0
+ "layer1.inner_margin": 0,
+ "content_margin": [
+ 9,
+ 7,
+ 8,
+ 6
]
},
{
- "class": "dropdown_button_control",
+ "class": "fold_button_control",
"attributes": [
"hover"
],
+ "layer0.opacity": 0,
"layer1.opacity": 1
},
+ {
+ "class": "fold_button_control",
+ "attributes": [
+ "expanded"
+ ],
+ "layer0.texture": "mariana-theme/assets/common/light/fold_down.png",
+ "layer1.texture": "mariana-theme/assets/common/light/fold_down_hover.png"
+ },
{
"class": "label_control",
"fg": [
@@ -721,6 +678,49 @@
1
]
},
+ {
+ "class": "text_line_control",
+ "layer0.tint": [
+ 235,
+ 237,
+ 239
+ ],
+ "layer0.opacity": 1,
+ "layer0.inner_margin": [
+ 18,
+ 12,
+ 10,
+ 12
+ ],
+ "tint_index": 1,
+ "content_margin": 0
+ },
+ {
+ "class": "dropdown_button_control",
+ "content_margin": [
+ 12,
+ 12
+ ],
+ "layer0.texture": "mariana-theme/assets/common/light/overflow_menu.png",
+ "layer0.opacity": 1,
+ "layer0.inner_margin": [
+ 0,
+ 0
+ ],
+ "layer1.texture": "mariana-theme/assets/common/light/overflow_menu_hover.png",
+ "layer1.opacity": 0,
+ "layer1.inner_margin": [
+ 0,
+ 0
+ ]
+ },
+ {
+ "class": "dropdown_button_control",
+ "attributes": [
+ "hover"
+ ],
+ "layer1.opacity": 1
+ },
{
"class": "close_button",
"layer0.texture": "mariana-theme/assets/common/light/open_file_close.png",
@@ -760,114 +760,6 @@
],
"layer0.texture": "mariana-theme/assets/common/light/open_file_close.png"
},
- {
- "class": "overlay_control",
- "layer0.tint": [
- 235,
- 237,
- 239
- ],
- "layer0.opacity": 1,
- "content_margin": 4
- },
- {
- "class": "quick_panel",
- "row_padding": 6,
- "layer0.tint": [
- 235,
- 237,
- 239
- ],
- "layer0.opacity": 1,
- "dark_content": false
- },
- {
- "class": "mini_quick_panel_row",
- "layer0.tint": [
- 199,
- 203,
- 209
- ],
- "layer0.opacity": 0
- },
- {
- "class": "mini_quick_panel_row",
- "attributes": [
- "selected"
- ],
- "layer0.opacity": 1
- },
- {
- "class": "quick_panel_row",
- "layer0.tint": [
- 199,
- 203,
- 209
- ],
- "layer0.opacity": 0
- },
- {
- "class": "quick_panel_row",
- "attributes": [
- "selected"
- ],
- "layer0.opacity": 1
- },
- {
- "class": "quick_panel_label",
- "fg": [
- 69,
- 74,
- 85
- ],
- "match_fg": [
- 0,
- 0,
- 0
- ],
- "selected_fg": [
- 46,
- 49,
- 56
- ],
- "selected_match_fg": [
- 0,
- 0,
- 0
- ]
- },
- {
- "class": "quick_panel_label",
- "parents": [
- {
- "class": "mini_quick_panel_row"
- }
- ],
- "font.size": 14
- },
- {
- "class": "quick_panel_path_label",
- "fg": [
- 115,
- 125,
- 140
- ],
- "match_fg": [
- 92,
- 100,
- 112
- ],
- "selected_fg": [
- 92,
- 100,
- 112
- ],
- "selected_match_fg": [
- 69,
- 74,
- 85
- ]
- },
{
"class": "panel_control",
"layer0.tint": [
@@ -923,18 +815,254 @@
}
},
{
- "class": "scroll_area_control",
- "settings": [
- "overlay_scroll_bars"
+ "class": "sidebar_container",
+ "layer0.tint": [
+ 235,
+ 237,
+ 239
],
- "overlay": true
+ "layer0.opacity": 1,
+ "content_margin": 0
},
{
- "class": "scroll_area_control",
- "settings": [
- "!overlay_scroll_bars"
- ],
- "overlay": false
+ "class": "sidebar_tree",
+ "row_padding": [
+ 16,
+ 3,
+ 16,
+ 3
+ ],
+ "indent": 12,
+ "indent_offset": 13,
+ "indent_top_level": false,
+ "dark_content": false,
+ "spacer_rows": true
+ },
+ {
+ "class": "sidebar_tree",
+ "platforms": [
+ "windows"
+ ],
+ "row_padding": [
+ 16,
+ 2,
+ 16,
+ 2
+ ]
+ },
+ {
+ "class": "tree_row",
+ "attributes": [
+ "!hover"
+ ],
+ "layer0.opacity": 0
+ },
+ {
+ "class": "tree_row",
+ "attributes": [
+ "selectable",
+ "hover"
+ ],
+ "layer0.tint": [
+ 69,
+ 74,
+ 85
+ ],
+ "layer0.opacity": 0.1
+ },
+ {
+ "class": "tree_row",
+ "attributes": [
+ "selected"
+ ],
+ "layer0.tint": [
+ 199,
+ 203,
+ 209
+ ],
+ "layer0.opacity": 1
+ },
+ {
+ "class": "sidebar_heading",
+ "fg": [
+ 128,
+ 128,
+ 128
+ ],
+ "font.size": 13,
+ "font.bold": true,
+ "shadow_color": [
+ 255,
+ 255,
+ 255,
+ 0.36
+ ],
+ "shadow_offset": [
+ 0,
+ 1
+ ]
+ },
+ {
+ "class": "sidebar_label",
+ "fg": [
+ 48,
+ 48,
+ 48
+ ],
+ "font.size": 12
+ },
+ {
+ "class": "sidebar_label",
+ "parents": [
+ {
+ "class": "tree_row",
+ "attributes": [
+ "selected"
+ ]
+ }
+ ],
+ "fg": [
+ 24,
+ 24,
+ 24
+ ]
+ },
+ {
+ "class": "sidebar_label",
+ "parents": [
+ {
+ "class": "tree_row",
+ "attributes": [
+ "expandable"
+ ]
+ }
+ ],
+ "settings": [
+ "bold_folder_labels"
+ ],
+ "font.bold": true
+ },
+ {
+ "class": "overlay_control",
+ "layer0.tint": [
+ 235,
+ 237,
+ 239
+ ],
+ "layer0.opacity": 1,
+ "content_margin": 4
+ },
+ {
+ "class": "quick_panel",
+ "row_padding": 6,
+ "layer0.tint": [
+ 235,
+ 237,
+ 239
+ ],
+ "layer0.opacity": 1,
+ "dark_content": false
+ },
+ {
+ "class": "mini_quick_panel_row",
+ "layer0.tint": [
+ 199,
+ 203,
+ 209
+ ],
+ "layer0.opacity": 0
+ },
+ {
+ "class": "mini_quick_panel_row",
+ "attributes": [
+ "selected"
+ ],
+ "layer0.opacity": 1
+ },
+ {
+ "class": "quick_panel_row",
+ "layer0.tint": [
+ 199,
+ 203,
+ 209
+ ],
+ "layer0.opacity": 0
+ },
+ {
+ "class": "quick_panel_row",
+ "attributes": [
+ "selected"
+ ],
+ "layer0.opacity": 1
+ },
+ {
+ "class": "quick_panel_label",
+ "fg": [
+ 69,
+ 74,
+ 85
+ ],
+ "match_fg": [
+ 0,
+ 0,
+ 0
+ ],
+ "selected_fg": [
+ 46,
+ 49,
+ 56
+ ],
+ "selected_match_fg": [
+ 0,
+ 0,
+ 0
+ ]
+ },
+ {
+ "class": "quick_panel_label",
+ "parents": [
+ {
+ "class": "mini_quick_panel_row"
+ }
+ ],
+ "font.size": 14
+ },
+ {
+ "class": "quick_panel_path_label",
+ "fg": [
+ 115,
+ 125,
+ 140
+ ],
+ "match_fg": [
+ 92,
+ 100,
+ 112
+ ],
+ "selected_fg": [
+ 92,
+ 100,
+ 112
+ ],
+ "selected_match_fg": [
+ 69,
+ 74,
+ 85
+ ]
+ },
+ {
+ "class": "scroll_area_control",
+ "settings": [
+ "overlay_scroll_bars"
+ ],
+ "overlay": true
+ },
+ {
+ "class": "scroll_area_control",
+ "settings": [
+ "!overlay_scroll_bars"
+ ],
+ "overlay": false
},
{
"class": "scroll_area_control",
@@ -1143,132 +1271,237 @@
]
},
{
- "class": "sidebar_container",
+ "class": "status_bar",
"layer0.tint": [
- 235,
- 237,
- 239
+ 171,
+ 177,
+ 186
],
"layer0.opacity": 1,
- "content_margin": 0
- },
- {
- "class": "sidebar_tree",
- "row_padding": [
- 16,
- 3,
- 16,
- 3
- ],
- "indent": 12,
- "indent_offset": 13,
- "indent_top_level": false,
- "dark_content": false,
- "spacer_rows": true
- },
- {
- "class": "sidebar_tree",
- "platforms": [
- "windows"
- ],
- "row_padding": [
- 16,
+ "content_margin": [
+ 10,
2,
- 16,
+ 0,
2
]
},
{
- "class": "tree_row",
- "attributes": [
- "!hover"
- ],
- "layer0.opacity": 0
+ "class": "panel_button_control",
+ "layer0.texture": "mariana-theme/assets/common/light/overflow_menu.png",
+ "layer0.opacity": 1,
+ "content_margin": [
+ 8,
+ 8
+ ]
},
{
- "class": "tree_row",
+ "class": "panel_button_control",
"attributes": [
- "selectable",
"hover"
],
- "layer0.tint": [
- 69,
- 74,
- 85
+ "layer0.texture": "mariana-theme/assets/common/light/overflow_menu_hover.png"
+ },
+ {
+ "class": "status_container",
+ "content_margin": [
+ 8,
+ 0,
+ 0,
+ 0
+ ]
+ },
+ {
+ "class": "status_button",
+ "content_margin": [
+ 10,
+ 0,
+ 10,
+ 0
],
- "layer0.opacity": 0.1
+ "min_size": [
+ 80,
+ 0
+ ]
},
{
- "class": "tree_row",
- "attributes": [
- "selected"
+ "class": "label_control",
+ "parents": [
+ {
+ "class": "status_bar"
+ }
],
+ "font.size": 11,
+ "color": [
+ 30,
+ 40,
+ 44
+ ]
+ },
+ {
+ "class": "tool_tip_control",
"layer0.tint": [
- 199,
- 203,
- 209
+ 255,
+ 255,
+ 255
],
- "layer0.opacity": 1
+ "layer0.opacity": 0.9,
+ "content_margin": [
+ 8,
+ 3,
+ 8,
+ 3
+ ]
},
{
- "class": "sidebar_heading",
+ "class": "tool_tip_label_control",
+ "font.size": 11,
"fg": [
- 128,
- 128,
- 128
- ],
- "font.size": 13,
- "font.bold": true,
- "shadow_color": [
+ 64,
+ 64,
+ 64
+ ]
+ },
+ {
+ "class": "grid_layout_control",
+ "border_color": [
+ "background",
255,
255,
255,
- 0.36
+ 0.25
],
- "shadow_offset": [
+ "border_size": 2
+ },
+ {
+ "class": "grid_layout_control",
+ "parents": [
+ {
+ "class": "edit_window",
+ "attributes": [
+ "file_light"
+ ]
+ }
+ ],
+ "border_color": [
+ "background",
0,
- 1
+ 0,
+ 0,
+ 0.32
]
},
{
- "class": "sidebar_label",
- "fg": [
- 48,
- 48,
- 48
+ "class": "grid_layout_control",
+ "parents": [
+ {
+ "class": "edit_window",
+ "attributes": [
+ "file_medium"
+ ]
+ }
],
- "font.size": 12
+ "border_color": [
+ "background",
+ 0,
+ 0,
+ 0,
+ 0.36
+ ]
},
{
- "class": "sidebar_label",
+ "class": "grid_layout_control",
"parents": [
{
- "class": "tree_row",
+ "class": "edit_window",
"attributes": [
- "selected"
+ "file_medium_dark"
]
}
],
- "fg": [
- 24,
- 24,
- 24
+ "border_color": [
+ "background",
+ 255,
+ 255,
+ 255,
+ 0.32
]
},
{
- "class": "sidebar_label",
+ "class": "grid_layout_control",
"parents": [
{
- "class": "tree_row",
+ "class": "edit_window",
"attributes": [
- "expandable"
+ "file_dark"
]
}
],
+ "border_color": [
+ "background",
+ 255,
+ 255,
+ 255,
+ 0.28
+ ]
+ },
+ {
+ "class": "minimap_control",
+ "settings": [
+ "always_show_minimap_viewport"
+ ],
+ "viewport_color": [
+ 128,
+ 128,
+ 128,
+ 0.18
+ ],
+ "viewport_opacity": 1
+ },
+ {
+ "class": "minimap_control",
+ "settings": [
+ "!always_show_minimap_viewport"
+ ],
+ "viewport_color": [
+ 128,
+ 128,
+ 128,
+ 0.25
+ ],
+ "viewport_opacity": {
+ "target": 0,
+ "speed": 4,
+ "interpolation": "smoothstep"
+ }
+ },
+ {
+ "class": "minimap_control",
+ "attributes": [
+ "hover"
+ ],
"settings": [
- "bold_folder_labels"
+ "!always_show_minimap_viewport"
],
- "font.bold": true
+ "viewport_color": [
+ 128,
+ 128,
+ 128,
+ 0.25
+ ],
+ "viewport_opacity": {
+ "target": 1,
+ "speed": 20,
+ "interpolation": "smoothstep"
+ }
+ },
+ {
+ "class": "table_row",
+ "layer0.tint": [
+ 255,
+ 255,
+ 255
+ ],
+ "layer0.opacity": 0
},
{
"class": "tabset_control",
@@ -1628,73 +1861,6 @@
"interpolation": "smoothstep"
}
},
- {
- "class": "status_bar",
- "layer0.tint": [
- 171,
- 177,
- 186
- ],
- "layer0.opacity": 1,
- "content_margin": [
- 10,
- 2,
- 0,
- 2
- ]
- },
- {
- "class": "panel_button_control",
- "layer0.texture": "mariana-theme/assets/common/light/overflow_menu.png",
- "layer0.opacity": 1,
- "content_margin": [
- 8,
- 8
- ]
- },
- {
- "class": "panel_button_control",
- "attributes": [
- "hover"
- ],
- "layer0.texture": "mariana-theme/assets/common/light/overflow_menu_hover.png"
- },
- {
- "class": "status_container",
- "content_margin": [
- 8,
- 0,
- 0,
- 0
- ]
- },
- {
- "class": "status_button",
- "content_margin": [
- 10,
- 0,
- 10,
- 0
- ],
- "min_size": [
- 80,
- 0
- ]
- },
- {
- "class": "label_control",
- "parents": [
- {
- "class": "status_bar"
- }
- ],
- "font.size": 11,
- "color": [
- 30,
- 40,
- 44
- ]
- },
{
"class": "title_bar",
"bg": [
@@ -1724,172 +1890,6 @@
239
]
},
- {
- "class": "tool_tip_control",
- "layer0.tint": [
- 255,
- 255,
- 255
- ],
- "layer0.opacity": 0.9,
- "content_margin": [
- 8,
- 3,
- 8,
- 3
- ]
- },
- {
- "class": "tool_tip_label_control",
- "font.size": 11,
- "fg": [
- 64,
- 64,
- 64
- ]
- },
- {
- "class": "grid_layout_control",
- "border_color": [
- "background",
- 255,
- 255,
- 255,
- 0.25
- ],
- "border_size": 2
- },
- {
- "class": "grid_layout_control",
- "parents": [
- {
- "class": "edit_window",
- "attributes": [
- "file_light"
- ]
- }
- ],
- "border_color": [
- "background",
- 0,
- 0,
- 0,
- 0.32
- ]
- },
- {
- "class": "grid_layout_control",
- "parents": [
- {
- "class": "edit_window",
- "attributes": [
- "file_medium"
- ]
- }
- ],
- "border_color": [
- "background",
- 0,
- 0,
- 0,
- 0.36
- ]
- },
- {
- "class": "grid_layout_control",
- "parents": [
- {
- "class": "edit_window",
- "attributes": [
- "file_medium_dark"
- ]
- }
- ],
- "border_color": [
- "background",
- 255,
- 255,
- 255,
- 0.32
- ]
- },
- {
- "class": "grid_layout_control",
- "parents": [
- {
- "class": "edit_window",
- "attributes": [
- "file_dark"
- ]
- }
- ],
- "border_color": [
- "background",
- 255,
- 255,
- 255,
- 0.28
- ]
- },
- {
- "class": "minimap_control",
- "settings": [
- "always_show_minimap_viewport"
- ],
- "viewport_color": [
- 128,
- 128,
- 128,
- 0.18
- ],
- "viewport_opacity": 1
- },
- {
- "class": "minimap_control",
- "settings": [
- "!always_show_minimap_viewport"
- ],
- "viewport_color": [
- 128,
- 128,
- 128,
- 0.25
- ],
- "viewport_opacity": {
- "target": 0,
- "speed": 4,
- "interpolation": "smoothstep"
- }
- },
- {
- "class": "minimap_control",
- "attributes": [
- "hover"
- ],
- "settings": [
- "!always_show_minimap_viewport"
- ],
- "viewport_color": [
- 128,
- 128,
- 128,
- 0.25
- ],
- "viewport_opacity": {
- "target": 1,
- "speed": 20,
- "interpolation": "smoothstep"
- }
- },
- {
- "class": "table_row",
- "layer0.tint": [
- 255,
- 255,
- 255
- ],
- "layer0.opacity": 0
- },
{
"class": "vcs_status_badge",
"parents": [
diff --git a/examples/main.html b/examples/main.html
index 48032253..97641bfb 100644
--- a/examples/main.html
+++ b/examples/main.html
@@ -1,7 +1,6 @@
-
diff --git a/src/themes/autocomplete.json b/src/themes/autocomplete.json
index 3c71a959..4c537d9a 100755
--- a/src/themes/autocomplete.json
+++ b/src/themes/autocomplete.json
@@ -14,9 +14,9 @@
{
"class": "auto_complete_label",
"fg": [176, 190, 197, 255],
- "match_fg": [128, 203, 196, 255],
+ "match_fg": [198, 149, 198, 255],
"selected_fg": [255, 255, 255, 255],
- "selected_match_fg": [128, 203, 196, 255]
+ "selected_match_fg": [198, 149, 198, 255]
},
{
"class": "table_row",