From 64d08d3fc25938c240b25c6091dfa62fff9793ab Mon Sep 17 00:00:00 2001 From: Mauro Reis Vieira Date: Tue, 29 Oct 2019 19:22:07 +0000 Subject: [PATCH] fix: move json file to javascript. --- .../Meetio-Theme-Light.sublime-color-scheme | 105 ++++++++++++++++++ src/icons.js | 7 +- src/icons/default.js | 17 +++ src/icons/default.json | 17 --- src/icons/svg/arrow_down.svg | 2 +- src/icons/svg/arrow_left.svg | 2 +- src/icons/svg/arrow_right.svg | 2 +- src/icons/svg/arrow_up.svg | 2 +- src/icons/svg/dirty_dot_icon.svg | 2 +- src/icons/svg/dirty_icon.svg | 2 +- src/icons/svg/folder_closed.svg | 2 +- src/icons/svg/folder_dup.svg | 2 +- src/icons/svg/folder_open.svg | 2 +- src/icons/svg/icon_branch.svg | 2 +- src/icons/svg/icon_case_sensitive.svg | 2 +- src/icons/svg/icon_close.svg | 2 +- src/icons/svg/icon_highlight_matches.svg | 2 +- src/icons/svg/icon_in_context.svg | 2 +- src/icons/svg/icon_in_selection.svg | 2 +- src/icons/svg/icon_preserve_case.svg | 2 +- src/icons/svg/icon_regex.svg | 2 +- src/icons/svg/icon_use_buffer.svg | 2 +- src/icons/svg/icon_whole_word.svg | 2 +- src/icons/svg/icon_wrap.svg | 2 +- src/icons/svg/overflow_menu.svg | 2 +- src/icons/svg/vsc_added.svg | 2 +- src/icons/svg/vsc_modified.svg | 2 +- src/icons/svg/vsc_staged.svg | 2 +- src/icons/svg/vsc_untracked.svg | 2 +- src/schemes/dark.js | 24 ++++ 30 files changed, 173 insertions(+), 47 deletions(-) create mode 100644 src/icons/default.js delete mode 100644 src/icons/default.json create mode 100644 src/schemes/dark.js diff --git a/schemes/Meetio-Theme-Light.sublime-color-scheme b/schemes/Meetio-Theme-Light.sublime-color-scheme index a78698e1..68f628e0 100644 --- a/schemes/Meetio-Theme-Light.sublime-color-scheme +++ b/schemes/Meetio-Theme-Light.sublime-color-scheme @@ -53,6 +53,111 @@ "tags_foreground": "var(pink)" }, "rules": [ + { + "foreground": "#FDFDFDFF", + "background": "#D95757FF", + "scope": "col_D95757FF" + }, + { + "foreground": "#D5D5D5FF", + "background": "#4C566AFF", + "scope": "col_4C566AFF" + }, + { + "foreground": "#525252FF", + "background": "#C3E88DFF", + "scope": "col_C3E88DFF" + }, + { + "foreground": "#3D3D3DFF", + "background": "#7FDBCAFF", + "scope": "col_7FDBCAFF" + }, + { + "foreground": "#272727FF", + "background": "#82AAFFFF", + "scope": "col_82AAFFFF" + }, + { + "foreground": "#919191FF", + "background": "#011627FF", + "scope": "col_011627FF" + }, + { + "foreground": "#4E4E4EFF", + "background": "#D46C6C66", + "scope": "col_D46C6C66" + }, + { + "foreground": "#0D0D0DFF", + "background": "#FF5874FF", + "scope": "col_FF5874FF" + }, + { + "foreground": "#010101FF", + "background": "#EF5350FF", + "scope": "col_EF5350FF" + }, + { + "foreground": "#282828FF", + "background": "#F78C6CFF", + "scope": "col_F78C6CFF" + }, + { + "foreground": "#3D3D3DFF", + "background": "#C2AFFFFF", + "scope": "col_C2AFFFFF" + }, + { + "foreground": "#F1F1F1FF", + "background": "#637777FF", + "scope": "col_637777FF" + }, + { + "foreground": "#404040FF", + "background": "#ADDB67FF", + "scope": "col_ADDB67FF" + }, + { + "foreground": "#101010FF", + "background": "#C17E70FF", + "scope": "col_C17E70FF" + }, + { + "foreground": "#535353FF", + "background": "#FFCB8BFF", + "scope": "col_FFCB8BFF" + }, + { + "foreground": "#434343FF", + "background": "#FFCC00FF", + "scope": "col_FFCC00FF" + }, + { + "foreground": "#5F5F5FFF", + "background": "#DEDFE4FF", + "scope": "col_DEDFE4FF" + }, + { + "foreground": "#373737FF", + "background": "#E2B93DFF", + "scope": "col_E2B93DFF" + }, + { + "foreground": "#808080FF", + "background": "#000000FF", + "scope": "col_000000FF" + }, + { + "foreground": "#ffffff", + "background": "#000000", + "scope": "col_gutter" + }, + { + "foreground": "#7F7F7FFF", + "background": "#FFFFFFFF", + "scope": "col_FFFFFFFF" + }, { "name": "[CSS] String", "scope": "source.css string", diff --git a/src/icons.js b/src/icons.js index d1515822..ae808210 100644 --- a/src/icons.js +++ b/src/icons.js @@ -2,7 +2,7 @@ const path = require("path") const fs = require("fs") const svg2img = require("svg2img") -const defaultOptions = require("./../src/icons/default.json") +const defaultOptions = require("./icons/default.js") function build() { let iconPath @@ -13,10 +13,7 @@ function build() { .slice(0, -1) .join(".") fs.readFile(iconPath, "utf8", (err, data) => { - if (err) { - throw err - } - data = data.replace("#000", defaultOptions.color) + if (err) throw err data = Buffer.from(data, "utf8") defaultOptions.settings.forEach(setting => { svg2img( diff --git a/src/icons/default.js b/src/icons/default.js new file mode 100644 index 00000000..8fb5dfaf --- /dev/null +++ b/src/icons/default.js @@ -0,0 +1,17 @@ +module.exports = { + color: "#fff", + settings: [ + { + size: 24, + suffix: false, + }, + { + size: 48, + suffix: "@2x", + }, + { + size: 72, + suffix: "@3x", + }, + ], +} diff --git a/src/icons/default.json b/src/icons/default.json deleted file mode 100644 index 7539b37c..00000000 --- a/src/icons/default.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "color": "#fff", - "settings": [ - { - "size": 24, - "suffix": false - }, - { - "size": 48, - "suffix": "@2x" - }, - { - "size": 72, - "suffix": "@3x" - } - ] -} diff --git a/src/icons/svg/arrow_down.svg b/src/icons/svg/arrow_down.svg index 8b3aedcc..e89a2b79 100644 --- a/src/icons/svg/arrow_down.svg +++ b/src/icons/svg/arrow_down.svg @@ -1,3 +1,3 @@ - + diff --git a/src/icons/svg/arrow_left.svg b/src/icons/svg/arrow_left.svg index f5eed39f..19fd3dbb 100644 --- a/src/icons/svg/arrow_left.svg +++ b/src/icons/svg/arrow_left.svg @@ -1,3 +1,3 @@ - + diff --git a/src/icons/svg/arrow_right.svg b/src/icons/svg/arrow_right.svg index b422a798..be74d5eb 100644 --- a/src/icons/svg/arrow_right.svg +++ b/src/icons/svg/arrow_right.svg @@ -1,3 +1,3 @@ - + diff --git a/src/icons/svg/arrow_up.svg b/src/icons/svg/arrow_up.svg index 0ad8ef77..ca6d4cf5 100644 --- a/src/icons/svg/arrow_up.svg +++ b/src/icons/svg/arrow_up.svg @@ -1,3 +1,3 @@ - + diff --git a/src/icons/svg/dirty_dot_icon.svg b/src/icons/svg/dirty_dot_icon.svg index be0ac09f..12704370 100644 --- a/src/icons/svg/dirty_dot_icon.svg +++ b/src/icons/svg/dirty_dot_icon.svg @@ -1,3 +1,3 @@ - + diff --git a/src/icons/svg/dirty_icon.svg b/src/icons/svg/dirty_icon.svg index b248c1b4..d93fa866 100644 --- a/src/icons/svg/dirty_icon.svg +++ b/src/icons/svg/dirty_icon.svg @@ -1,3 +1,3 @@ - + diff --git a/src/icons/svg/folder_closed.svg b/src/icons/svg/folder_closed.svg index 09dc494b..30538250 100644 --- a/src/icons/svg/folder_closed.svg +++ b/src/icons/svg/folder_closed.svg @@ -1,3 +1,3 @@ - + diff --git a/src/icons/svg/folder_dup.svg b/src/icons/svg/folder_dup.svg index 4b869b3a..d7b15d92 100644 --- a/src/icons/svg/folder_dup.svg +++ b/src/icons/svg/folder_dup.svg @@ -1,4 +1,4 @@ - + diff --git a/src/icons/svg/folder_open.svg b/src/icons/svg/folder_open.svg index eef840bd..f647f6fb 100644 --- a/src/icons/svg/folder_open.svg +++ b/src/icons/svg/folder_open.svg @@ -1,3 +1,3 @@ - + diff --git a/src/icons/svg/icon_branch.svg b/src/icons/svg/icon_branch.svg index 00a7b1da..dc8c07ae 100644 --- a/src/icons/svg/icon_branch.svg +++ b/src/icons/svg/icon_branch.svg @@ -1,3 +1,3 @@ - + diff --git a/src/icons/svg/icon_case_sensitive.svg b/src/icons/svg/icon_case_sensitive.svg index 0d58b29f..06e2ace2 100644 --- a/src/icons/svg/icon_case_sensitive.svg +++ b/src/icons/svg/icon_case_sensitive.svg @@ -1,3 +1,3 @@ - + diff --git a/src/icons/svg/icon_close.svg b/src/icons/svg/icon_close.svg index 09cafbd5..d8368ec7 100644 --- a/src/icons/svg/icon_close.svg +++ b/src/icons/svg/icon_close.svg @@ -1,3 +1,3 @@ - + diff --git a/src/icons/svg/icon_highlight_matches.svg b/src/icons/svg/icon_highlight_matches.svg index 0bbba5de..a04a278a 100644 --- a/src/icons/svg/icon_highlight_matches.svg +++ b/src/icons/svg/icon_highlight_matches.svg @@ -1,3 +1,3 @@ - + diff --git a/src/icons/svg/icon_in_context.svg b/src/icons/svg/icon_in_context.svg index 00dcffdc..b4865afa 100644 --- a/src/icons/svg/icon_in_context.svg +++ b/src/icons/svg/icon_in_context.svg @@ -1,3 +1,3 @@ - + diff --git a/src/icons/svg/icon_in_selection.svg b/src/icons/svg/icon_in_selection.svg index 16023604..79837c61 100644 --- a/src/icons/svg/icon_in_selection.svg +++ b/src/icons/svg/icon_in_selection.svg @@ -1,4 +1,4 @@ - + diff --git a/src/icons/svg/icon_preserve_case.svg b/src/icons/svg/icon_preserve_case.svg index 40983685..fa96d714 100644 --- a/src/icons/svg/icon_preserve_case.svg +++ b/src/icons/svg/icon_preserve_case.svg @@ -1,3 +1,3 @@ - + diff --git a/src/icons/svg/icon_regex.svg b/src/icons/svg/icon_regex.svg index 73e2eee3..16f607c9 100644 --- a/src/icons/svg/icon_regex.svg +++ b/src/icons/svg/icon_regex.svg @@ -1,3 +1,3 @@ - + diff --git a/src/icons/svg/icon_use_buffer.svg b/src/icons/svg/icon_use_buffer.svg index 42213a89..7ab99373 100644 --- a/src/icons/svg/icon_use_buffer.svg +++ b/src/icons/svg/icon_use_buffer.svg @@ -1,3 +1,3 @@ - + diff --git a/src/icons/svg/icon_whole_word.svg b/src/icons/svg/icon_whole_word.svg index 5fa56fab..414ff33d 100644 --- a/src/icons/svg/icon_whole_word.svg +++ b/src/icons/svg/icon_whole_word.svg @@ -1,3 +1,3 @@ - + diff --git a/src/icons/svg/icon_wrap.svg b/src/icons/svg/icon_wrap.svg index 3fe4cc4b..6edda642 100644 --- a/src/icons/svg/icon_wrap.svg +++ b/src/icons/svg/icon_wrap.svg @@ -1,3 +1,3 @@ - + diff --git a/src/icons/svg/overflow_menu.svg b/src/icons/svg/overflow_menu.svg index a1c600d6..640d48bb 100644 --- a/src/icons/svg/overflow_menu.svg +++ b/src/icons/svg/overflow_menu.svg @@ -1,3 +1,3 @@ - + diff --git a/src/icons/svg/vsc_added.svg b/src/icons/svg/vsc_added.svg index a1c600d6..640d48bb 100644 --- a/src/icons/svg/vsc_added.svg +++ b/src/icons/svg/vsc_added.svg @@ -1,3 +1,3 @@ - + diff --git a/src/icons/svg/vsc_modified.svg b/src/icons/svg/vsc_modified.svg index 937d52e6..59af9c65 100644 --- a/src/icons/svg/vsc_modified.svg +++ b/src/icons/svg/vsc_modified.svg @@ -1,3 +1,3 @@ - + diff --git a/src/icons/svg/vsc_staged.svg b/src/icons/svg/vsc_staged.svg index 85168989..acd91f02 100644 --- a/src/icons/svg/vsc_staged.svg +++ b/src/icons/svg/vsc_staged.svg @@ -1,3 +1,3 @@ - + diff --git a/src/icons/svg/vsc_untracked.svg b/src/icons/svg/vsc_untracked.svg index 47404a7b..0d85ef35 100644 --- a/src/icons/svg/vsc_untracked.svg +++ b/src/icons/svg/vsc_untracked.svg @@ -1,3 +1,3 @@ - + diff --git a/src/schemes/dark.js b/src/schemes/dark.js new file mode 100644 index 00000000..e0e59f9e --- /dev/null +++ b/src/schemes/dark.js @@ -0,0 +1,24 @@ +{ + "name": "Meetio-Theme-Dark", + "author": "Mauro Reis Vieira ", + "variables": { + "cursor" : "#ffcc00", + "foreground" : "#dedfe4", + "background" : "#011627", + "comments" : "#637777", + "blue" : "#82aaff", + "brown" : "#c17e70", + "cyan" : "#7fdbca", + "green" : "#c3e88d", + "orange" : "#f78c6c", + "pink" : "#ff5874", + "purple" : "#c2afff", + "red" : "#d95757", + "yellow" : "#ffcb8b", + "invalid" : "#d46c6c66", + "diffAdded" : "#addb67", + "diffModified" : "#e2b93d", + "diffDeleted" : "#ef5350", + "diffIgnored" : "#4C566A" + } +}