yenru0/zed
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,184 Commits 5 Branches 0 Tags
08fcb3f10e0d4d48c7fb9d7e124febccfbdaae65
Commit Graph
823 Commits
Author SHA1 Message Date
Kirill Bulatov 5ce0d2244d Improve toggle UI, fix inlays update speed 2023-08-16 23:38:11 +03:00
Kirill Bulatov 7cd278f4b8 Draft quick actions bar 2023-08-16 23:38:11 +03:00
Nate ButlerandMax Brunsfeld f77504f5ac 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 ButlerandMax Brunsfeld dd531145c2 Update modal icon styles 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2023-08-16 13:48:12 -04:00
Nate Butler 8027b0d4d8 Style cleanup for channels panel 2023-08-16 12:38:44 -04:00
Nate Butler b4c41dc9bd Update channel context menu 2023-08-15 18:36:23 -04:00
Mikayla 8471c16343 seperate out channel styles in theme 2023-08-15 12:12:30 -07:00
Max BrunsfeldandMikayla 4507579f5a 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 eec64e7e2d Update some status bar icons and states 2023-08-14 17:15:25 -04:00
Nate Butler 9c70f9b428 Initial modal styles 2023-08-14 17:01:34 -04:00
Nate Butler c1a33b6331 Continue panel styles 2023-08-14 16:12:39 -04:00
Nate Butler a4661e4e16 Use new icons in channel panel 2023-08-14 15:57:31 -04:00
Nate Butler 3b6cf98e1a Style channels panel items 2023-08-14 15:50:37 -04:00
Nate Butler 8c40bba730 Add ghost button variants 2023-08-14 15:13:57 -04:00
Max BrunsfeldandMikayla 401a2aefea Add icon before the empty contacts text 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-14 11:57:19 -07:00
Max BrunsfeldandMikayla 54383d6c9b 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 9fbf6857eb Make empty state interactive 2023-08-14 10:34:00 -07:00
Mikayla 0d2e658f3d Add placeholder implementation 2023-08-14 10:24:00 -07:00
Nate Butler a791f150e5 Add list empty state style 2023-08-14 13:17:57 -04:00
Mikayla d55c1ad81e Merge branch 'main' into collab-panel 2023-08-12 12:44:22 -07:00
Mikayla 20a9de99f8 split into body and header 2023-08-11 11:35:51 -07:00
Nate ButlerandMikayla Maki 93983b230d WIP Restyle channel modal 
Co-Authored-By: Mikayla Maki <mikayla.c.maki@gmail.com>
 2023-08-11 13:32:46 -04:00
Max BrunsfeldandMikayla da98fd8009 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 e628a41aab Improve styling of collab panel 2023-08-09 15:11:30 -07:00
Mikayla 35e307965d Merge branch 'collab-panel' of github.com:zed-industries/zed into collab-panel 2023-08-09 10:44:50 -07:00
Mikayla 8b73737072 Merge branch 'main' into collab-panel 2023-08-09 10:37:22 -07:00
Nate Butler e16b6e2fc2 WIP BROKEN 2023-08-09 12:44:34 -04:00
Nate Butler f3741bcfeb 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
Mikayla 23628aaf3f 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 25b03b3485 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
Mikaylaandmax 8a7d078eaf 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
MikaylaandMax 9f1d025937 Add context menu controls to the channel member management 
co-authored-by: Max <max@zed.dev>
 2023-08-07 15:29:30 -07:00
MikaylaandMax 06f40c814a 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 f267c1358b Fix modal click throughs and adjust height for channel modal 2023-08-07 13:39:05 -07:00
Max Brunsfeld d51cac5ab2 Merge branch 'main' into collab-panel 2023-08-07 11:50:40 -07:00
Max BrunsfeldandMikayla e93fc31525 Fix joining descendant channels, style channel invites 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-04 16:21:43 -07:00
Max BrunsfeldandMikayla acce8aba4a Flesh out channel member management 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-04 14:12:08 -07:00
Max BrunsfeldandMikayla 9f70e37022 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 88fb1b89f2 WIP: continue channel management modal and rename panel to collab_panel 2023-08-03 11:40:55 -07:00
Mikayla Maki a7bcdeebac WIP: add custom channel modal 2023-08-03 10:59:09 -07:00
Max Brunsfeld 71a1a3904f wip 2023-08-02 15:52:56 -07:00
Max Brunsfeldandmikayla 45c92ae784 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 14c0daa74a 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
Max Brunsfeld def8c215ff Revert "Extract syntax highlighting properties from tree-sitter highlight queries (#2797)" 
This reverts commit 20d5589876, reversing
changes made to 48a9b3e1e9.
 2023-08-02 12:15:39 -07:00
Max Brunsfeld 076649aae1 Merge branch 'main' into collab-panel 2023-08-02 09:08:50 -07:00
Mikayla Maki 1a2079640d Halve opacity on wrap guides 2023-07-29 23:53:16 -07:00
Mikayla Maki c646fbe5b3 Create channel adding modal 2023-07-28 13:24:43 -07:00
Max Brunsfeld 2d9ae3609b Make major collab panel headers non-interactive 2023-07-28 13:24:43 -07:00
Max Brunsfeld 0e4636d2a3 Restructure collab panel, make contact finder into a normal modal 2023-07-28 13:24:43 -07:00
Max Brunsfeld 4ca7b98334 Add seemingly-redundant export in theme src file to workaround theme build error 2023-07-28 13:24:43 -07:00