From 92886236a210d312590fd6c5e072c9fdb1db421a Mon Sep 17 00:00:00 2001 From: Nate Butler Date: Thu, 27 Oct 2022 14:59:50 -0400 Subject: [PATCH 1/9] Refine editor styles - Update active line backgrounds and line numbers - Add a higher contrast border between the dock and panes --- styles/src/styleTree/editor.ts | 12 ++++++------ styles/src/styleTree/workspace.ts | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/styles/src/styleTree/editor.ts b/styles/src/styleTree/editor.ts index c94b6d81d2..c64105b337 100644 --- a/styles/src/styleTree/editor.ts +++ b/styles/src/styleTree/editor.ts @@ -137,7 +137,7 @@ export default function editor(colorScheme: ColorScheme) { return { textColor: syntax.primary.color, background: background(layer), - activeLineBackground: background(layer, "on"), + activeLineBackground: withOpacity(background(layer, "on"), 0.75), highlightedLineBackground: background(layer, "on"), codeActions: { indicator: foreground(layer, "variant"), @@ -162,7 +162,7 @@ export default function editor(colorScheme: ColorScheme) { errorColor: background(layer, "negative"), gutterBackground: background(layer), gutterPaddingFactor: 3.5, - lineNumber: foreground(layer, "disabled"), + lineNumber: withOpacity(foreground(layer), 0.35), lineNumberActive: foreground(layer), renameFade: 0.6, unnecessaryCodeFade: 0.5, @@ -261,17 +261,17 @@ export default function editor(colorScheme: ColorScheme) { }, }, scrollbar: { - width: 12, + width: 8, minHeightFactor: 1.0, track: { border: border(layer, "variant", { left: true }), }, thumb: { - background: withOpacity(borderColor(layer, "variant"), 0.5), + background: withOpacity(background(layer, "inverted"), 0.4), border: { width: 1, - color: withOpacity(borderColor(layer, 'variant'), 0.5), - } + color: borderColor(layer, 'variant'), + }, } }, compositionMark: { diff --git a/styles/src/styleTree/workspace.ts b/styles/src/styleTree/workspace.ts index 50ee0c26da..769ea85a00 100644 --- a/styles/src/styleTree/workspace.ts +++ b/styles/src/styleTree/workspace.ts @@ -219,7 +219,7 @@ export default function workspace(colorScheme: ColorScheme) { initialSizeBottom: 480, wash_color: withOpacity(background(colorScheme.highest), 0.5), panel: { - border: border(colorScheme.highest), + border: border(colorScheme.middle), }, maximized: { margin: 32, From 9148e1d30a5f76689ac18d93710c73bc07788557 Mon Sep 17 00:00:00 2001 From: Nate Butler Date: Fri, 28 Oct 2022 12:59:05 -0400 Subject: [PATCH 2/9] Update icons - `x_mark_thin` combined into `x_mark` - updated many icons - remove unused icons --- assets/icons/arrow_down_12.svg | 7 +++++++ assets/icons/arrow_down_16.svg | 2 +- assets/icons/arrow_down_8.svg | 7 +++++++ assets/icons/arrow_left_12.svg | 7 +++++++ assets/icons/arrow_left_16.svg | 2 +- assets/icons/arrow_left_8.svg | 7 +++++++ assets/icons/arrow_right_12.svg | 7 +++++++ assets/icons/arrow_right_8.svg | 7 +++++++ assets/icons/arrow_up_12.svg | 7 +++++++ assets/icons/arrow_up_8.svg | 7 +++++++ assets/icons/arrow_up_right_8.svg | 2 +- assets/icons/bolt_12.svg | 2 +- assets/icons/bolt_8.svg | 2 +- assets/icons/bolt_slash_12.svg | 9 ++++++++- assets/icons/bolt_slash_8.svg | 6 +++--- assets/icons/caret_down_8.svg | 9 ++++++++- assets/icons/caret_left_8.svg | 9 ++++++++- assets/icons/caret_right_8.svg | 9 ++++++++- assets/icons/caret_up_8.svg | 9 ++++++++- assets/icons/chevron_right_8.svg | 2 +- assets/icons/circle_check_12.svg | 7 +++++++ assets/icons/circle_check_8.svg | 7 +++++++ assets/icons/circle_info_12.svg | 7 +++++++ assets/icons/circle_info_8.svg | 7 +++++++ assets/icons/circle_up_12.svg | 7 +++++++ assets/icons/circle_up_8.svg | 7 +++++++ assets/icons/circle_x_mark_12.svg | 7 +++++++ assets/icons/circle_x_mark_8.svg | 7 +++++++ assets/icons/cloud_slash_12.svg | 2 +- assets/icons/cloud_slash_8.svg | 9 ++++++++- assets/icons/dock_bottom_12.svg | 9 ++++----- assets/icons/dock_bottom_8.svg | 4 ++-- assets/icons/dock_full_12.svg | 11 ----------- assets/icons/dock_full_8.svg | 13 ------------- assets/icons/dock_modal_12.svg | 9 ++++----- assets/icons/dock_modal_8.svg | 2 +- assets/icons/dock_right_12.svg | 9 ++++----- assets/icons/dock_right_8.svg | 4 ++-- assets/icons/folder_tree_12.svg | 7 +++++++ assets/icons/folder_tree_8.svg | 7 +++++++ assets/icons/git_diff_8.svg | 2 +- assets/icons/magnifying_glass_12.svg | 9 ++++++++- assets/icons/magnifying_glass_8.svg | 9 ++++++++- assets/icons/maximize_8.svg | 2 +- assets/icons/minimize_8.svg | 2 +- assets/icons/plus_12.svg | 9 ++++++++- assets/icons/plus_16.svg | 9 ++++++++- assets/icons/plus_8.svg | 9 ++++++++- assets/icons/split_12.svg | 9 ++++++++- assets/icons/terminal_12.svg | 7 +++++++ assets/icons/terminal_8.svg | 7 +++++++ assets/icons/triangle_exclamation_12.svg | 7 +++++++ assets/icons/triangle_exclamation_8.svg | 7 +++++++ assets/icons/unlock_8.svg | 7 +++++++ assets/icons/user_circle_12.svg | 7 +++++++ assets/icons/user_circle_8.svg | 9 ++++++++- assets/icons/user_group_12.svg | 2 +- assets/icons/user_group_8.svg | 9 ++++++++- assets/icons/user_plus_8.svg | 7 +++++++ assets/icons/x_mark_12.svg | 9 ++++++++- assets/icons/x_mark_16.svg | 11 +++++++++-- assets/icons/x_mark_8.svg | 9 ++++++++- assets/icons/x_mark_thin_8.svg | 3 --- crates/auto_update/src/update_notification.rs | 2 +- crates/collab_ui/src/notifications.rs | 2 +- crates/workspace/src/pane.rs | 4 ++-- 66 files changed, 347 insertions(+), 83 deletions(-) delete mode 100644 assets/icons/dock_full_12.svg delete mode 100644 assets/icons/dock_full_8.svg delete mode 100644 assets/icons/x_mark_thin_8.svg diff --git a/assets/icons/arrow_down_12.svg b/assets/icons/arrow_down_12.svg index 5d9a8ee5e3..dfad5d4876 100644 --- a/assets/icons/arrow_down_12.svg +++ b/assets/icons/arrow_down_12.svg @@ -1,3 +1,10 @@ + + + + + + + diff --git a/assets/icons/arrow_down_16.svg b/assets/icons/arrow_down_16.svg index 65114ebd60..ec757a8ab4 100644 --- a/assets/icons/arrow_down_16.svg +++ b/assets/icons/arrow_down_16.svg @@ -1,3 +1,3 @@ - + diff --git a/assets/icons/arrow_down_8.svg b/assets/icons/arrow_down_8.svg index 53d3c2944e..f70f3920a3 100644 --- a/assets/icons/arrow_down_8.svg +++ b/assets/icons/arrow_down_8.svg @@ -1,3 +1,10 @@ + + + + + + + diff --git a/assets/icons/arrow_left_12.svg b/assets/icons/arrow_left_12.svg index fc7cabc9c6..aaccf25eaf 100644 --- a/assets/icons/arrow_left_12.svg +++ b/assets/icons/arrow_left_12.svg @@ -1,3 +1,10 @@ + + + + + + + diff --git a/assets/icons/arrow_left_16.svg b/assets/icons/arrow_left_16.svg index 07a2db5348..317c31e9f0 100644 --- a/assets/icons/arrow_left_16.svg +++ b/assets/icons/arrow_left_16.svg @@ -1,3 +1,3 @@ - + diff --git a/assets/icons/arrow_left_8.svg b/assets/icons/arrow_left_8.svg index a6a7079dd5..e2071d55eb 100644 --- a/assets/icons/arrow_left_8.svg +++ b/assets/icons/arrow_left_8.svg @@ -1,3 +1,10 @@ + + + + + + + diff --git a/assets/icons/arrow_right_12.svg b/assets/icons/arrow_right_12.svg index 00dc3918fc..c5f70a4958 100644 --- a/assets/icons/arrow_right_12.svg +++ b/assets/icons/arrow_right_12.svg @@ -1,3 +1,10 @@ + + + + + + + diff --git a/assets/icons/arrow_right_8.svg b/assets/icons/arrow_right_8.svg index ef28fc81e5..fb3f836ef0 100644 --- a/assets/icons/arrow_right_8.svg +++ b/assets/icons/arrow_right_8.svg @@ -1,3 +1,10 @@ + + + + + + + diff --git a/assets/icons/arrow_up_12.svg b/assets/icons/arrow_up_12.svg index ae4cf92899..c9f35d868b 100644 --- a/assets/icons/arrow_up_12.svg +++ b/assets/icons/arrow_up_12.svg @@ -1,3 +1,10 @@ + + + + + + + diff --git a/assets/icons/arrow_up_8.svg b/assets/icons/arrow_up_8.svg index 9d3f76a894..0a1e2c44bf 100644 --- a/assets/icons/arrow_up_8.svg +++ b/assets/icons/arrow_up_8.svg @@ -1,3 +1,10 @@ + + + + + + + diff --git a/assets/icons/arrow_up_right_8.svg b/assets/icons/arrow_up_right_8.svg index c53175ea6b..3712b31ebd 100644 --- a/assets/icons/arrow_up_right_8.svg +++ b/assets/icons/arrow_up_right_8.svg @@ -1,3 +1,3 @@ - + diff --git a/assets/icons/bolt_12.svg b/assets/icons/bolt_12.svg index bf529dec33..0125c733e2 100644 --- a/assets/icons/bolt_12.svg +++ b/assets/icons/bolt_12.svg @@ -1,3 +1,3 @@ - + diff --git a/assets/icons/bolt_8.svg b/assets/icons/bolt_8.svg index 2e431a0df1..543e72adf8 100644 --- a/assets/icons/bolt_8.svg +++ b/assets/icons/bolt_8.svg @@ -1,3 +1,3 @@ - + diff --git a/assets/icons/bolt_slash_12.svg b/assets/icons/bolt_slash_12.svg index c5d4a1c828..80d99be616 100644 --- a/assets/icons/bolt_slash_12.svg +++ b/assets/icons/bolt_slash_12.svg @@ -1,3 +1,10 @@ - + + + + + + + + diff --git a/assets/icons/bolt_slash_8.svg b/assets/icons/bolt_slash_8.svg index 14a22ab8cd..3781a91299 100644 --- a/assets/icons/bolt_slash_8.svg +++ b/assets/icons/bolt_slash_8.svg @@ -1,9 +1,9 @@ - - + + - + diff --git a/assets/icons/caret_down_8.svg b/assets/icons/caret_down_8.svg index 10bd20eb7f..932376d6f8 100644 --- a/assets/icons/caret_down_8.svg +++ b/assets/icons/caret_down_8.svg @@ -1,3 +1,10 @@ - + + + + + + + + diff --git a/assets/icons/caret_left_8.svg b/assets/icons/caret_left_8.svg index c02a5f3468..1b04877a31 100644 --- a/assets/icons/caret_left_8.svg +++ b/assets/icons/caret_left_8.svg @@ -1,3 +1,10 @@ - + + + + + + + + diff --git a/assets/icons/caret_right_8.svg b/assets/icons/caret_right_8.svg index 9a3f2166ef..d1350ee809 100644 --- a/assets/icons/caret_right_8.svg +++ b/assets/icons/caret_right_8.svg @@ -1,3 +1,10 @@ - + + + + + + + + diff --git a/assets/icons/caret_up_8.svg b/assets/icons/caret_up_8.svg index 24c2db5129..bf79244d7d 100644 --- a/assets/icons/caret_up_8.svg +++ b/assets/icons/caret_up_8.svg @@ -1,3 +1,10 @@ - + + + + + + + + diff --git a/assets/icons/chevron_right_8.svg b/assets/icons/chevron_right_8.svg index 64910c54e7..7349274681 100644 --- a/assets/icons/chevron_right_8.svg +++ b/assets/icons/chevron_right_8.svg @@ -1,3 +1,3 @@ - + diff --git a/assets/icons/circle_check_12.svg b/assets/icons/circle_check_12.svg index 0fbb051b84..cb28c8a051 100644 --- a/assets/icons/circle_check_12.svg +++ b/assets/icons/circle_check_12.svg @@ -1,3 +1,10 @@ + + + + + + + diff --git a/assets/icons/circle_check_8.svg b/assets/icons/circle_check_8.svg index b4d4d9e624..c4150f058c 100644 --- a/assets/icons/circle_check_8.svg +++ b/assets/icons/circle_check_8.svg @@ -1,3 +1,10 @@ + + + + + + + diff --git a/assets/icons/circle_info_12.svg b/assets/icons/circle_info_12.svg index eec07e0abf..26a569737d 100644 --- a/assets/icons/circle_info_12.svg +++ b/assets/icons/circle_info_12.svg @@ -1,3 +1,10 @@ + + + + + + + diff --git a/assets/icons/circle_info_8.svg b/assets/icons/circle_info_8.svg index 1d7ac77dd2..49bb03224d 100644 --- a/assets/icons/circle_info_8.svg +++ b/assets/icons/circle_info_8.svg @@ -1,3 +1,10 @@ + + + + + + + diff --git a/assets/icons/circle_up_12.svg b/assets/icons/circle_up_12.svg index c4b9677289..4236037fbd 100644 --- a/assets/icons/circle_up_12.svg +++ b/assets/icons/circle_up_12.svg @@ -1,3 +1,10 @@ + + + + + + + diff --git a/assets/icons/circle_up_8.svg b/assets/icons/circle_up_8.svg index 17abd30214..e08e0ad492 100644 --- a/assets/icons/circle_up_8.svg +++ b/assets/icons/circle_up_8.svg @@ -1,3 +1,10 @@ + + + + + + + diff --git a/assets/icons/circle_x_mark_12.svg b/assets/icons/circle_x_mark_12.svg index c648431dd4..5f11a71ece 100644 --- a/assets/icons/circle_x_mark_12.svg +++ b/assets/icons/circle_x_mark_12.svg @@ -1,3 +1,10 @@ + + + + + + + diff --git a/assets/icons/circle_x_mark_8.svg b/assets/icons/circle_x_mark_8.svg index f1323b9589..a0acfc3899 100644 --- a/assets/icons/circle_x_mark_8.svg +++ b/assets/icons/circle_x_mark_8.svg @@ -1,3 +1,10 @@ + + + + + + + diff --git a/assets/icons/cloud_slash_12.svg b/assets/icons/cloud_slash_12.svg index adb60d2c27..37d0ee904c 100644 --- a/assets/icons/cloud_slash_12.svg +++ b/assets/icons/cloud_slash_12.svg @@ -1,3 +1,3 @@ - + diff --git a/assets/icons/cloud_slash_8.svg b/assets/icons/cloud_slash_8.svg index 9b7f0011b2..785ded0683 100644 --- a/assets/icons/cloud_slash_8.svg +++ b/assets/icons/cloud_slash_8.svg @@ -1,3 +1,10 @@ - + + + + + + + + diff --git a/assets/icons/dock_bottom_12.svg b/assets/icons/dock_bottom_12.svg index 865162897f..a8099443be 100644 --- a/assets/icons/dock_bottom_12.svg +++ b/assets/icons/dock_bottom_12.svg @@ -1,11 +1,10 @@ - - - - + + + - + diff --git a/assets/icons/dock_bottom_8.svg b/assets/icons/dock_bottom_8.svg index 96fff05511..005ac423ad 100644 --- a/assets/icons/dock_bottom_8.svg +++ b/assets/icons/dock_bottom_8.svg @@ -1,7 +1,7 @@ - - + + diff --git a/assets/icons/dock_full_12.svg b/assets/icons/dock_full_12.svg deleted file mode 100644 index adcf970b07..0000000000 --- a/assets/icons/dock_full_12.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/assets/icons/dock_full_8.svg b/assets/icons/dock_full_8.svg deleted file mode 100644 index d38f599362..0000000000 --- a/assets/icons/dock_full_8.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/assets/icons/dock_modal_12.svg b/assets/icons/dock_modal_12.svg index 2718040987..792baee49c 100644 --- a/assets/icons/dock_modal_12.svg +++ b/assets/icons/dock_modal_12.svg @@ -1,11 +1,10 @@ - - - - + + + - + diff --git a/assets/icons/dock_modal_8.svg b/assets/icons/dock_modal_8.svg index 778b899217..c6f4039004 100644 --- a/assets/icons/dock_modal_8.svg +++ b/assets/icons/dock_modal_8.svg @@ -1,6 +1,6 @@ - + diff --git a/assets/icons/dock_right_12.svg b/assets/icons/dock_right_12.svg index f3ac095405..84cc1a0c2b 100644 --- a/assets/icons/dock_right_12.svg +++ b/assets/icons/dock_right_12.svg @@ -1,11 +1,10 @@ - - - - + + + - + diff --git a/assets/icons/dock_right_8.svg b/assets/icons/dock_right_8.svg index e19bc45cc7..842f41bc8c 100644 --- a/assets/icons/dock_right_8.svg +++ b/assets/icons/dock_right_8.svg @@ -1,7 +1,7 @@ - - + + diff --git a/assets/icons/folder_tree_12.svg b/assets/icons/folder_tree_12.svg index f11253aa4a..580514f74d 100644 --- a/assets/icons/folder_tree_12.svg +++ b/assets/icons/folder_tree_12.svg @@ -1,3 +1,10 @@ + + + + + + + diff --git a/assets/icons/folder_tree_8.svg b/assets/icons/folder_tree_8.svg index 758080a611..07ac18e19f 100644 --- a/assets/icons/folder_tree_8.svg +++ b/assets/icons/folder_tree_8.svg @@ -1,3 +1,10 @@ + + + + + + + diff --git a/assets/icons/git_diff_8.svg b/assets/icons/git_diff_8.svg index 8f036de090..64290de860 100644 --- a/assets/icons/git_diff_8.svg +++ b/assets/icons/git_diff_8.svg @@ -1,6 +1,6 @@ - + diff --git a/assets/icons/magnifying_glass_12.svg b/assets/icons/magnifying_glass_12.svg index 0ee5e24b24..b9ac5d35b2 100644 --- a/assets/icons/magnifying_glass_12.svg +++ b/assets/icons/magnifying_glass_12.svg @@ -1,3 +1,10 @@ - + + + + + + + + diff --git a/assets/icons/magnifying_glass_8.svg b/assets/icons/magnifying_glass_8.svg index 958614203c..d0deb1cdba 100644 --- a/assets/icons/magnifying_glass_8.svg +++ b/assets/icons/magnifying_glass_8.svg @@ -1,3 +1,10 @@ - + + + + + + + + diff --git a/assets/icons/maximize_8.svg b/assets/icons/maximize_8.svg index 72fbc95421..76d29a9d22 100644 --- a/assets/icons/maximize_8.svg +++ b/assets/icons/maximize_8.svg @@ -1,6 +1,6 @@ - + diff --git a/assets/icons/minimize_8.svg b/assets/icons/minimize_8.svg index 58a45811e4..b511cbd355 100644 --- a/assets/icons/minimize_8.svg +++ b/assets/icons/minimize_8.svg @@ -1,6 +1,6 @@ - + diff --git a/assets/icons/plus_12.svg b/assets/icons/plus_12.svg index 7997c97c06..f1770fa248 100644 --- a/assets/icons/plus_12.svg +++ b/assets/icons/plus_12.svg @@ -1,3 +1,10 @@ - + + + + + + + + diff --git a/assets/icons/plus_16.svg b/assets/icons/plus_16.svg index 1fa008ac64..c595cf597a 100644 --- a/assets/icons/plus_16.svg +++ b/assets/icons/plus_16.svg @@ -1,3 +1,10 @@ - + + + + + + + + diff --git a/assets/icons/plus_8.svg b/assets/icons/plus_8.svg index 9abfd46744..72efa1574e 100644 --- a/assets/icons/plus_8.svg +++ b/assets/icons/plus_8.svg @@ -1,3 +1,10 @@ - + + + + + + + + diff --git a/assets/icons/split_12.svg b/assets/icons/split_12.svg index 8aeb3bcb4c..e4cf1921fa 100644 --- a/assets/icons/split_12.svg +++ b/assets/icons/split_12.svg @@ -1,5 +1,12 @@ + - + + + + + + + diff --git a/assets/icons/terminal_12.svg b/assets/icons/terminal_12.svg index 4c44e657e8..9d5a9447b5 100644 --- a/assets/icons/terminal_12.svg +++ b/assets/icons/terminal_12.svg @@ -1,3 +1,10 @@ + + + + + + + diff --git a/assets/icons/terminal_8.svg b/assets/icons/terminal_8.svg index f3e26f12f9..b09495dcf9 100644 --- a/assets/icons/terminal_8.svg +++ b/assets/icons/terminal_8.svg @@ -1,3 +1,10 @@ + + + + + + + diff --git a/assets/icons/triangle_exclamation_12.svg b/assets/icons/triangle_exclamation_12.svg index b06707e924..f87d365bdf 100644 --- a/assets/icons/triangle_exclamation_12.svg +++ b/assets/icons/triangle_exclamation_12.svg @@ -1,3 +1,10 @@ + + + + + + + diff --git a/assets/icons/triangle_exclamation_8.svg b/assets/icons/triangle_exclamation_8.svg index 166a62e532..96f11015b1 100644 --- a/assets/icons/triangle_exclamation_8.svg +++ b/assets/icons/triangle_exclamation_8.svg @@ -1,3 +1,10 @@ + + + + + + + diff --git a/assets/icons/unlock_8.svg b/assets/icons/unlock_8.svg index d358182795..7a40f94345 100644 --- a/assets/icons/unlock_8.svg +++ b/assets/icons/unlock_8.svg @@ -1,3 +1,10 @@ + + + + + + + diff --git a/assets/icons/user_circle_12.svg b/assets/icons/user_circle_12.svg index eec0954ba0..8631c36fd6 100644 --- a/assets/icons/user_circle_12.svg +++ b/assets/icons/user_circle_12.svg @@ -1,3 +1,10 @@ + + + + + + + diff --git a/assets/icons/user_circle_8.svg b/assets/icons/user_circle_8.svg index 7c884eec39..304001d546 100644 --- a/assets/icons/user_circle_8.svg +++ b/assets/icons/user_circle_8.svg @@ -1,3 +1,10 @@ - + + + + + + + + diff --git a/assets/icons/user_group_12.svg b/assets/icons/user_group_12.svg index 13ed0b12e4..5eae1d55b7 100644 --- a/assets/icons/user_group_12.svg +++ b/assets/icons/user_group_12.svg @@ -1,3 +1,3 @@ - + diff --git a/assets/icons/user_group_8.svg b/assets/icons/user_group_8.svg index 9cf29f6e15..69d08b0d3b 100644 --- a/assets/icons/user_group_8.svg +++ b/assets/icons/user_group_8.svg @@ -1,3 +1,10 @@ - + + + + + + + + diff --git a/assets/icons/user_plus_8.svg b/assets/icons/user_plus_8.svg index 6b7179a139..100b43af86 100644 --- a/assets/icons/user_plus_8.svg +++ b/assets/icons/user_plus_8.svg @@ -1,3 +1,10 @@ + + + + + + + diff --git a/assets/icons/x_mark_12.svg b/assets/icons/x_mark_12.svg index aaa97312ac..1c95f979d0 100644 --- a/assets/icons/x_mark_12.svg +++ b/assets/icons/x_mark_12.svg @@ -1,3 +1,10 @@ - + + + + + + + + diff --git a/assets/icons/x_mark_16.svg b/assets/icons/x_mark_16.svg index a33adcc403..21a7f1c210 100644 --- a/assets/icons/x_mark_16.svg +++ b/assets/icons/x_mark_16.svg @@ -1,3 +1,10 @@ - - + + + + + + + + + diff --git a/assets/icons/x_mark_8.svg b/assets/icons/x_mark_8.svg index ef81658d61..f724b1515e 100644 --- a/assets/icons/x_mark_8.svg +++ b/assets/icons/x_mark_8.svg @@ -1,3 +1,10 @@ - + + + + + + + + diff --git a/assets/icons/x_mark_thin_8.svg b/assets/icons/x_mark_thin_8.svg deleted file mode 100644 index e5aa1b36e3..0000000000 --- a/assets/icons/x_mark_thin_8.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/crates/auto_update/src/update_notification.rs b/crates/auto_update/src/update_notification.rs index 19faca24a0..7e0ce07f02 100644 --- a/crates/auto_update/src/update_notification.rs +++ b/crates/auto_update/src/update_notification.rs @@ -55,7 +55,7 @@ impl View for UpdateNotification { .with_child( MouseEventHandler::::new(0, cx, |state, _| { let style = theme.dismiss_button.style_for(state, false); - Svg::new("icons/x_mark_thin_8.svg") + Svg::new("icons/x_mark_8.svg") .with_color(style.color) .constrained() .with_width(style.icon_width) diff --git a/crates/collab_ui/src/notifications.rs b/crates/collab_ui/src/notifications.rs index dcb9894006..1e0574de95 100644 --- a/crates/collab_ui/src/notifications.rs +++ b/crates/collab_ui/src/notifications.rs @@ -52,7 +52,7 @@ pub fn render_user_notification( .with_child( MouseEventHandler::::new(user.id as usize, cx, |state, _| { let style = theme.dismiss_button.style_for(state, false); - Svg::new("icons/x_mark_thin_8.svg") + Svg::new("icons/x_mark_8.svg") .with_color(style.color) .constrained() .with_width(style.icon_width) diff --git a/crates/workspace/src/pane.rs b/crates/workspace/src/pane.rs index 651afce1c6..e703922dcb 100644 --- a/crates/workspace/src/pane.rs +++ b/crates/workspace/src/pane.rs @@ -1261,7 +1261,7 @@ impl Pane { ConstrainedBox::new(if hovered { let item_id = item.id(); enum TabCloseButton {} - let icon = Svg::new("icons/x_mark_thin_8.svg"); + let icon = Svg::new("icons/x_mark_8.svg"); MouseEventHandler::::new(item_id, cx, |mouse_state, _| { if mouse_state.hovered() { icon.with_color(tab_style.icon_close_active).boxed() @@ -1324,7 +1324,7 @@ impl Pane { // Add the close dock button if this pane is a dock .with_children( self.docked - .map(|_| tab_bar_button(3, "icons/x_mark_thin_8.svg", cx, |_| HideDock)), + .map(|_| tab_bar_button(3, "icons/x_mark_8.svg", cx, |_| HideDock)), ) .contained() .with_style(theme.workspace.tab_bar.pane_button_container) From 552ebc0f290655435d863c87024e36704e6ef451 Mon Sep 17 00:00:00 2001 From: Mikayla Maki Date: Fri, 28 Oct 2022 10:45:45 -0700 Subject: [PATCH 3/9] Implemented direct styling for ignored and cut project panel entries --- crates/db/test-db.db | Bin 0 -> 57344 bytes crates/project_panel/src/project_panel.rs | 22 ++++++---- crates/theme/src/theme.rs | 5 ++- styles/src/styleTree/components.ts | 4 +- styles/src/styleTree/projectPanel.ts | 51 ++++++++++++++-------- 5 files changed, 51 insertions(+), 31 deletions(-) create mode 100644 crates/db/test-db.db diff --git a/crates/db/test-db.db b/crates/db/test-db.db new file mode 100644 index 0000000000000000000000000000000000000000..26ea1d32a3b79e8d605aa580ce7597025fc8d7ca GIT binary patch literal 57344 zcmWFz^vNtqRY=P(%1ta$FlG>7U}R))P*7lCU|?imVBljw01%%A!3E1RBk{2@85#8A zrFi*&Fz_>lgNO%r{u~W79e+HW~t>AwX^jG^g;e ziz_NJwhNaeCgr525ATy-`htUB+p1zJjkqX|f zkqR2fPSJrl6l$xE0@MOcu!G$EgIqn`{Xn`Js0 zg40HNQGRIwByk`yxlvLFk_6Go0~$v-Vi@EsDyIynh4fAoP-{`r130`=Q{q8##Tpgu(F7+cB<)B{4wQgKl7Iv=%pQuuxgfD9HLoNdY!=KQ9R*!oa6P7w znU|88oLG`ttWc7XSfWspky)&eS*(z#P?VovqL7!Lk_xU^5-T!`(UL022-m#QTq^|y z^{~{UlFa199CZbK1$B@7qRguNypqHmb+BIKpoOPeaOhE~QbP72MRC>?!Uk?Lv=oEm z3|wP?A_dZB0JGRpVho`I5@B#Ya=Iobb0p>^XXF>f7vvXbmSpDV;S73pr~HzV{9JIj z2W6&blz>^T6$OcTDXA%t@Gr|O&P>Wlg~dIhumQ!OQ+|FL_0%qdNU$ieCgxPAIeY~s$c zxIzAut*O zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0`L$Ro&Sdi#VBJm1V%$(Gz3ONU^E0qLtr!n zMnhmU1V%$(Gz3ONU^E1VZ3v9^|A%eVj(Th~1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$( zGz3ONU^E2aAu!tihX=(dV>ARtLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1cq%0 zjQ0PBZPbo>Y%~N$Ltr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1mGbs+W&_K#VBJm z1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E1VZ3v8>|37S_cGP2|Aut*OqaiRF z0;3@?8UmvsFd71*Aut*OqaiRF0;3@S4}sD7e|S)gGDbsSGz3ONU^E0qLtr!nMnhmU z1V%$(Gz3ONU^E0qLtxm3!07z{u#MVLkBx@FXb6mkz-S1JhQMeDjE2By2#kinXb6mk Mz-S1Jh5$SS01M{KXaE2J literal 0 HcmV?d00001 diff --git a/crates/project_panel/src/project_panel.rs b/crates/project_panel/src/project_panel.rs index b5d1d0caa3..5f1e07aa21 100644 --- a/crates/project_panel/src/project_panel.rs +++ b/crates/project_panel/src/project_panel.rs @@ -1015,15 +1015,19 @@ impl ProjectPanel { let show_editor = details.is_editing && !details.is_processing; MouseEventHandler::::new(entry_id.to_usize(), cx, |state, cx| { let padding = theme.container.padding.left + details.depth as f32 * theme.indent_width; - let mut style = theme.entry.style_for(state, details.is_selected).clone(); - if details.is_ignored { - style.text.color.fade_out(theme.ignored_entry_fade); - style.icon_color.fade_out(theme.ignored_entry_fade); - } - if details.is_cut { - style.text.color.fade_out(theme.cut_entry_fade); - style.icon_color.fade_out(theme.cut_entry_fade); - } + + let entry_style = if details.is_ignored && details.is_cut { + &theme.ignored_and_cut_entry + } else if details.is_ignored { + &theme.ignored_entry + } else if details.is_cut { + &theme.cut_entry + } else { + &theme.entry + }; + + let style = entry_style.style_for(state, details.is_selected).clone(); + let row_container_style = if show_editor { theme.filename_editor.container } else { diff --git a/crates/theme/src/theme.rs b/crates/theme/src/theme.rs index 9cd378cb52..c1757cb022 100644 --- a/crates/theme/src/theme.rs +++ b/crates/theme/src/theme.rs @@ -326,8 +326,9 @@ pub struct ProjectPanel { #[serde(flatten)] pub container: ContainerStyle, pub entry: Interactive, - pub cut_entry_fade: f32, - pub ignored_entry_fade: f32, + pub ignored_entry: Interactive, + pub cut_entry: Interactive, + pub ignored_and_cut_entry: Interactive, pub filename_editor: FieldEditor, pub indent_width: f32, } diff --git a/styles/src/styleTree/components.ts b/styles/src/styleTree/components.ts index 7776c4f14f..3244e7e4ea 100644 --- a/styles/src/styleTree/components.ts +++ b/styles/src/styleTree/components.ts @@ -89,6 +89,7 @@ interface TextProperties { size?: keyof typeof fontSizes; weight?: FontWeight; underline?: boolean; + color?: string; } export function text( @@ -132,11 +133,12 @@ export function text( } let size = fontSizes[properties?.size || "sm"]; + let color = properties?.color || style.foreground; return { family: fontFamilies[fontFamily], - color: style.foreground, ...properties, + color, size, }; } diff --git a/styles/src/styleTree/projectPanel.ts b/styles/src/styleTree/projectPanel.ts index 9b906c893f..49c7f048c4 100644 --- a/styles/src/styleTree/projectPanel.ts +++ b/styles/src/styleTree/projectPanel.ts @@ -3,30 +3,43 @@ import { background, foreground, text } from "./components"; export default function projectPanel(colorScheme: ColorScheme) { let layer = colorScheme.middle; + + let entry = { + height: 24, + iconColor: foreground(layer, "variant"), + iconSize: 8, + iconSpacing: 8, + text: text(layer, "mono", "variant", { size: "sm" }), + hover: { + background: background(layer, "variant", "hovered"), + }, + active: { + background: background(layer, "active"), + text: text(layer, "mono", "active", { size: "sm" }), + }, + activeHover: { + background: background(layer, "active"), + text: text(layer, "mono", "active", { size: "sm" }), + }, + }; + return { background: background(layer), padding: { left: 12, right: 12, top: 6, bottom: 6 }, indentWidth: 8, - entry: { - height: 24, - iconColor: foreground(layer, "variant"), - iconSize: 8, - iconSpacing: 8, - text: text(layer, "mono", "variant", { size: "sm" }), - hover: { - background: background(layer, "variant", "hovered"), - }, - active: { - background: background(layer, "active"), - text: text(layer, "mono", "active", { size: "sm" }), - }, - activeHover: { - background: background(layer, "active"), - text: text(layer, "mono", "active", { size: "sm" }), - }, + entry, + ignoredEntry: { + ...entry, + text: text(layer, "mono", "variant", { color: "#ff00cc" }), + }, + cutEntry: { + ...entry, + text: text(layer, "mono", "variant", { color: "#ff00cc" }), + }, + ignoredAndCutEntry: { + ...entry, + text: text(layer, "mono", "variant", { color: "#ffb700" }), }, - cutEntryFade: 0.4, - ignoredEntryFade: 0.6, filenameEditor: { background: background(layer, "on"), text: text(layer, "mono", "on", { size: "sm" }), From 8b7e587467647b6abdab6352390b534b17ab1457 Mon Sep 17 00:00:00 2001 From: Mikayla Maki Date: Fri, 28 Oct 2022 10:48:54 -0700 Subject: [PATCH 4/9] Removed stray test file --- crates/db/test-db.db | Bin 57344 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 crates/db/test-db.db diff --git a/crates/db/test-db.db b/crates/db/test-db.db deleted file mode 100644 index 26ea1d32a3b79e8d605aa580ce7597025fc8d7ca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 57344 zcmWFz^vNtqRY=P(%1ta$FlG>7U}R))P*7lCU|?imVBljw01%%A!3E1RBk{2@85#8A zrFi*&Fz_>lgNO%r{u~W79e+HW~t>AwX^jG^g;e ziz_NJwhNaeCgr525ATy-`htUB+p1zJjkqX|f zkqR2fPSJrl6l$xE0@MOcu!G$EgIqn`{Xn`Js0 zg40HNQGRIwByk`yxlvLFk_6Go0~$v-Vi@EsDyIynh4fAoP-{`r130`=Q{q8##Tpgu(F7+cB<)B{4wQgKl7Iv=%pQuuxgfD9HLoNdY!=KQ9R*!oa6P7w znU|88oLG`ttWc7XSfWspky)&eS*(z#P?VovqL7!Lk_xU^5-T!`(UL022-m#QTq^|y z^{~{UlFa199CZbK1$B@7qRguNypqHmb+BIKpoOPeaOhE~QbP72MRC>?!Uk?Lv=oEm z3|wP?A_dZB0JGRpVho`I5@B#Ya=Iobb0p>^XXF>f7vvXbmSpDV;S73pr~HzV{9JIj z2W6&blz>^T6$OcTDXA%t@Gr|O&P>Wlg~dIhumQ!OQ+|FL_0%qdNU$ieCgxPAIeY~s$c zxIzAut*O zqaiRF0;3@?8UmvsFd71*Aut*OqaiRF0`L$Ro&Sdi#VBJm1V%$(Gz3ONU^E0qLtr!n zMnhmU1V%$(Gz3ONU^E1VZ3v9^|A%eVj(Th~1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$( zGz3ONU^E2aAu!tihX=(dV>ARtLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1cq%0 zjQ0PBZPbo>Y%~N$Ltr!nMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1mGbs+W&_K#VBJm z1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E1VZ3v8>|37S_cGP2|Aut*OqaiRF z0;3@?8UmvsFd71*Aut*OqaiRF0;3@S4}sD7e|S)gGDbsSGz3ONU^E0qLtr!nMnhmU z1V%$(Gz3ONU^E0qLtxm3!07z{u#MVLkBx@FXb6mkz-S1JhQMeDjE2By2#kinXb6mk Mz-S1Jh5$SS01M{KXaE2J From dbc804669cc776a7d2c49addee9d00dbc13b5229 Mon Sep 17 00:00:00 2001 From: Nate Butler Date: Mon, 31 Oct 2022 10:30:58 -0400 Subject: [PATCH 5/9] Update ignored, cut entry styles in the project panel --- styles/src/styleTree/projectPanel.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/styles/src/styleTree/projectPanel.ts b/styles/src/styleTree/projectPanel.ts index 49c7f048c4..701c913c9f 100644 --- a/styles/src/styleTree/projectPanel.ts +++ b/styles/src/styleTree/projectPanel.ts @@ -30,15 +30,15 @@ export default function projectPanel(colorScheme: ColorScheme) { entry, ignoredEntry: { ...entry, - text: text(layer, "mono", "variant", { color: "#ff00cc" }), + text: text(layer, "mono", "disabled"), }, cutEntry: { ...entry, - text: text(layer, "mono", "variant", { color: "#ff00cc" }), + text: text(layer, "mono", "disabled"), }, ignoredAndCutEntry: { ...entry, - text: text(layer, "mono", "variant", { color: "#ffb700" }), + text: text(layer, "mono", "disabled"), }, filenameEditor: { background: background(layer, "on"), From ea9b009a22ab5544fb5ea0d2e59cc8049f3a14b8 Mon Sep 17 00:00:00 2001 From: Mikayla Maki Date: Mon, 31 Oct 2022 09:55:52 -0700 Subject: [PATCH 6/9] Fixed bug with cut entry active states --- crates/project_panel/src/project_panel.rs | 6 ++---- crates/theme/src/theme.rs | 1 - styles/src/styleTree/projectPanel.ts | 8 ++++---- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/crates/project_panel/src/project_panel.rs b/crates/project_panel/src/project_panel.rs index 5f1e07aa21..8f5d9b0e55 100644 --- a/crates/project_panel/src/project_panel.rs +++ b/crates/project_panel/src/project_panel.rs @@ -1016,12 +1016,10 @@ impl ProjectPanel { MouseEventHandler::::new(entry_id.to_usize(), cx, |state, cx| { let padding = theme.container.padding.left + details.depth as f32 * theme.indent_width; - let entry_style = if details.is_ignored && details.is_cut { - &theme.ignored_and_cut_entry + let entry_style = if details.is_cut { + &theme.cut_entry } else if details.is_ignored { &theme.ignored_entry - } else if details.is_cut { - &theme.cut_entry } else { &theme.entry }; diff --git a/crates/theme/src/theme.rs b/crates/theme/src/theme.rs index c1757cb022..97c0b0a79d 100644 --- a/crates/theme/src/theme.rs +++ b/crates/theme/src/theme.rs @@ -328,7 +328,6 @@ pub struct ProjectPanel { pub entry: Interactive, pub ignored_entry: Interactive, pub cut_entry: Interactive, - pub ignored_and_cut_entry: Interactive, pub filename_editor: FieldEditor, pub indent_width: f32, } diff --git a/styles/src/styleTree/projectPanel.ts b/styles/src/styleTree/projectPanel.ts index 701c913c9f..729150fbc7 100644 --- a/styles/src/styleTree/projectPanel.ts +++ b/styles/src/styleTree/projectPanel.ts @@ -35,10 +35,10 @@ export default function projectPanel(colorScheme: ColorScheme) { cutEntry: { ...entry, text: text(layer, "mono", "disabled"), - }, - ignoredAndCutEntry: { - ...entry, - text: text(layer, "mono", "disabled"), + active: { + background: background(layer, "active"), + text: text(layer, "mono", "disabled", { size: "sm" }), + }, }, filenameEditor: { background: background(layer, "on"), From 37ca2325486fe28b5aafb2967c59924013728ee9 Mon Sep 17 00:00:00 2001 From: Mikayla Maki Date: Mon, 31 Oct 2022 10:02:17 -0700 Subject: [PATCH 7/9] Remove annoyoing debug --- crates/editor/src/blink_manager.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/crates/editor/src/blink_manager.rs b/crates/editor/src/blink_manager.rs index df66ec2125..681692f0f5 100644 --- a/crates/editor/src/blink_manager.rs +++ b/crates/editor/src/blink_manager.rs @@ -71,7 +71,6 @@ impl BlinkManager { if epoch == self.blink_epoch && self.enabled && !self.blinking_paused { self.visible = !self.visible; cx.notify(); - dbg!(cx.handle()); let epoch = self.next_blink_epoch(); let interval = self.blink_interval; From 1820be499045d567fa8344293a8e99ee96d1a841 Mon Sep 17 00:00:00 2001 From: Mikayla Maki Date: Mon, 31 Oct 2022 10:19:06 -0700 Subject: [PATCH 8/9] Adds a little spacing between the share button and the screenshare icon --- crates/collab_ui/src/collab_titlebar_item.rs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/crates/collab_ui/src/collab_titlebar_item.rs b/crates/collab_ui/src/collab_titlebar_item.rs index 658ca26425..ab414e051b 100644 --- a/crates/collab_ui/src/collab_titlebar_item.rs +++ b/crates/collab_ui/src/collab_titlebar_item.rs @@ -54,6 +54,7 @@ impl View for CollabTitlebarItem { let theme = cx.global::().theme.clone(); let mut container = Flex::row(); + container.add_children(self.render_toggle_screen_sharing_button(&theme, cx)); if workspace.read(cx).client().status().borrow().is_connected() { @@ -324,6 +325,8 @@ impl CollabTitlebarItem { cx, ) .aligned() + .contained() + .with_margin_left(theme.workspace.titlebar.avatar_margin) .boxed() } From 7981cd45ed539fe0aa6f3bc71dcaffe61c1cb3b3 Mon Sep 17 00:00:00 2001 From: Nate Butler Date: Wed, 2 Nov 2022 09:58:15 -0400 Subject: [PATCH 9/9] Increase scrollbar width --- styles/src/styleTree/editor.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/styles/src/styleTree/editor.ts b/styles/src/styleTree/editor.ts index c64105b337..82e6dfff90 100644 --- a/styles/src/styleTree/editor.ts +++ b/styles/src/styleTree/editor.ts @@ -261,7 +261,7 @@ export default function editor(colorScheme: ColorScheme) { }, }, scrollbar: { - width: 8, + width: 12, minHeightFactor: 1.0, track: { border: border(layer, "variant", { left: true }),