zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-09-20 02:47:34 +03:00
Code Issues Packages Projects Releases Wiki Activity
12,265 Commits 667 Branches 720 Tags 178 MiB
86ec0b1d9f
Commit Graph

925 Commits

Author SHA1 Message Date
Antonio Scandurra
c1bd035875 Rework inline assistant 2023-08-25 11:39:27 +02:00
Max Brunsfeld
24141c2f16 Ensure collaborators cursor colors are the same in channel buffers as in projects 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-24 11:31:41 -07:00
Antonio Scandurra
805e44915c WIP 2023-08-24 17:23:12 +02:00
Antonio Scandurra
c1d9b37dbc Move to an inline refactoring prompt 2023-08-24 15:46:18 +02:00
Mikayla
2a182b6a7b
Tune styles and disclosable elements 2023-08-23 16:25:40 -07:00
Antonio Scandurra
aa6d6582fd Add basic styling 2023-08-23 13:09:02 +02:00
Mikayla
bfd3e53dcd
Implement component test page 2023-08-19 16:29:24 -07:00
Mikayla
bd3ab82dac
Add disclosable components into channels 
Rename components to more closely match their purpose
 2023-08-19 05:18:53 -07:00
Mikayla
8ef671d7a1
Move the collab panel to the left by default 
Increase the indent size on channels
Switch font UI mono
 2023-08-18 15:04:22 -07:00
Mikayla
8630557ece
Add action button component for rendering the search options 2023-08-17 15:30:40 -07:00
Nate Butler
f451e3423d Fix missing border on tab bar navigation arrows 2023-08-17 11:00:22 -04:00
Mikayla
afebe3faf8
Merge branch 'main' into project_search_design 2023-08-17 01:56:05 -07:00
Mikayla Maki
6d3518cb50
Collab panel touch ups (#2855) 
This will also fix the bug that @JosephTLyons observed where accepting a
channel invite would not show sub channels.

Release Notes:

- Offline section is now collapsed by default
- Manage members now shows full list
- Dragging of docks now follows the mouse exactly, and double clicks
reset size. (https://github.com/zed-industries/community/issues/1816)
 2023-08-17 01:09:01 -07:00
Nate Butler
8b1322745d Fix collab indicators 2023-08-16 22:50:02 -04:00
Mikayla
3074455386
WIP 2023-08-16 16:56:00 -07:00
Nate Butler
ef86c08174 Use the ghost variant for a flat button style in the toolbar 2023-08-16 23:38:11 +03:00
Kirill Bulatov
0b93e490a5 Improve toggle UI, fix inlays update speed 2023-08-16 23:38:11 +03:00
Kirill Bulatov
5c3d563f0f Draft quick actions bar 2023-08-16 23:38:11 +03:00
Nate Butler
925e09e012 Update collab panel empty state to match project panel 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2023-08-16 13:56:11 -04:00
Nate Butler
43127384c6 Update modal icon styles 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2023-08-16 13:48:12 -04:00
Nate Butler
6c15636ccc Style cleanup for channels panel 2023-08-16 12:38:44 -04:00
KCaverly
aeda5d9842 fix semantic search panic which is created via incompatible build_search_query path 
Co-authored-by: Piotr <piotr@zed.dev>
 2023-08-16 15:50:54 +01:00
KCaverly
2a7df106e1 adjusted icon sizes downwards 
Co-authored-by: Piotr <piotr@zed.dev>
 2023-08-16 14:01:06 +01:00
KCaverly
a59535efa1 remove redundant and unneeded styling 
Co-authored-by: Piotr <piotr@zed.dev>
 2023-08-16 12:55:32 +01:00
KCaverly
9bf227b884 remove regex keymap, and made spacing consistent between search objects 
Co-authored-by: Piotr <piotr@zed.dev>
 2023-08-16 12:17:59 +01:00
KCaverly
11ecb7b604 reorganize search bar, enable filters and disable select all during invalid states 
Co-authored-by: Piotr <piotr@zed.dev>
 2023-08-16 11:35:09 +01:00
Nate Butler
28649fb71d Update channel context menu 2023-08-15 18:36:23 -04:00
Mikayla
d13cedb248
seperate out channel styles in theme 2023-08-15 12:12:30 -07:00
KCaverly
1e8a7c7caa refactor buffer_search to reduce redundancy and simplying height management 
Co-authored-by: maxbrunsfeld <max@zed.dev>
 2023-08-15 20:04:14 +01:00
KCaverly
695e6d2f2e fix spacing on editor magnifying glass icon 2023-08-15 15:05:39 +01:00
Max Brunsfeld
71454ba27c Limit number of participants shown in channel face piles 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-14 17:11:03 -07:00
Nate Butler
ef73e77d3d Update some status bar icons and states 2023-08-14 17:15:25 -04:00
Nate Butler
b4b044ccbf Initial modal styles 2023-08-14 17:01:34 -04:00
Nate Butler
e0d73842d2 Continue panel styles 2023-08-14 16:12:39 -04:00
Nate Butler
f2d46e0ff9 Use new icons in channel panel 2023-08-14 15:57:31 -04:00
Nate Butler
8531cdaff7 Style channels panel items 2023-08-14 15:50:37 -04:00
Nate Butler
4a5b2fa5dc Add ghost button variants 2023-08-14 15:13:57 -04:00
Max Brunsfeld
3b10ae9310 Add icon before the empty contacts text 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-14 11:57:19 -07:00
Max Brunsfeld
2bb9f7929d Structure the contact finder more similarly to the channel modal 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-14 11:37:05 -07:00
Mikayla
b07555b6df
Make empty state interactive 2023-08-14 10:34:00 -07:00
Mikayla
fde9653ad8
Add placeholder implementation 2023-08-14 10:24:00 -07:00
Nate Butler
3856137b6e Add list empty state style 2023-08-14 13:17:57 -04:00
Piotr Osiewicz
f4121b42da Add more padding to dismiss button. 
Add a style for mode buttons group margin

Co-authored-by: Kyle <kyle@zed.dev>
 2023-08-14 15:01:01 +02:00
Piotr Osiewicz
9ae28f81c1 Update option buttons text color 2023-08-14 12:35:33 +02:00
Piotr Osiewicz
d37ebe7841 Add option_button_height style 2023-08-14 12:10:37 +02:00
Piotr Osiewicz
b586601cab Style nav buttons 2023-08-13 01:29:35 +02:00
Piotr Osiewicz
e151555542 Style dismiss button. 
Fix clipping in nav buttons and mode buttons. Add missing borders to outskirts of mode buttons.
 2023-08-13 01:06:35 +02:00
Piotr Osiewicz
94f1d8281a Remove buttonside, use new corner_radii instead 2023-08-12 22:18:27 +02:00
Piotr Osiewicz
6be73e46bf Merge branch 'main' into project_search_design 2023-08-12 21:57:21 +02:00
Mikayla
a90c0e0326
Merge branch 'main' into collab-panel 2023-08-12 12:44:22 -07:00
Mikayla
9b5551a079
split into body and header 2023-08-11 11:35:51 -07:00
Nate Butler
ff1261b300 WIP Restyle channel modal 
Co-Authored-By: Mikayla Maki <mikayla.c.maki@gmail.com>
 2023-08-11 13:32:46 -04:00
Piotr Osiewicz
0a0314eec9 Shrink project search + decrease padding 2023-08-11 18:19:45 +02:00
Piotr Osiewicz
799278e296 Add row_height 2023-08-11 17:02:25 +02:00
Piotr Osiewicz
100a8961b5 Add accent colors to search option buttons 2023-08-11 16:51:18 +02:00
Piotr Osiewicz
f6ecf83f33 Increase editor's left hand side padding to 10 2023-08-11 16:43:07 +02:00
Piotr Osiewicz
9e9b3093a9 Style mode/option buttons 2023-08-11 16:32:15 +02:00
Piotr Osiewicz
3d103546bc Make ButtonSide respect corner_radius 2023-08-11 14:44:22 +02:00
Piotr Osiewicz
a9a2d281c3 Make ButtonSide scale with corner_radius 2023-08-11 13:10:56 +02:00
Piotr Osiewicz
9ad308f2f0 Fix padding inside search input. 
Adjust borders for toggle buttons
 2023-08-10 14:53:25 +02:00
Piotr Osiewicz
b2f773e91d Increase padding on search 2023-08-10 12:57:12 +02:00
Max Brunsfeld
b3447ada27 Dial in the channel creating/renaming UI 
* Ensure channel list is in a consistent state with no flicker while the
  channel creation / rename request is outstanding.
* Maintain selection properly when renaming and creating channels.
* Style the channel name editor more consistently with the non-editable
  channel names.

Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-09 17:11:57 -07:00
Max Brunsfeld
076b72cf2b Improve styling of collab panel 2023-08-09 15:11:30 -07:00
Mikayla
707e41ce1f
Merge branch 'collab-panel' of github.com:zed-industries/zed into collab-panel 2023-08-09 10:44:50 -07:00
Mikayla
99daa73325
Merge branch 'main' into collab-panel 2023-08-09 10:37:22 -07:00
Nate Butler
beffe6f6a9 WIP BROKEN 2023-08-09 12:44:34 -04:00
Nate Butler
b23f1c809a WIP add IBM Plex Sans 
(base) natebutler@Nate16 zed % cargo run
   Compiling zed v0.99.0 (/Users/natebutler/Code/zed/zed/crates/zed)
    Finished dev [unoptimized + debuginfo] target(s) in 9.15s
     Running `target/debug/Zed`
Thread "main" panicked with "called `Result::unwrap()` on an `Err` value: parse error" at crates/zed/src/main.rs:667:10
   0: backtrace::backtrace::libunwind::trace
             at /Users/natebutler/.cargo/registry/src/index.crates.io-6f17d22bba15001f/backtrace-0.3.68/src/backtrace/libunwind.rs:93:5
      backtrace::backtrace::trace_unsynchronized
             at /Users/natebutler/.cargo/registry/src/index.crates.io-6f17d22bba15001f/backtrace-0.3.68/src/backtrace/mod.rs:66:5
   1: backtrace::backtrace::trace
             at /Users/natebutler/.cargo/registry/src/index.crates.io-6f17d22bba15001f/backtrace-0.3.68/src/backtrace/mod.rs:53:14
   2: backtrace::capture::Backtrace::create
             at /Users/natebutler/.cargo/registry/src/index.crates.io-6f17d22bba15001f/backtrace-0.3.68/src/capture.rs:176:9
   3: backtrace::capture::Backtrace::new
             at /Users/natebutler/.cargo/registry/src/index.crates.io-6f17d22bba15001f/backtrace-0.3.68/src/capture.rs:140:22
   4: Zed::init_panic_hook::{{closure}}
             at crates/zed/src/main.rs:436:29
   5: std::panicking::rust_panic_with_hook
   6: std::panicking::begin_panic_handler::{{closure}}
   7: std::sys_common::backtrace::__rust_end_short_backtrace
   8: _rust_begin_unwind
   9: core::panicking::panic_fmt
  10: core::result::unwrap_failed
  11: core::result::Result<T,E>::unwrap
             at /private/tmp/rust-20230613-7622-103lepv/rustc-1.70.0-src/library/core/src/result.rs:1089:23
  12: Zed::load_embedded_fonts
             at crates/zed/src/main.rs:664:5
  13: Zed::main
             at crates/zed/src/main.rs:80:5
  14: core::ops::function::FnOnce::call_once
             at /private/tmp/rust-20230613-7622-103lepv/rustc-1.70.0-src/library/core/src/ops/function.rs:250:5
  15: std::sys_common::backtrace::__rust_begin_short_backtrace
             at /private/tmp/rust-20230613-7622-103lepv/rustc-1.70.0-src/library/std/src/sys_common/backtrace.rs:134:18
  16: std::rt::lang_start::{{closure}}
             at /private/tmp/rust-20230613-7622-103lepv/rustc-1.70.0-src/library/std/src/rt.rs:166:18
  17: std::panicking::try
  18: std::rt::lang_start_internal
  19: std::rt::lang_start
             at /private/tmp/rust-20230613-7622-103lepv/rustc-1.70.0-src/library/std/src/rt.rs:165:17
  20: _mai
 2023-08-09 11:01:20 -04:00
Piotr Osiewicz
7ef5656f6a Merge branch 'main' into project_search_design 2023-08-09 12:30:48 +02:00
Mikayla
b708824d37
Position and style the channel editor correctly 
Fix a bug where some channel updates would be lost
Add channel name sanitization before storing in the database
 2023-08-08 12:46:13 -07:00
Nate Butler
662e196267
Calculate the range for each color family in a theme (#2738) 
Release Notes:
- N/A (Internal theme stuff)
 2023-08-08 11:49:52 -04:00
Mikayla
8980a9f1c1
Add settings for removing the assistant and collaboration panel buttons 
Add a not-logged-in state to the collaboration panel

co-authored-by: max <max@zed.dev>
 2023-08-07 16:27:47 -07:00
Mikayla
e37e76fc0b
Add context menu controls to the channel member management 
co-authored-by: Max <max@zed.dev>
 2023-08-07 15:29:30 -07:00
Mikayla
9913067e51
Remove admin and member button 
Fix bug with invites in the member list
Fix bug when there are network errors in the member related RPC calls

co-authored-by: Max <max@zed.dev>
 2023-08-07 14:32:13 -07:00
Mikayla
90cdbe8bf3
Fix modal click throughs and adjust height for channel modal 2023-08-07 13:39:05 -07:00
Max Brunsfeld
c537cf2a57 Merge branch 'main' into collab-panel 2023-08-07 11:50:40 -07:00
Max Brunsfeld
2ccd153233 Fix joining descendant channels, style channel invites 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-04 16:21:43 -07:00
Max Brunsfeld
87b2d599c1 Flesh out channel member management 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-04 14:12:08 -07:00
Piotr Osiewicz
82eb6d8bc3 Change styling of match nav buttons 
Co-authored-by: Kyle <kyle@zed.dev>
 2023-08-04 17:35:59 +02:00
Piotr Osiewicz
fcefb37ca0 Prevent modes from being vertically centered when row_count changes 2023-08-04 13:54:50 +02:00
Max Brunsfeld
4a6c73c6fd Lay-out channel modal with picker beneath channel name and mode buttons 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-03 16:15:29 -07:00
Mikayla Maki
6c4964f071
WIP: continue channel management modal and rename panel to collab_panel 2023-08-03 11:40:55 -07:00
Piotr Osiewicz
4658bc610c Update styling of nav buttons (width, corner_radius) 
Co-authored-by: Kyle <kyle@zed.dev>
 2023-08-03 20:35:10 +02:00
Mikayla Maki
d450c4be9a
WIP: add custom channel modal 2023-08-03 10:59:09 -07:00
Piotr Osiewicz
8831e03eba Remove reference to pane from a toolbar. 
Co-authored-by: Kyle <kyle@zed.dev>
 2023-08-03 16:09:26 +02:00
Piotr Osiewicz
7d83d15bf3 Move navigation buttons to the tab bar. 
Co-authored-by: Kyle <kyle@zed.dev>
 2023-08-03 16:05:24 +02:00
Max Brunsfeld
0ae1f29be8 wip 2023-08-02 15:52:56 -07:00
Max Brunsfeld
fca8cdcb8e Start work on rendering channel participants in collab panel 
Co-authored-by: mikayla <mikayla@zed.dev>
 2023-08-02 15:09:37 -07:00
Julia
df4480ba52 Use the same font size for hovered state of LSP status 
This element is used for the update state as well for some reason so
while we don't normally ever see this state, it is used when the status
is acting as the restart to update button
 2023-08-02 17:33:56 -04:00
KCaverly
a125e318fe catch up with main 2023-08-02 16:48:11 -04:00
Max Brunsfeld
9e755bb855 Revert "Extract syntax highlighting properties from tree-sitter highlight queries (#2797)" 
This reverts commit 45c635872b, reversing
changes made to f2b82369f2.
 2023-08-02 12:15:39 -07:00
Max Brunsfeld
a555fa1ada Merge branch 'main' into collab-panel 2023-08-02 09:08:50 -07:00
KCaverly
caaa4b1618 add theme for search mode option buttons, and adjust padding 
Co-authored-by: Piotr <piotr@zed.dev>
 2023-08-02 11:23:55 -04:00
Piotr Osiewicz
4ef59899d1 WIP: Add ButtonSide element 2023-08-02 13:05:29 +02:00
Piotr Osiewicz
e4871afaf3 Improve styling of mglass icon & search switches 2023-08-02 00:36:46 +02:00
KCaverly
cf060f0011 added major and minor display text to project search, and fixed icon padding 
Co-authored-by: Piotr <piotr@zed.dev>
 2023-08-01 13:28:21 -04:00
KCaverly
7d5ff60ff0 added svg right margin in search bar 
Co-authored-by: Piotr <piotr@zed.dev>
 2023-08-01 12:34:02 -04:00
Piotr Osiewicz
a33d8519f2 Move buttons inside of query editor (WIP) 2023-08-01 02:06:40 +02:00
Mikayla Maki
8926266952
Halve opacity on wrap guides 2023-07-29 23:53:16 -07:00
Mikayla Maki
1549c2274f
Create channel adding modal 2023-07-28 13:24:43 -07:00
Max Brunsfeld
4a088fc4ae
Make major collab panel headers non-interactive 2023-07-28 13:24:43 -07:00