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 c94b6d81d214967d24b1752e16fc4dca13f858c9..c64105b33719bcd7d2ee8d46fd64f41b7f621c8f 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 50ee0c26da747be4e4c405d0390112957c7eca23..769ea85a00276cc410b3165b326e4360e59f59f2 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 5d9a8ee5e374884b64ddd82c2f808adb6681e444..dfad5d4876fcd53732c57170e70e70b618a5405b 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 65114ebd604f2b76796676b2eab0abb81e8b82f1..ec757a8ab40bf3f0f3a9a2234b2f41f6e2b8ac4f 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 53d3c2944e49c690b22eff59bc901133228d0e3f..f70f3920a308fefd33fabf506315c74160e153cc 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 fc7cabc9c67fd35f340d744a9bd6f2fa3d6c1922..aaccf25eaf1ce2a777b3d86b58ddadafacabbbf2 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 07a2db5348d0157c15996bde26cde380b8d0db11..317c31e9f0bd7e58158caf6a85dc41330d70ed12 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 a6a7079dd54c2f3e2ddc79ba95a97706300fed66..e2071d55eb2f1dc2dffc60008f2de3bb788382dd 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 00dc3918fcb350e0459d20488fad7e9ccef3c90c..c5f70a4958cae634b22a19cb2a67a597ba6102eb 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 ef28fc81e54fcd28ae09ba6540c664680bbeb61e..fb3f836ef0934452ae624a5df7b012d8f4a95713 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 ae4cf928993fdd79df3739aa4226fd5261975097..c9f35d868b46b1e187a6ee7ce83ad96b40b68309 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 9d3f76a894b1d8461200252f609ae6c9427b77e6..0a1e2c44bf7011f7b6269986f02a23acfe662884 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 c53175ea6b2a21d0b79be00d53870cda4baca7c2..3712b31ebd22e93aa6a932cc242cc45abe218062 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 bf529dec330d7ba4eb0a43a0d003ce938ab1b17a..0125c733e2cb455137657f5cc49f80226b5c7f14 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 2e431a0df151c4eea7019705ff778187bb3eaa04..543e72adf8f36dc9b7bbe33058d652e5ada072b9 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 c5d4a1c828b290f303f35f8be88042eec9f0c705..80d99be6169e3a6c0f8d9616d50d2b8eac449f44 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 14a22ab8cd94b72d5e4e2f8b67894940af7710c0..3781a91299f67c9d5380936293352469de2cc3e7 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 10bd20eb7f51663e4f12818c2cb6c30213410acf..932376d6f8aebeee6fa1c75f4796b8c625220819 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 c02a5f3468f096c59559b7d7038c390cd5cf93c4..1b04877a31dbb839d119c31c64b2e25631b3a233 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 9a3f2166ef88f8686681d1547dbd440797939037..d1350ee809847b44327e43f2253c5a0e402aae34 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 24c2db51291cfac0e7eec7a82800052adc87b191..bf79244d7d315dc6f9d8f3e49cb6df52d75fed16 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 64910c54e7c159420cce8e74f3d93bb2f7640781..7349274681fc89d09715b98a86770284598932aa 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 0fbb051b8480f850edc4286be0e6565eeb1e7f00..cb28c8a0515b04a3663ce57d8e1c233a4bdec84f 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 b4d4d9e624bc32402a76a7d6cdfc16fd75e84097..c4150f058c79006e66da38651505cdf1f7028fac 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 eec07e0abff68438badb01fb9db36a39e50752f0..26a569737d6d3b1fa1f04efe6b86bdb7c6bccdc0 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 1d7ac77dd2a004c2246fe644e3c269f58afe3493..49bb03224d9fe9d39b5f233a28f047c1d4a95077 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 c4b96772890abb5dd0edbb93d58dfab8832c378c..4236037fbddabce3d1a6e706e9bc7606186f5e65 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 17abd30214f1469a405feb1c0504982a3e241827..e08e0ad492adc074eac4628c41e5766d000b573b 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 c648431dd4a22ee09100ee2d777dc7c15cb8b2d5..5f11a71ece40644a02d43594c660b65bb7bf23b1 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 f1323b95890e2435150cf9c92ccc5de04a2983a2..a0acfc3899f6df9e6cf2c87d2085489acee084ec 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 adb60d2c2791699f32f0b1bc124a2f2092432d16..37d0ee904c77fb16c6f497e24acc5014a3f85b62 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 9b7f0011b2a9fb9eb1fedb36f45658d63bbf725b..785ded06833553d1f23eda7adeaf9e17fdcfd0a8 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 865162897f058f57a06764e59cee5c39e24f59a4..a8099443be6032e40df758b9b5adff118c575970 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 96fff055110659774d4e9cbb988f8b9d1d66e205..005ac423ad51b31b145b0728ed66aa2c6cdb1dfb 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 adcf970b07cf04e066e8f7db69ce24ba7cabe681..0000000000000000000000000000000000000000 --- 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 d38f59936296c282a62e553c312a35302cb0fa9a..0000000000000000000000000000000000000000 --- 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 27180409875db17a8a38bfe64b3b24876cdb514c..792baee49c33de758bd15216ba33ed06a909f457 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 778b899217446081203da64708952fafe40f457c..c6f403900439ae5349d826bc71d212da5d05f45b 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 f3ac09540536c87592c4065504a396285d93ba8f..84cc1a0c2b09878a071d2d9e1f31875fe36d64bb 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 e19bc45cc7bd2ac79415c9458d666734f11cf4cf..842f41bc8c911cf1198e79a395da1b4bd3695269 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 f11253aa4a47495c4aeb688dd6e2764bb181ece8..580514f74d227fda1b094b72a8d7ba1c9fa002cd 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 758080a61161822e83b58bf98460eb72a14b1e0b..07ac18e19f2180910427eb9444e1537b381596eb 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 8f036de090a76e540fa39f27b48bcf1cbd1540eb..64290de860d043b8b84066cfe92c9e499f667bfe 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 0ee5e24b248bda4178ae5e48142b93904311a3e4..b9ac5d35b22a47c5f19f55cbc3654fbff6e37e56 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 958614203cfedde2296036d58c4c274aed3c07f5..d0deb1cdba75dcc26beb8fed25532a90141172f4 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 72fbc95421bf18feaf6a98615d7e789c481159a4..76d29a9d221a68545fdb95bcaa80adbb3e237994 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 58a45811e4cb692141407fb21cf9505e999df3c6..b511cbd3550d14854e3b84d6dddfde6fa8d8acf7 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 7997c97c0662fc0f330e634ec4a73f442f9031a8..f1770fa248c32ff0cb10d1e2e935c7a6e1eee129 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 1fa008ac640f562a588735525d0ce253ee112b6e..c595cf597a70e811b122e34a05dbf453c9eacefa 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 9abfd46744a36bbc731525e74d9312e8f5405f03..72efa1574eeaf2489cb210483c6c1386afc4f067 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 8aeb3bcb4c1de56437126d5af0dbb8c222c3328c..e4cf1921fa4219195fb10957c58adc9b69c925a4 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 4c44e657e823a7a48aa708526a037c4004546e99..9d5a9447b503de8ca358e4230386f97659b15533 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 f3e26f12f927ad33e847a2aa4f9f74903fa2080c..b09495dcf92440f44fbe3ec1ae267a4221d4cabd 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 b06707e924941e651c4d9a24a0c02cc262d657ce..f87d365bdf6f2693db995d0ae98a07400576f6a0 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 166a62e5328fc91176538a5d2d01cbb67fa25839..96f11015b1bc280e8df16bfddaed33ae210af495 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 d358182795925eddf700a4b9659a55af2bd19ced..7a40f94345c4c9f0736e3adee139096df49ed1be 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 eec0954ba0e7bcdd62d0a40db78b202c03e4233c..8631c36fd60114087d6decf464b88042ed433125 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 7c884eec39e3b36cb1b8a5a719a3e5ecf6d22469..304001d546c84669f28b82b4bfc7d665f2287301 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 13ed0b12e4a1f64b30d56f631d4bea0cbd8c7345..5eae1d55b7e1406d0956c67cf6b9dba9949faefc 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 9cf29f6e15f03b2d570303bd2d6f3b5696edb610..69d08b0d3b8f0b5298057fb6a06ff2b41afff690 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 6b7179a13989f83a794383f48f6e6170cac057c0..100b43af86ab36831cbb02e784cd5d8b8bb0db18 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 aaa97312ac60721378ff8ccd642ccfcc238feeb3..1c95f979d09ac1d52baef11c58baf87f05ecd4aa 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 a33adcc40352598d15e11b8042463dd04167f0b9..21a7f1c2107750a10302f9247e487d584521bd28 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 ef81658d61baedac402676edb88f5b71147e941e..f724b1515e8f269b28e8f2d4aa9970753d65601e 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 e5aa1b36e33dad69b9911e7116f6b0cd253b6af1..0000000000000000000000000000000000000000 --- 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 19faca24a071867746ce09a6d91d1df29adaad20..7e0ce07f025b794f3fcd1df7dd14e5104404e843 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 dcb98940065e6611e9ebf39d255f43d3d8646af4..1e0574de95cdf833af456cc47ae9f540c0fa939e 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 651afce1c602be9d43e78dbcc07d24958823d898..e703922dcb2823760660dcceec4cc4cfb6c3a8fe 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 zcmeI)&rjQC7{KwkKtfY~RO-RfB&HXkDTzdfP_@f;SqO$j3!w|{+MX;g@rnnDv)C}Y z8?Yb$(XKo0wsZf7U3b`V_UqX3yEJP>yH2vc5d^=s^ZI>0&*Rs&QuXMImK!+YYj4!I z1M#46x1ec-PlYHH3R?KP68?dVg=hial@ z>=_-S-7tnMce#py2n%^r%No!`Rr<# zuBo&fKDtxXn;WyrA(KRFJJVRY?A|Wvx~^S+APYiPjC?CAMIcwj=^u|WJ$p0fYaCMc zoK5#qr;n4cNQG%U38xfgTFIVp*=`izbi*sp;uPoVo5hk|sc1jOQ=*b0rEyz{TGMZV{NPXS z8KR`b_Y88Wq+~3;)cJA3(suTef0L8L9(0erku~&uH*medO!~@>7X)5kx_8`X$AMfj zF2b?)oL=mI?)q+c2bAP~GTB5K-0{3q#~%C_iAqm}t9$b$y;jq%ZOIzVT*1h3tf<6% zwY8w|s@q~>Wu4e*9qvp5l2JrEyyCv?EzcnGu$e5&+p09e&B+Z{bVHP?e6mo~4{Nh7 zRZ5t?wXL>`m+#NXO1&zjq%vm7886LGQO4^hj8jUP7~)wmaQjYpF7$_S0qz=m^+zpJ zG#+)rdr8wWn+L{`SwDD~rXY=Opq2EsHSKasj_>5$@&j+=B!6!yV@uY?BRg@P$48qQ z&AEMg=BTGadc3V$MZK{$OEWowwVfXaE2J literal 0 HcmV?d00001 diff --git a/crates/project_panel/src/project_panel.rs b/crates/project_panel/src/project_panel.rs index b5d1d0caa369cacf555f1e40f0200645d2879e97..5f1e07aa2166b5b9bf5e412996eba406220cb946 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 9cd378cb527f03aa09826c68d5c2c0a42f9670da..c1757cb0223da307a849cf14666f7bde65cfe95d 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 7776c4f14fe272cdc6c0d2ea571be93572194f2c..3244e7e4eab418aa9e365076437da56123dc6aa4 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 9b906c893f8321c223664ed0087cf9c20957fd5b..49c7f048c4c8a67b9ad5782ee7a1b8d48734284c 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 zcmeI)&rjQC7{KwkKtfY~RO-RfB&HXkDTzdfP_@f;SqO$j3!w|{+MX;g@rnnDv)C}Y z8?Yb$(XKo0wsZf7U3b`V_UqX3yEJP>yH2vc5d^=s^ZI>0&*Rs&QuXMImK!+YYj4!I z1M#46x1ec-PlYHH3R?KP68?dVg=hial@ z>=_-S-7tnMce#py2n%^r%No!`Rr<# zuBo&fKDtxXn;WyrA(KRFJJVRY?A|Wvx~^S+APYiPjC?CAMIcwj=^u|WJ$p0fYaCMc zoK5#qr;n4cNQG%U38xfgTFIVp*=`izbi*sp;uPoVo5hk|sc1jOQ=*b0rEyz{TGMZV{NPXS z8KR`b_Y88Wq+~3;)cJA3(suTef0L8L9(0erku~&uH*medO!~@>7X)5kx_8`X$AMfj zF2b?)oL=mI?)q+c2bAP~GTB5K-0{3q#~%C_iAqm}t9$b$y;jq%ZOIzVT*1h3tf<6% zwY8w|s@q~>Wu4e*9qvp5l2JrEyyCv?EzcnGu$e5&+p09e&B+Z{bVHP?e6mo~4{Nh7 zRZ5t?wXL>`m+#NXO1&zjq%vm7886LGQO4^hj8jUP7~)wmaQjYpF7$_S0qz=m^+zpJ zG#+)rdr8wWn+L{`SwDD~rXY=Opq2EsHSKasj_>5$@&j+=B!6!yV@uY?BRg@P$48qQ z&AEMg=BTGadc3V$MZK{$OEWowwVfXaE2J 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 49c7f048c4c8a67b9ad5782ee7a1b8d48734284c..701c913c9fcaff72d335cd89f9e33601dc4b3fd6 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 5f1e07aa2166b5b9bf5e412996eba406220cb946..8f5d9b0e55e680fedab595f96eaa8606e958cc0b 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 c1757cb0223da307a849cf14666f7bde65cfe95d..97c0b0a79d42a01dea6470151056fb14d3f97a3e 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 701c913c9fcaff72d335cd89f9e33601dc4b3fd6..729150fbc78372aa21349e51f77d32477ae039bf 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 df66ec2125a8a7fa73a2bf9cc2943cd04e29fc88..681692f0f5428362c35caca8f4030d8222821cec 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 658ca264256a1c0e0954c6f1fec51dea6c046584..ab414e051bcfeb2ec77ab6bac751853fe41b0ab8 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 c64105b33719bcd7d2ee8d46fd64f41b7f621c8f..82e6dfff9058a161701b1f4fa5279d7086a0ce0e 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 }),