mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-02-10 04:09:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6
8289 commits 554 branches 843 tags 305 MiB
Commit graph

331 commits

Author SHA1 Message Date
Mikayla Maki
37a2ef9d41 Make chevrons and lightning bolt interactive 2023-02-28 16:34:28 -08:00
Mikayla Maki
89b93d4f6f Added fold changes on gutter hover 2023-02-28 16:34:28 -08:00
Mikayla Maki
e3061066c9 Add code folding indicators into the gutter. 2023-02-28 16:34:28 -08:00
Nate Butler
a8a045e8bf Merge branch 'main' into nate/extend-syntax 2023-02-28 11:07:35 -05:00
Joseph Lyons
4f9a07cffc Merge branch 'main' into add-link-to-community-repo-in-feedback-editor 2023-02-27 13:56:01 -05:00
Nate Butler
794e6e22a6 Format 2023-02-26 17:12:48 -05:00
Nate Butler
504d88d56c Remove unused code 2023-02-26 17:12:11 -05:00
Nate Butler
f2d6a03dff Finish adding default properties 2023-02-26 17:10:52 -05:00
Nate Butler
d910eed1f1 Format 2023-02-26 10:31:19 -05:00
Nate Butler
4f307c7601 Use syntax as merged name instead of mergedSyntax 
This lets us retain the existing uses of syntax, and fixes colors that were being assigned incorrectly.
 2023-02-26 01:20:44 -05:00
Nate Butler
77ed437cda Add the ability to override the system syntax config 2023-02-26 01:07:21 -05:00
Nate Butler
10a30cf330 Format styles with updated prettier config 
In the system color PR I updated the prettier config to match what we use on zed.dev. I didn't want to format all of styles as it would add a lot of unrelated line changes to that PR.

Doing that format now.
 2023-02-25 11:46:33 -05:00
Joseph Lyons
f8f1a3f86e Unify text style names 2023-02-24 08:46:28 -05:00
Joseph Lyons
37f910949d Add link to community repo in feedback editor 2023-02-23 16:30:00 -05:00
Julia
e1df85e86d Add same grayscale logic to followers which leaders have 2023-02-23 15:59:37 -05:00
Antonio Scandurra
832549f1a3 Merge branch 'main' into call-ui-follow-up 2023-02-23 15:15:46 +01:00
Petros Amoiridis
9a729a2e64
Merge pull request #2202 from zed-industries/petros/z-86-replace-terminal-tab-title-with-an-icon 
Replace terminal tab title with an icon
 2023-02-23 11:04:43 +02:00
Max Brunsfeld
bf5c3d963a Rearrange collab titlebar items to avoid movement of the toggle contacts button 
* Replace username in titelbar with a `...` user menu that shows
  the current user name and contains a sign-in/sign-out button.
* Move the '+' (toggle contacts) button back to the right side.
* Move the collaborators back to the right side.
* Move the share/unshare button to the left side, beside the project title
* Only show the share/unshare button when in a call.
 2023-02-22 22:56:11 -08:00
Julia
a07867d628 Fiddle with titlebar item spacing 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2023-02-22 14:13:29 -05:00
Julia
dbe5b0205c Add style leader selection container 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2023-02-22 13:36:06 -05:00
Petros Amoiridis
81ece4fd44
Deduplicate tab theme related code 
We've noticed that the search theme struct had two fields for a tab icon width and spacing. But we already have those in the tab theme struct. We decided to remove the duplicate and reuse the tab fields.

We also wanted to move where the spacing is being used. Instead of doing it at the left of the label, we do it at the right of the icon to match how it is done in other areas of the UI.

Co-Authored-By: Julia <30666851+ForLoveOfCats@users.noreply.github.com>
 2023-02-22 20:28:57 +02:00
Petros Amoiridis
2ec5c88f98
Make icon width match other areas 
This was 8 but we've seen areas where this was 14, like the project search tab icon. We want to match this.

Co-Authored-By: Julia <30666851+ForLoveOfCats@users.noreply.github.com>
 2023-02-22 20:25:39 +02:00
Julia
9b92a8e3fe Add mockup accurate avatar background 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2023-02-22 11:34:55 -05:00
Julia
7f4da80386 Initial dedicated face pile element 
Rather than overload Flex with yet another special case, add a dedicated
element to handle this overlap instead

Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2023-02-22 11:34:55 -05:00
Max Brunsfeld
b7cf426908 Start work on styling of follower avatars in facepiles 
* Make follower avatars smaller than top-level avatars
* Make avatars in facepiles overlap
* Render an opaque background behind avatars in facepiles.
 2023-02-22 11:34:55 -05:00
Julia
c75aca25b6 Remove left side collaborator list 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2023-02-22 11:34:55 -05:00
Julia
1ed47663ef Avoid moving contacts popover during call start & add button style state 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2023-02-22 11:34:55 -05:00
Julia
bf8658067f Add collaborator count to collaborator list button 2023-02-22 11:21:23 -05:00
Julia
c697c1a96a Switch collaborator list to using own style 2023-02-22 11:21:23 -05:00
Joseph Lyons
57e10ce7c6 Style info text 2023-02-08 21:26:27 -05:00
Joseph Lyons
8228618b9e Correct theme function name 2023-02-06 18:19:15 -05:00
Joseph Lyons
d4d9a142fc Implement a button for submitting feedback 
Co-Authored-By: Kay Simmons <3323631+Kethku@users.noreply.github.com>
 2023-02-06 17:41:36 -05:00
Julia
2b1118f597 Add dismiss buffer search button & fix some faulty icon button styling 
Co-Authored-By: Nate Butler <nate@zed.dev>
 2023-01-01 23:50:46 -05:00
Max Brunsfeld
e08d6cd6de
Merge pull request #1921 from zed-industries/multibuffer-following 
Allow following collaborators into editors with multi-excerpt buffers (refactors + find-all-refs)
 2022-12-14 15:33:11 -08:00
Mikayla Maki
790ef19a48 Fix mis-set variables 2022-12-13 09:58:04 -08:00
Max Brunsfeld
f797dfb88f Merge branch 'main' into multibuffer-following 2022-12-12 11:47:39 -08:00
Mikayla Maki
a1f273278b Added user notifications 2022-12-03 16:06:02 -08:00
Max Brunsfeld
9314c0e313 Replicate multibuffer excerpt additions and removals to followers 2022-11-30 13:20:13 -08:00
Kay Simmons
3d5a3634cf
Merge pull request #1867 from zed-industries/drag-project-entry-to-pane 
Drag project entry to pane
 2022-11-10 17:25:22 -08:00
Nate Butler
6b4dd2a5de Update search match highlight and occurrence style 2022-11-09 18:17:00 -05:00
Julia
847376a4f5 Start dragging project panel entries 
Co-Authored-By: Kay Simmons <kay@zed.dev>
 2022-11-07 17:00:01 -05:00
Nate Butler
5acae094bd Swap the color of diagnostic underlines to fix low contrast issue. 2022-11-04 18:02:10 -04:00
Antonio Scandurra
0b231e58fd Show placeholder text for pickers 2022-11-04 10:18:47 +01:00
Antonio Scandurra
08b84416d2 Avoid showing "No matches" when query is empty if there are no matches 2022-11-04 10:18:47 +01:00
Max Brunsfeld
d222904471 Add basic support for ruby 
Co-authored-by: Kay Simmons <kay@zed.dev>
 2022-11-03 15:52:33 -07:00
Nate Butler
6a07f59d34
Merge pull request #1831 from zed-industries/theme-tweaks 
Theme tweaks
 2022-11-02 10:04:55 -04:00
Nate Butler
7981cd45ed Increase scrollbar width 2022-11-02 09:58:15 -04:00
Max Brunsfeld
aa549d1da7 Don't use 'on' color for projects in the contact list 2022-10-31 12:28:25 -07:00
Mikayla Maki
ea9b009a22 Fixed bug with cut entry active states 2022-10-31 09:55:52 -07:00
Nate Butler
dbc804669c Update ignored, cut entry styles in the project panel 2022-10-31 10:30:58 -04:00
Mikayla Maki
552ebc0f29 Implemented direct styling for ignored and cut project panel entries 2022-10-28 10:45:45 -07:00
Nate Butler
92886236a2 Refine editor styles 
- Update active line backgrounds and line numbers
- Add a higher contrast border between the dock and panes
 2022-10-27 14:59:50 -04:00
Antonio Scandurra
56a66b348d Use the same background color as the editor for SharedScreen 2022-10-26 08:33:32 +02:00
K Simmons
113b7f6f97 tweak drop target overlay color and make stack fully constraint children by the first child 
's size
 2022-10-24 23:47:43 -07:00
K Simmons
cfde3e348c Add pane splitting by dragged item. Works, but the overlay doesn't clear quite right 2022-10-24 23:31:58 -07:00
Antonio Scandurra
f99d70500c Allow opening shared screen via the contacts popover 2022-10-24 10:47:47 +02:00
Antonio Scandurra
7e411ae098 Merge branch 'main' into screen-sharing 
# Conflicts:
#	crates/collab/src/integration_tests.rs
#	crates/collab/src/main.rs
#	styles/src/styleTree/workspace.ts
 2022-10-21 14:29:45 +02:00
K Simmons
2aa2e5af7a fix issue with text component and adjust layer selections some more 2022-10-19 13:45:00 -07:00
K Simmons
b7c439f4c4 Fixup some theme inconsistencies and incorrect layer selections 2022-10-19 13:39:46 -07:00
K Simmons
e3809c267d flattened layers and elevations 2022-10-19 13:02:51 -07:00
Nate Butler
0d9eecd2ed WIP command palette changes 2022-10-19 14:55:22 -04:00
Nate Butler
364c3f2f00 Contrast rebalances 2022-10-19 13:03:58 -04:00
Nate Butler
75c79d60fe Improve contrast/scanability of constants 2022-10-19 13:03:34 -04:00
Antonio Scandurra
773f569385 Add control to toggle screen-sharing 2022-10-19 10:19:20 +02:00
Mikayla Maki
571636c526 Fixed cursor color being black 2022-10-18 22:26:14 -07:00
K Simmons
b0ddbeb0ad Merge branch 'main' into elevations 2022-10-18 12:47:15 -07:00
Antonio Scandurra
bf98300547 Render remote participant's screen preserving aspect ratio 2022-10-18 14:16:19 +02:00
Nate Butler
5708879b5a Style elevations & update styleTrees 
Also rename `info` -> `accent`

Co-Authored-By: Kay Simmons <3323631+Kethku@users.noreply.github.com>
 2022-10-11 17:38:28 -04:00
Max Brunsfeld
638e9f9477
Merge pull request #1715 from zed-industries/scrollbars 
Add scrollbars
 2022-10-11 13:34:15 -07:00
Max Brunsfeld
acc85ad03c Impose a minimum height on the scrollbar 2022-10-11 13:18:33 -07:00
Max Brunsfeld
d93e75bf5f Make scrollbars a little bit narrower 2022-10-11 09:26:31 -07:00
Antonio Scandurra
ba6c5441c0 Always show invite link in contacts popover 2022-10-11 18:22:00 +02:00
Antonio Scandurra
f83de0a91c Respect contacts popover size 2022-10-11 17:30:17 +02:00
Antonio Scandurra
eb711cde53 Polish styling of contacts popover 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-10-11 16:52:20 +02:00
Antonio Scandurra
29c3b81a0a Show prompt when closing last window while there's an active call 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-10-11 14:52:47 +02:00
Antonio Scandurra
feb17c29ec Show participant projects in contacts popover 2022-10-11 12:23:15 +02:00
Antonio Scandurra
bf488f2027 Show project root names when displaying incoming call notification 2022-10-11 10:59:36 +02:00
Max Brunsfeld
b229bc69b9 Tweak scrollbar styling 2022-10-10 17:54:40 -07:00
Nathan Sobo
e0b6b0df2a Rename Join button to Open, rework message slightly 2022-10-10 18:12:00 -06:00
Nathan Sobo
b8c2acf0f2 Show worktree root names when sharing additional projects on a call 
Co-Authored-By: Antonio Scandurra <antonio@zed.dev>
 2022-10-10 17:56:03 -06:00
Max Brunsfeld
eedcc585af Add scrollbars to editors 2022-10-10 16:20:47 -07:00
Nate Butler
95bc18a995 Fix color ramps to use colored fg 2022-10-10 17:50:41 -04:00
Nate Butler
61dc703a58 Improve feedback button hover state 2022-10-10 17:42:23 -04:00
Nate Butler
a87d9d3578 Make code actions/autocomplete match contextMenu style 2022-10-10 17:35:12 -04:00
Nate Butler
0c68abbe17 Revert tab bar to pre-elevation style 2022-10-10 16:53:38 -04:00
Antonio Scandurra
5f9cedad23 Add margin to picker in contacts popover 2022-10-10 16:05:09 +02:00
Antonio Scandurra
afaacba41f Merge remote-tracking branch 'origin/main' into room 2022-10-10 15:43:38 +02:00
Antonio Scandurra
3396a98978 💄 2022-10-10 14:41:18 +02:00
Antonio Scandurra
7cfe435e62 Style project shared notifications 2022-10-10 14:37:51 +02:00
Antonio Scandurra
9d990ae329 Show all room participants in titlebar 
...and allow following them into external projects.
 2022-10-10 14:20:45 +02:00
Antonio Scandurra
25ff5959fb Superimpose external location message on active view 2022-10-10 12:23:50 +02:00
Antonio Scandurra
d7bac3cea6 Style incoming call notification 2022-10-10 11:36:39 +02:00
Antonio Scandurra
79748803a9 Add leave button on active call header 2022-10-10 10:30:51 +02:00
Antonio Scandurra
6f4edf6df5 Move contact finder into contacts popover 2022-10-10 09:56:21 +02:00
Nate Butler
2d25e25ec3 WIP + Format 2022-10-09 19:43:06 -04:00
Antonio Scandurra
d14744d02f Show current user in active call 2022-10-08 14:38:17 +02:00
Antonio Scandurra
f9fb3f78b2 WIP: Render active call in contacts popover 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-10-07 17:01:48 +02:00
Antonio Scandurra
d3cddfdced Fix styling for busy contacts 2022-10-07 14:42:18 +02:00
Antonio Scandurra
4aaf3df8c7 Show contact status 2022-10-07 13:56:28 +02:00
Nate Butler
431ac1267a Update contextMenu.ts 2022-10-06 21:08:53 -04:00