diff --git a/SUMMARY.rst b/SUMMARY.rst new file mode 100644 index 0000000..a9f8e91 --- /dev/null +++ b/SUMMARY.rst @@ -0,0 +1,239 @@ + +.. role:: color(raw) + :format: html + +.. default-role:: + color + + +Main palette +================= + +Open as:   `[JSON] `_  ·  `[YAML] `_ + +.. |l_cherry_1| replace:: `` +.. |l_cherry_2| replace:: `` +.. |l_cherry_3| replace:: `` +.. |l_cherry_4| replace:: `` +.. |l_cherry_5| replace:: `` +.. |l_cherry_6| replace:: `` +.. |l_cherry_7| replace:: `` +.. |l_cherry_8| replace:: `` +.. |l_solid_1| replace:: `` +.. |l_solid_2| replace:: `` +.. |l_solid_3| replace:: `` +.. |l_solid_4| replace:: `` +.. |l_solid_5| replace:: `` +.. |l_solid_6| replace:: `` +.. |l_solid_7| replace:: `` +.. |l_solid_8| replace:: `` +.. |l_label_1| replace:: `` +.. |l_label_2| replace:: `` +.. |l_label_3| replace:: `` +.. |l_label_4| replace:: `` +.. |l_label_5| replace:: `` +.. |l_label_6| replace:: `` +.. |l_label_7| replace:: `` +.. |l_label_8| replace:: `` + ++----------------+---------------+---------------+ +| | |l_cherry_1| | | |l_solid_1| | | |l_label_1| | +| | |l_cherry_2| | | |l_solid_2| | | |l_label_2| | +| | |l_cherry_3| | | |l_solid_3| | | |l_label_3| | +| | |l_cherry_4| | | |l_solid_4| | | |l_label_4| | +| | |l_cherry_5| | | |l_solid_5| | | |l_label_5| | +| | |l_cherry_6| | | |l_solid_6| | | |l_label_6| | +| | |l_cherry_7| | | |l_solid_7| | | |l_label_7| | +| | |l_cherry_8| | | |l_solid_8| | | |l_label_8| | ++----------------+---------------+---------------+ + + +Theme +================= + +Open `[JSON] `_ + +.. |--| replace:: \- +.. |cherry_1| replace:: `` +.. |cherry_2| replace:: `` +.. |cherry_3| replace:: `` +.. |cherry_4| replace:: `` +.. |cherry_5| replace:: `` +.. |cherry_6| replace:: `` +.. |cherry_7| replace:: `` +.. |cherry_8| replace:: `` +.. |solid_1| replace:: `` +.. |solid_2| replace:: `` +.. |solid_3| replace:: `` +.. |solid_4| replace:: `` +.. |solid_5| replace:: `` +.. |solid_6| replace:: `` +.. |solid_7| replace:: `` +.. |solid_8| replace:: `` +.. |label_1| replace:: `` +.. |label_2| replace:: `` +.. |label_3| replace:: `` +.. |label_4| replace:: `` +.. |label_5| replace:: `` +.. |label_6| replace:: `` +.. |label_7| replace:: `` +.. |label_8| replace:: `` + +================== ================ ========== ============= ============ +\ bg / main color fg color border color shadow color +================== ================ ========== ============= ============ +disabled |solid_2| |label_1| |solid_4| |--| +textfield |solid_3| |--| |--| |--| +inactive |solid_3| |label_4| |solid_7| |--| +regular |solid_4| |label_4| |solid_7| |--| +active |solid_5| |label_5| |solid_7| |--| +action btn press |solid_5| |--| |solid_6| |--| +selection |cherry_6| |label_5| |solid_7| |--| +selection (tabs) |solid_6| |label_5| |solid_7| |--| +active h+inactive |solid_5| |--| |--| |--| +popup |solid_5| |--| |--| |--| +active header |solid_6| |--| |--| |--| +underlined |solid_6| |label_5| |solid_7| |--| +select+inactive |solid_6| |label_5| |solid_7| |--| +lightselect |solid_6| |label_5| |solid_7| |--| +lightsel+inactive |solid_6| |label_5| |solid_7| |--| +hover |solid_6| |label_5| |solid_7| |--| +hover+inactive |solid_6| |label_5| |solid_7| |--| +action btn hover |solid_6| |--| |solid_7| |--| +button |solid_6| ± |label_7| |solid_7| ± |solid_2| +button default |cherry_5| ± |label_7| |cherry_3| ± |cherry_2| +accelerator |--| |label_4| |--| |--| +accelerator sel |--| |label_5| |--| |--| +error |--| |cherry_7| |--| |--| +tool btn selected |solid_6| |label_5| |--| |--| +tool btn hover |solid_6| |label_5| |--| |--| +_ACCENT |solid_7| |--| |--| |--| +focus |solid_4| |--| |cherry_6| |--| +btn focus |--| |--| |cherry_6| |--| +btn def focus |--| |--| |cherry_6| |--| +underline |cherry_7| |--| |--| |--| +underline+inactive |label_1| |--| |--| |--| +link |cherry_5| |--| |--| |--| +link hpver |cherry_6| |--| |--| |--| +================== ================ ========== ============= ============ + + +Editor scheme +================= + +Open `[XML] `_ + +.. |readonly_bg| replace:: `` +.. |select_bg| replace:: `` +.. |blame_bg_1| replace:: `` +.. |blame_bg_2| replace:: `` +.. |blame_bg_3| replace:: `` +.. |blame_bg_4| replace:: `` +.. |blame_bg_5| replace:: `` +.. |vcs_add_bg| replace:: `` +.. |vcs_iadd_bg| replace:: `` +.. |vcs_del_bg| replace:: `` +.. |vcs_idel_bg| replace:: `` +.. |vcs_mod_bg| replace:: `` +.. |vcs_imod_bg| replace:: `` +.. |vcs_wmod_bg| replace:: `` +.. |semantic_fg1| replace:: `` +.. |semantic_fg2| replace:: `` +.. |semantic_fg3| replace:: `` +.. |semantic_fg4| replace:: `` +.. |semantic_fg5| replace:: `` + +====================================== ============== +key value +====================================== ============== +READONLY_BACKGROUND |readonly_bg| +SELECTION_BACKGROUND |select_bg| +SELECTION_FOREGROUND |label_5| +\ +CARET_COLOR |label_8| +CARET_ROW_COLOR |solid_8| +CODE_LENS_BORDER_COLOR |label_3| +DIFF_SEPARATOR_WAVE |solid_8| +DOCUMENTATION_COLOR |solid_4| +GUTTER_BACKGROUND |solid_4| +HINT_BORDER |solid_7| +INDENT_GUIDE |solid_6| +INFORMATION_HINT |solid_3| +METHOD_SEPARATORS_COLOR |solid_6| +RIGHT_MARGIN_COLOR |solid_6| +SELECTED_INDENT_GUIDE |solid_8| +SELECTED_TEARLINE_COLOR |label_2| +SOFT_WRAP_SIGN_COLOR |label_4| +TEARLINE_COLOR |solid_8| +TEXT |label_5| +VISUAL_INDENT_GUIDE |solid_6| +\ +VCS_ANNOTATIONS_COLOR_1 |blame_bg_1| +VCS_ANNOTATIONS_COLOR_2 |blame_bg_2| +VCS_ANNOTATIONS_COLOR_3 |blame_bg_3| +VCS_ANNOTATIONS_COLOR_4 |blame_bg_4| +VCS_ANNOTATIONS_COLOR_5 |blame_bg_5| +\ +ADDED_LINES_COLOR |vcs_add_bg| +IGNORED_ADDED_LINES_BORDER_COLOR |vcs_iadd_bg| +DELETED_LINES_COLOR |vcs_del_bg| +IGNORED_DELETED_LINES_BORDER_COLOR |vcs_idel_bg| +MODIFIED_LINES_COLOR |vcs_mod_bg| +IGNORED_MODIFIED_LINES_BORDER_COLOR |vcs_imod_bg| +WHITESPACES_MODIFIED_LINES_COLOR |vcs_wmod_bg| +\ +RAINBOW_COLOR0 |semantic_fg1| +RAINBOW_COLOR1 |semantic_fg2| +RAINBOW_COLOR2 |semantic_fg3| +RAINBOW_COLOR3 |semantic_fg4| +RAINBOW_COLOR4 |semantic_fg5| +====================================== ============== + +.. |cov_full_bg| replace:: `` +.. |cov_part_bg| replace:: `` +.. |cov_none_bg| replace:: `` +.. |cov_none_es| replace:: `` + +.. |diff_conf_bg| replace:: `` +.. |diff_conf_fg| replace:: `` +.. |diff_conf_es| replace:: `` + +.. |diff_del_bg| replace:: `` +.. |diff_del_fg| replace:: `` +.. |diff_del_es| replace:: `` + +.. |diff_ins_bg| replace:: `` +.. |diff_ins_fg| replace:: `` +.. |diff_ins_es| replace:: `` + +.. |diff_mod_bg| replace:: `` +.. |diff_mod_fg| replace:: `` +.. |diff_mod_es| replace:: `` + +====================================== ============== ============== ================== +key bg color 1 bg color 2 error stripe color +====================================== ============== ============== ================== +LINE_FULL_COVERAGE |--| |cov_full_bg| |--| +LINE_NONE_COVERAGE |--| |cov_none_bg| |cov_none_es| +LINE_PARTIAL_COVERAGE |--| |cov_part_bg| |--| +\ +DIFF_CONFLICT |diff_conf_bg| |diff_conf_fg| |diff_conf_es| +DIFF_DELETED |diff_del_bg| |diff_del_fg| |diff_del_es| +DIFF_INSERTED |diff_ins_bg| |diff_ins_fg| |diff_ins_es| +DIFF_MODIFIED |diff_mod_bg| |diff_mod_fg| |diff_mod_es| +====================================== ============== ============== ================== + + + + + + + + + + + + + + + diff --git a/Solid-Cherry.scheme.xml b/Solid-Cherry.scheme.xml deleted file mode 120000 index c64595b..0000000 --- a/Solid-Cherry.scheme.xml +++ /dev/null @@ -1 +0,0 @@ -src/Solid_Cherry.iml \ No newline at end of file diff --git a/palette.json b/palette.json index 013513a..c375425 100644 --- a/palette.json +++ b/palette.json @@ -12,15 +12,15 @@ "solid_3": "#0f1011", "solid_4": "#131518", "solid_5": "#212325", - "solid_6": "#292A2B", + "solid_6": "#292a2b", "solid_7": "#2f3132", "solid_8": "#313233", "label_1": "#4d4e4e", "label_2": "#636265", - "label_3": "#7E8185", + "label_3": "#7e8185", "label_4": "#abb2bf", "label_5": "#cfd2d5", "label_6": "#d7dae0", "label_7": "#eef3ff", - "label_8": "#fdfdfd", + "label_8": "#fdfdfd" } \ No newline at end of file diff --git a/palette.yml b/palette.yml new file mode 100644 index 0000000..0538474 --- /dev/null +++ b/palette.yml @@ -0,0 +1,24 @@ +cherry_1: '#231515' +cherry_2: '#2c1d1f' +cherry_3: '#3d1c1f' +cherry_4: '#4c2526' +cherry_5: '#6e2a2c' +cherry_6: '#9f3334' +cherry_7: '#b73838' +cherry_8: '#e64252' +solid_1: '#010102' +solid_2: '#060709' +solid_3: '#0f1011' +solid_4: '#131518' +solid_5: '#212325' +solid_6: '#292a2b' +solid_7: '#2f3132' +solid_8: '#313233' +label_1: '#4d4e4e' +label_2: '#636265' +label_3: '#7e8185' +label_4: '#abb2bf' +label_5: '#cfd2d5' +label_6: '#d7dae0' +label_7: '#eef3ff' +label_8: '#fdfdfd' diff --git a/picking.rst b/picking.rst deleted file mode 100644 index 700609e..0000000 --- a/picking.rst +++ /dev/null @@ -1,45 +0,0 @@ -================= ================ ========== =========== ============ -subject bg fg border shadow -================= ================ ========== =========== ============ -disabled solid_2 label_1 solid_4 -- -textfield solid_3 -- -- -- -inactive solid_3 label_4 solid_7 -- -regular solid_4 label_4 solid_7 -- -active solid_5 label_5 solid_7 -- -action btn press solid_5 -- solid_6 -- -selection cherry_6\* label_5 solid_7 -- -active h+inactive solid_5 -- -- -- -popup solid_5 -- -- -- -active header solid_6 -- -- -- -underlined solid_6 label_5 solid_7 -- -select+inactive solid_6 label_5 solid_7 -- -lightselect solid_6 label_5 solid_7 -- -lightsel+inactive solid_6 label_5 solid_7 -- -hover solid_6 label_5 solid_7 -- -hover+inactive solid_6 label_5 solid_7 -- -action btn hover solid_6 -- solid_7 -- -button ±solid_6 label_7 ±solid_7 solid_2 -button default ±cherry_5 label_7 ±cherry_3 cherry_2 -accelerator -- label_4 -- -- -accelerator sel -- label_5 -- -- -error -- cherry_7 -- -- -tool btn selected solid_6 label_5 -- -- -tool btn hover solid_6 label_5 -- -- -_ACCENT solud 7 -- -- -- -================= ================ ========== =========== ============ - - \* solid_6 for tabs - ------ - -================== ================= ========= -subject color border -================== ================= ========= -focus solid_4 cherry_6 -btn focus -- cherry_6 -btn def focus -- cherry_6 -underline cherry_7 -- -underline+inactive label_1 -- -link cherry_5 -- -link hpver cherry_6 -- -================== ================= ========= diff --git a/src/META-INF/plugin.xml b/src/META-INF/plugin.xml index 0787de0..aae3202 100644 --- a/src/META-INF/plugin.xml +++ b/src/META-INF/plugin.xml @@ -1,7 +1,7 @@ link.dlup.solidCherryTheme Solid Cherry Theme - 1.0.6 + 1.1.0 Aleksandr Shavykin Go to Settings (Preferences) -> Plugins, find the theme plugin and install it
  • Restart IDE
  • Go to Settings (Preferences) -> Appearance & Behavior -> Appearance and see the Theme dropdown
    • +
  • + (optional) Go to Settings → Editor → Color Scheme and select Solid Cherry in Scheme + dropdown, which will correct several editor colors (e.g., git diff backgrounds) to the ones better matching + the theme (should be done automatically, but just in case) +
    • ]]>     1.1.0 +
      +
    • 🌱 NEW: add colors for editor popup backgrounds and semantic highlighting defaults. +

    1.0.6

    • 🐞 FIX: console bg set to transparent (=default bg)
      • diff --git a/src/Solid_Cherry.iml b/src/Solid_Cherry.iml index 5956019..3666c4c 100644 --- a/src/Solid_Cherry.iml +++ b/src/Solid_Cherry.iml @@ -1,27 +1,30 @@ 2023-03-10T18:30:48 - PhpStorm + Python 2022.3.2.0.0 - 2023-03-11T03:27:04 + 2023-03-16T12:35:52 Solid Cherry + + + + + +