diff --git a/assets/icons/arrow_down_12.svg b/assets/icons/arrow_down_12.svg index 5d9a8ee5e37..dfad5d4876f 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 65114ebd604..ec757a8ab40 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 53d3c2944e4..f70f3920a30 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 fc7cabc9c67..aaccf25eaf1 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 07a2db5348d..317c31e9f0b 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 a6a7079dd54..e2071d55eb2 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 00dc3918fcb..c5f70a4958c 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 ef28fc81e54..fb3f836ef09 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 ae4cf928993..c9f35d868b4 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 9d3f76a894b..0a1e2c44bf7 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 c53175ea6b2..3712b31ebd2 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 bf529dec330..0125c733e2c 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 2e431a0df15..543e72adf8f 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 c5d4a1c828b..80d99be6169 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 14a22ab8cd9..3781a91299f 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 10bd20eb7f5..932376d6f8a 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 c02a5f3468f..1b04877a31d 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 9a3f2166ef8..d1350ee8098 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 24c2db51291..bf79244d7d3 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 64910c54e7c..7349274681f 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 0fbb051b848..cb28c8a0515 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 b4d4d9e624b..c4150f058c7 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 eec07e0abff..26a569737d6 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 1d7ac77dd2a..49bb03224d9 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 c4b96772890..4236037fbdd 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 17abd30214f..e08e0ad492a 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 c648431dd4a..5f11a71ece4 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 f1323b95890..a0acfc3899f 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 adb60d2c279..37d0ee904c7 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 9b7f0011b2a..785ded06833 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 865162897f0..a8099443be6 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 96fff055110..005ac423ad5 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 adcf970b07c..00000000000 --- 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 d38f5993629..00000000000 --- 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 27180409875..792baee49c3 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 778b8992174..c6f40390043 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 f3ac0954053..84cc1a0c2b0 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 e19bc45cc7b..842f41bc8c9 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 f11253aa4a4..580514f74d2 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 758080a6116..07ac18e19f2 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 8f036de090a..64290de860d 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 0ee5e24b248..b9ac5d35b22 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 958614203cf..d0deb1cdba7 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 72fbc95421b..76d29a9d221 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 58a45811e4c..b511cbd3550 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 7997c97c066..f1770fa248c 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 1fa008ac640..c595cf597a7 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 9abfd46744a..72efa1574ee 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 8aeb3bcb4c1..e4cf1921fa4 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 4c44e657e82..9d5a9447b50 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 f3e26f12f92..b09495dcf92 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 b06707e9249..f87d365bdf6 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 166a62e5328..96f11015b1b 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 d3581827959..7a40f94345c 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 eec0954ba0e..8631c36fd60 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 7c884eec39e..304001d546c 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 13ed0b12e4a..5eae1d55b7e 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 9cf29f6e15f..69d08b0d3b8 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 6b7179a1398..100b43af86a 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 aaa97312ac6..1c95f979d09 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 a33adcc4035..21a7f1c2107 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 ef81658d61b..f724b1515e8 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 e5aa1b36e33..00000000000 --- 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 13e5f0517d5..133a197f153 100644 --- a/crates/auto_update/src/update_notification.rs +++ b/crates/auto_update/src/update_notification.rs @@ -51,7 +51,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/collab_titlebar_item.rs b/crates/collab_ui/src/collab_titlebar_item.rs index 658ca264256..ab414e051bc 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() } diff --git a/crates/collab_ui/src/notifications.rs b/crates/collab_ui/src/notifications.rs index dcb98940065..1e0574de95c 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/project_panel/src/project_panel.rs b/crates/project_panel/src/project_panel.rs index b5d1d0caa36..8f5d9b0e55e 100644 --- a/crates/project_panel/src/project_panel.rs +++ b/crates/project_panel/src/project_panel.rs @@ -1015,15 +1015,17 @@ 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_cut { + &theme.cut_entry + } else if details.is_ignored { + &theme.ignored_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 9cd378cb527..97c0b0a79d4 100644 --- a/crates/theme/src/theme.rs +++ b/crates/theme/src/theme.rs @@ -326,8 +326,8 @@ 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 filename_editor: FieldEditor, pub indent_width: f32, } diff --git a/crates/workspace/src/pane.rs b/crates/workspace/src/pane.rs index be3909c3c95..8dd97e230fc 100644 --- a/crates/workspace/src/pane.rs +++ b/crates/workspace/src/pane.rs @@ -1298,7 +1298,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() @@ -1361,7 +1361,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) diff --git a/styles/src/styleTree/components.ts b/styles/src/styleTree/components.ts index 7776c4f14fe..3244e7e4eab 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/editor.ts b/styles/src/styleTree/editor.ts index c94b6d81d21..82e6dfff905 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, @@ -267,11 +267,11 @@ export default function editor(colorScheme: ColorScheme) { 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/projectPanel.ts b/styles/src/styleTree/projectPanel.ts index 9b906c893f8..729150fbc78 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"), - }, + entry, + ignoredEntry: { + ...entry, + text: text(layer, "mono", "disabled"), + }, + cutEntry: { + ...entry, + text: text(layer, "mono", "disabled"), active: { background: background(layer, "active"), - text: text(layer, "mono", "active", { size: "sm" }), - }, - activeHover: { - background: background(layer, "active"), - text: text(layer, "mono", "active", { size: "sm" }), + text: text(layer, "mono", "disabled", { size: "sm" }), }, }, - cutEntryFade: 0.4, - ignoredEntryFade: 0.6, filenameEditor: { background: background(layer, "on"), text: text(layer, "mono", "on", { size: "sm" }), diff --git a/styles/src/styleTree/workspace.ts b/styles/src/styleTree/workspace.ts index 50ee0c26da7..769ea85a002 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,