diff --git a/Mariana-Theme-Light.sublime-theme b/Mariana-Theme-Light.sublime-theme index 52075b1c..bd9b7442 100644 --- a/Mariana-Theme-Light.sublime-theme +++ b/Mariana-Theme-Light.sublime-theme @@ -42,6 +42,37 @@ ], "layer0.opacity": 1 }, + { + "class": "fold_button_control", + "layer0.texture": "mariana-theme/assets/light/fold_right.png", + "layer0.opacity": 1, + "layer0.inner_margin": 0, + "layer1.texture": "mariana-theme/assets/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/light/fold_down.png", + "layer1.texture": "mariana-theme/assets/light/fold_down_hover.png" + }, { "class": "button_control", "layer0.tint": [ @@ -269,7 +300,7 @@ }, { "class": "icon_in_selection", - "layer0.texture": "mariana-theme/assets/light/in_selection.png", + "layer0.texture": "mariana-theme/assets/light/icon_in_selection.png", "layer0.opacity": { "target": 0.5, "speed": 5, @@ -305,7 +336,7 @@ }, { "class": "icon_highlight", - "layer0.texture": "mariana-theme/assets/light/highlight_matches.png", + "layer0.texture": "mariana-theme/assets/light/icon_highlight_matches.png", "layer0.opacity": { "target": 0.5, "speed": 5, @@ -447,37 +478,6 @@ ], "layer0.opacity": 1 }, - { - "class": "fold_button_control", - "layer0.texture": "mariana-theme/assets/light/fold_right.png", - "layer0.opacity": 1, - "layer0.inner_margin": 0, - "layer1.texture": "mariana-theme/assets/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/light/fold_down.png", - "layer1.texture": "mariana-theme/assets/light/fold_down_hover.png" - }, { "class": "dialog", "layer0.tint": [ @@ -611,6 +611,32 @@ 9 ] }, + { + "class": "label_control", + "fg": [ + 64, + 64, + 64 + ], + "font.size": 12 + }, + { + "class": "title_label_control", + "fg": [ + 64, + 64, + 64 + ], + "font.size": 24 + }, + { + "class": "label_control", + "parents": [ + { + "class": "button_control" + } + ] + }, { "class": "text_line_control", "layer0.tint": [ @@ -681,32 +707,6 @@ ], "layer1.opacity": 1 }, - { - "class": "label_control", - "fg": [ - 64, - 64, - 64 - ], - "font.size": 12 - }, - { - "class": "title_label_control", - "fg": [ - 64, - 64, - 64 - ], - "font.size": 24 - }, - { - "class": "label_control", - "parents": [ - { - "class": "button_control" - } - ] - }, { "class": "close_button", "layer0.texture": "mariana-theme/assets/light/close_icon.png", @@ -1198,70 +1198,30 @@ "font.bold": true }, { - "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/light/overflow_menu.png", - "layer0.opacity": 1, - "content_margin": [ - 8, - 8 - ] - }, - { - "class": "panel_button_control", - "attributes": [ - "hover" + "class": "title_bar", + "bg": [ + 115, + 128, + 140 ], - "layer0.texture": "mariana-theme/assets/light/overflow_menu_hover.png" - }, - { - "class": "status_container", - "content_margin": [ - 8, - 0, - 0, - 0 + "fg": [ + 235, + 237, + 239 ] }, { - "class": "status_button", - "content_margin": [ - 10, - 0, - 10, - 0 + "class": "title_bar", + "settings": [ + "mariana_theme_titlebar" ], - "min_size": [ - 80, - 0 - ] - }, - { - "class": "label_control", - "parents": [ - { - "class": "status_bar" - } + "bg": [ + "background", + 0.96 ], - "font.size": 11, - "color": [ - 30, - 40, - 44 + "fg": [ + "foreground", + 1 ] }, { @@ -1621,30 +1581,70 @@ } }, { - "class": "title_bar", - "bg": [ - 115, - 128, - 140 + "class": "status_bar", + "layer0.tint": [ + 171, + 177, + 186 ], - "fg": [ - 235, - 237, - 239 + "layer0.opacity": 1, + "content_margin": [ + 10, + 2, + 0, + 2 ] }, { - "class": "title_bar", - "settings": [ - "mariana_theme_titlebar" + "class": "panel_button_control", + "layer0.texture": "mariana-theme/assets/light/overflow_menu.png", + "layer0.opacity": 1, + "content_margin": [ + 8, + 8 + ] + }, + { + "class": "panel_button_control", + "attributes": [ + "hover" ], - "bg": [ - "background", - 0.96 + "layer0.texture": "mariana-theme/assets/light/overflow_menu_hover.png" + }, + { + "class": "status_container", + "content_margin": [ + 8, + 0, + 0, + 0 + ] + }, + { + "class": "status_button", + "content_margin": [ + 10, + 0, + 10, + 0 ], - "fg": [ - "foreground", - 1 + "min_size": [ + 80, + 0 + ] + }, + { + "class": "label_control", + "parents": [ + { + "class": "status_bar" + } + ], + "font.size": 11, + "color": [ + 30, + 40, + 44 ] }, { diff --git a/assets/light/icon_case_sensitive.png b/assets/light/icon_case_sensitive.png index 193dd0e4..90abf23b 100755 Binary files a/assets/light/icon_case_sensitive.png and b/assets/light/icon_case_sensitive.png differ diff --git a/assets/light/icon_case_sensitive@2x.png b/assets/light/icon_case_sensitive@2x.png index ff792e63..bd128235 100755 Binary files a/assets/light/icon_case_sensitive@2x.png and b/assets/light/icon_case_sensitive@2x.png differ diff --git a/assets/light/icon_case_sensitive@3x.png b/assets/light/icon_case_sensitive@3x.png index de44895e..02bcb127 100755 Binary files a/assets/light/icon_case_sensitive@3x.png and b/assets/light/icon_case_sensitive@3x.png differ diff --git a/assets/light/highlight_matches.png b/assets/light/icon_highlight_matches.png old mode 100755 new mode 100644 similarity index 100% rename from assets/light/highlight_matches.png rename to assets/light/icon_highlight_matches.png diff --git a/assets/light/highlight_matches@2x.png b/assets/light/icon_highlight_matches@2x.png old mode 100755 new mode 100644 similarity index 100% rename from assets/light/highlight_matches@2x.png rename to assets/light/icon_highlight_matches@2x.png diff --git a/assets/light/highlight_matches@3x.png b/assets/light/icon_highlight_matches@3x.png old mode 100755 new mode 100644 similarity index 100% rename from assets/light/highlight_matches@3x.png rename to assets/light/icon_highlight_matches@3x.png diff --git a/assets/light/icon_in_selection.png b/assets/light/icon_in_selection.png new file mode 100644 index 00000000..33000376 Binary files /dev/null and b/assets/light/icon_in_selection.png differ diff --git a/assets/light/icon_in_selection@2x.png b/assets/light/icon_in_selection@2x.png new file mode 100644 index 00000000..d3d1f52f Binary files /dev/null and b/assets/light/icon_in_selection@2x.png differ diff --git a/assets/light/icon_in_selection@3x.png b/assets/light/icon_in_selection@3x.png new file mode 100644 index 00000000..3d216d6b Binary files /dev/null and b/assets/light/icon_in_selection@3x.png differ diff --git a/assets/light/in_selection.png b/assets/light/in_selection.png deleted file mode 100755 index 64ff4bb6..00000000 Binary files a/assets/light/in_selection.png and /dev/null differ diff --git a/assets/light/in_selection@2x.png b/assets/light/in_selection@2x.png deleted file mode 100755 index f36fa85d..00000000 Binary files a/assets/light/in_selection@2x.png and /dev/null differ diff --git a/assets/light/in_selection@3x.png b/assets/light/in_selection@3x.png deleted file mode 100755 index d2aef08b..00000000 Binary files a/assets/light/in_selection@3x.png and /dev/null differ diff --git a/gulp-tasks/icons.js b/gulp-tasks/icons.js index 3664ef03..5da5c243 100644 --- a/gulp-tasks/icons.js +++ b/gulp-tasks/icons.js @@ -2,18 +2,18 @@ import path from "path"; import fs from "fs"; import svg2png from "svg2png"; -import allIcons from "./../src/icons/icons.json"; import options from "./../src/icons/options.json"; const debug = true; function __icons(variation) { let iconPath; - allIcons.forEach(icon => { + fs.readdirSync("./src/icons/svg").forEach(icon => { if (debug) console.log(`👁 - Reading ${icon} icon.`); - iconPath = path.join(__dirname, `/../src/icons/svg/${icon}.svg`); + iconPath = path.join(__dirname, `/../src/icons/svg/${icon}`); fs.readFile(iconPath, (err, data) => { if (err) throw err; + icon = icon.split(".").slice(0, -1).join("."); options.settings.forEach(setting => { svg2png(data, { width: setting.size, height: setting.size }) .then(buffer => { diff --git a/src/icons/icons.json b/src/icons/icons.json deleted file mode 100644 index b7845dea..00000000 --- a/src/icons/icons.json +++ /dev/null @@ -1,4 +0,0 @@ -[ - "highlight_matches", - "icon_wrap" -] diff --git a/src/icons/svg/icon_case_sensitive.svg b/src/icons/svg/icon_case_sensitive.svg new file mode 100644 index 00000000..0f465f52 --- /dev/null +++ b/src/icons/svg/icon_case_sensitive.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/icons/svg/highlight_matches.svg b/src/icons/svg/icon_highlight_matches.svg similarity index 100% rename from src/icons/svg/highlight_matches.svg rename to src/icons/svg/icon_highlight_matches.svg diff --git a/src/icons/svg/icon_in_selection.svg b/src/icons/svg/icon_in_selection.svg new file mode 100644 index 00000000..54262e5a --- /dev/null +++ b/src/icons/svg/icon_in_selection.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/themes/light/buttons.json b/src/themes/light/buttons.json index 7852de4a..8931f82f 100644 --- a/src/themes/light/buttons.json +++ b/src/themes/light/buttons.json @@ -105,7 +105,7 @@ }, { "class": "icon_in_selection", - "layer0.texture": "mariana-theme/assets/light/in_selection.png", + "layer0.texture": "mariana-theme/assets/light/icon_in_selection.png", "layer0.opacity": { "target": 0.5, "speed": 5.0, "interpolation": "smoothstep" }, "content_margin": [12, 12] }, @@ -121,7 +121,7 @@ }, { "class": "icon_highlight", - "layer0.texture": "mariana-theme/assets/light/highlight_matches.png", + "layer0.texture": "mariana-theme/assets/light/icon_highlight_matches.png", "layer0.opacity": { "target": 0.5, "speed": 5.0, "interpolation": "smoothstep" }, "content_margin": [12, 12] },