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
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
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
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
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
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
Mikayla Maki
d450c4be9a
WIP: add custom channel modal
2023-08-03 10:59:09 -07: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
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
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
Max Brunsfeld
fc49194535
Restructure collab panel, make contact finder into a normal modal
2023-07-28 13:24:43 -07:00
Max Brunsfeld
14fdcadcfc
Add seemingly-redundant export in theme src file to workaround theme build error
2023-07-28 13:24:43 -07:00
Max Brunsfeld
87dfce94ae
Rename contact list theme to collab panel
2023-07-28 13:24:43 -07:00
Max Brunsfeld
969ecfcfa2
Reinstate all of the contacts popovers' functionality in the new collaboration panel
2023-07-28 13:24:43 -07:00
Mikayla Maki
fe5db3035f
move channels UI code to channels-rpc
2023-07-28 13:21:41 -07:00
Mikayla Maki
ac35dae66e
Add channels panel with stubbed out information
...
co-authored-by: nate <nate@zed.dev>
2023-07-28 13:21:39 -07:00
Nate Butler
45c635872b
Extract syntax highlighting properties from tree-sitter highlight queries ( #2797 )
...
This should be a purely internal change. Let me know if any visual
changes are observed from this!
### Syntax theme
- Update the theme to allow any syntax highlighting property used in any
`highlight.scm` to be styled
- Only define syntax styles that are baked into the default theme &
don't use the default text style
- Adds the `generate-syntax` command
- Removes a few unused properties that we were styling for some reason,
like `enum` and `variant`, neither of which exist in any `highlight.scm`
- Moves `@constructor` symbols to `@method.constructor` to prevent
issues with `constructor` being a reserved property in ts/js.
Syntax is now build as the theme is created rather than as part of the
styleTree. This means it no longer requires a compiled `Theme`, which
makes things a bit more straightforward if we need to access it in other
components that should be built before the styleTrees.
### Scheme
Also updates all uses of `#match` in our `highlights.scm` files, as
these break the scheme tree-sitter query. This fixes _most_ instances of
our scheme highlighting breaking.
For some reason something in here breaks the `highlights.scm` for PHP:
```scheme
((name) @constant.builtin
(.match? @constant.builtin "^__[A-Z][A-Z\d_]+__$"))
((name) @method.constructor
(.match? @method.constructor "^[A-Z]"))
((name) @variable.builtin
(.eq? @variable.builtin "this"))
```
Release Notes:
- No public facing changes
2023-07-27 13:14:01 -04:00