mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-26 18:41:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8
6346 commits 773 branches 798 tags 274 MiB
Commit graph

293 commits

Author SHA1 Message Date
Antonio Scandurra
580f1a4125 Style context menu 2022-05-26 10:40:53 +02:00
Nathan Sobo
c0aafac387 Put keystrokes in their own column 
This requires rendering the menu for measurement in a totally different way, where the top level is a flex row. We don't want to render the menu like this for presentation because of hovers / highlights on individual items needing to include the keystrokes.

Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2022-05-26 09:59:25 +02:00
Antonio Scandurra
a8483ba458 WIP 2022-05-26 09:59:25 +02:00
Antonio Scandurra
3b2f1644fb Constrain context menu to the width of the widest item 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-05-26 09:59:25 +02:00
Antonio Scandurra
f403d87eff WIP 2022-05-26 09:59:25 +02:00
Nathan Sobo
b110fd5fb7 Render a context menu when right-clicking in project panel 
It doesn't currently do anything, but I managed to get it rendering in an absolutely positioned way.
 2022-05-26 09:59:25 +02:00
Nathan Sobo
742dd75041 Implement /rpc_server_snapshot endpoint 
This returns a JSON snapshot of the state of the server
 2022-05-25 17:42:25 -06:00
Nate Butler
db0c2f24c4 Fix disconnected from project message 2022-05-25 11:19:06 -04:00
Nate Butler
6a8fe60424
Merge pull request #1059 from zed-industries/fix-theme-occurence-color 
fix theme occurrence color
 2022-05-25 10:57:10 -04:00
Nate Butler
e39089697d
Merge pull request #1048 from zed-industries/onMedia-theme-text-color 
Add onMedia text color for use in disconnect overlay text
 2022-05-25 10:52:37 -04:00
Nate Butler
d0f0013f4d fix theme occurence color 2022-05-25 10:45:37 -04:00
Isaac Clayton
505b305b90 Adjust the orange/yellow a bit 2022-05-24 19:48:44 +02:00
Isaac Clayton
9bb1a5636f Add the fall-colored abruzzo theme 2022-05-24 18:32:44 +02:00
Antonio Scandurra
5c4bd9393f
Merge pull request #1050 from zed-industries/ignored-files 
Show ignored entries in project panel
 2022-05-24 10:57:16 +02:00
Antonio Scandurra
138a0b042d Make fade of ignored entries styleable 2022-05-24 09:12:57 +02:00
Nathan Sobo
d8dbbf1c05 Merge remote-tracking branch 'origin/main' into invite-codes-2 2022-05-23 15:46:39 -06:00
Keith Simmons
e05695c4a6 Add onMedia text color for use in disconnect overlay text 2022-05-23 14:34:34 -07:00
Nate Butler
b61153266b Add multiple Zed themes 
Add the following themes:
- Andromeda
- Brushtree Light & Dark
- Rose-pine
- Rose-pine-dawn
- Sandcastle dark
- Summercamp dark
- Summerfruit
 2022-05-20 11:51:59 -04:00
Nathan Sobo
eedb8ba59f Add affordance to copy user's invite link if they have a code 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2022-05-19 17:57:46 -06:00
Max Brunsfeld
fbacc12672 Delete theme files more selectively when regenerating them 
Avoid deleting files that will be rewritten later, so that Zed
won't observe states where themes are missing if two zed
processes are running at once.
 2022-05-18 14:17:26 -07:00
Max Brunsfeld
89e91939e4 Write theme files atomically 2022-05-18 14:07:32 -07:00
Max Brunsfeld
ec41dd9f18 Remove checked-in theme JSON files 
* Generate the themes on build
* In debug builds, watch the theme sources. When they change, re-generate
  the themes and reload the current theme, removing the need for the
  `theme_selector::Reload` command.

Co-authored-by: Keith Simmons <keith@zed.dev>
 2022-05-18 12:43:26 -07:00
Nate Butler
50e3745b92 Clean up themes 
- Allow themes to have only a light or dark variant
- Added a commented template file
- Run formatter
 2022-05-18 11:41:56 -04:00
Nate Butler
72ab5740f1 Update light theme borders 2022-05-17 13:14:11 -04:00
Antonio Scandurra
692be10b10 Dynamically load all themes listed under styles/src/themes/*.ts 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-05-17 16:08:14 +02:00
Antonio Scandurra
225536accc Merge branch 'main' into request-to-join-project 2022-05-17 14:55:20 +02:00
Nathan Sobo
7c3eebf93e Refine messages on waiting to join screen and include host avatar 2022-05-16 16:52:31 -06:00
Nate Butler
af5bb92847 Rework color schemes 
Co-Authored-By: Keith Simmons <keith@the-simmons.net>
 2022-05-16 18:11:22 -04:00
Nate Butler
7d22ede804 Remove the focused token 
Currently we don't have any concept of a true focus state. All states we currently use focus should actually be `active`.

Removing this token until we introduce a distinction between active and focused states.
 2022-05-16 15:38:06 -04:00
Antonio Scandurra
aa90c06012 Display a temporary window while remote project is loading 2022-05-16 17:45:50 +02:00
Max Brunsfeld
be51a58311 Start work on requesting to join projects 
Co-authored-by: Nathan Sobo <nathan@zed.dev>
 2022-05-12 17:53:11 -07:00
Max Brunsfeld
f54d74eda9 Merge branch 'main' into contact-panel-keyboard-nav 2022-05-11 17:45:44 -07:00
Max Brunsfeld
85d9ac5b95
Merge pull request #987 from zed-industries/notifications 
Notify when someone requests to add you as a contact or accepts your contact request
 2022-05-11 17:40:11 -07:00
Max Brunsfeld
72e7079005 Add the ability to expand and collapse sections of the contacts panel 
Also, allow joining projects using the keyboard.
 2022-05-11 17:28:35 -07:00
Max Brunsfeld
615319b2ab Rework the contact panel's styling to allow keyboard navigation 
Co-authored-by: Nathan Sobo <nathan@zed.dev>
 2022-05-11 16:50:51 -07:00
Max Brunsfeld
0ba656aa0e Improve layout and styling of contact notifications 
Co-authored-by: Nathan Sobo <nathan@zed.dev>
 2022-05-11 14:20:05 -07:00
Max Brunsfeld
3bc9b8ec85 Add notifications for accepted contact requests 
Co-authored-by: Nathan Sobo <nathan@zed.dev>
 2022-05-11 11:39:01 -07:00
Nate Butler
50b44ebe85 Add onMedia border token 2022-05-11 12:35:00 -04:00
Antonio Scandurra
933a1f2cd6 Show badge when there are pending contact requests 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-05-11 17:39:03 +02:00
Antonio Scandurra
97d3616ed9 Show incoming request notification and implement dismissal 2022-05-11 15:13:37 +02:00
Max Brunsfeld
08a7543913 WIP - start work on keyboard navigation in contacts panel 2022-05-10 21:45:49 -07:00
Nathan Sobo
bd2ae304fa Start on workspace notifications 2022-05-10 17:46:46 -06:00
Max Brunsfeld
b33cbccc31 Improve layout of contact panel rows 
Co-authored-by: Nathan Sobo <nathan@zed.dev>
 2022-05-10 11:14:31 -07:00
Max Brunsfeld
2cf9659f88 Style the buttons in the contact panel and contact finder 
Co-authored-by: Nathan Sobo <nathan@zed.dev>
Co-authored-by: Antonio Scandurra <me@as-cii.com>
 2022-05-10 10:47:25 -07:00
Antonio Scandurra
a121576545 WIP 2022-05-10 18:25:47 +02:00
Antonio Scandurra
f81edb88fe Pull out contact finder as a picker 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-05-10 16:43:51 +02:00
Nathan Sobo
b721f0064a Start on contact finder modal 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2022-05-10 07:24:14 -06:00
Antonio Scandurra
09580516a0 Start on adding icon for requesting contacts 2022-05-10 12:09:24 +02:00
Antonio Scandurra
44f37afa95 Define data types for the new contacts model 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-05-06 16:24:44 +02:00
Max Brunsfeld
ea81737a88 Allow fuzzy-search for potential contacts in the contacts panel 
Co-authored-by: Nathan Sobo <nathan@zed.dev>
 2022-05-05 14:14:44 -07:00
Nathan Sobo
342bdfc7e0 Render a user query editor in the contacts panel 2022-05-05 10:24:21 -06:00
Max Brunsfeld
8fdc5c9be3 Improve the appearance of project panel filename editor 
* Always layout single-line editors with a fixed height
* Preserve directory chevron when editing folder names
* Allow theming the filename editor

Co-authored-by: Antonio Scandurra <me@as-cii.com>
 2022-05-04 10:28:44 -07:00
Max Brunsfeld
12d45f1655 Clean up project panel theme 2022-05-04 10:28:08 -07:00
Antonio Scandurra
3ee4d90c19 Parameterize avatar_margin and assign it a default of 8 2022-05-03 18:04:53 +02:00
Antonio Scandurra
5d0c3c43e8 Add right padding to titlebar instead of margins on elements 
This fixes a visual glitch causing the avatar to be shown too close to
the right edge of the window when the share icon was not present.
 2022-05-02 09:27:37 +02:00
Nate Butler
f63444ce6d Update base16 theme occurrence style 
- Update base16 theme occurrence style to be visible
- Update match styles to use the blend scaling value
  - This makes it so matches are less loud in light themes
 2022-04-30 00:47:07 -04:00
Nate Butler
038f306ed8
Merge pull request #931 from zed-industries/add-size-token 
WIP: Add the `size` token
 2022-04-29 01:46:50 -04:00
Nate Butler
f4dbe4d976 Update projectBrowser styles 2022-04-29 01:35:58 -04:00
Nate Butler
67181a16c0 Update search style 2022-04-29 01:24:21 -04:00
Nate Butler
098ad7dbfa Update base16 themes background states 2022-04-29 01:24:11 -04:00
Nate Butler
945d7c52a0 Remove unused import 2022-04-29 01:23:52 -04:00
Nate Butler
70a7bd2747 Style out of date message 2022-04-29 01:06:44 -04:00
Nate Butler
a352f8bad4 Update status bar style 2022-04-29 00:59:08 -04:00
Max Brunsfeld
d9497d49de 🎨 Use Interactive wrapper for search option buttons 2022-04-28 15:29:03 -07:00
Max Brunsfeld
8481834847 Give hover state to picker items, keystrokes in command palette 2022-04-28 15:17:56 -07:00
Max Brunsfeld
a60c75e343 Rename Selector -> Picker in theme 2022-04-28 14:45:32 -07:00
Max Brunsfeld
c51d5b9165 Remove accidental background color on unhovered ok indicator 
A follow-up to #921
 2022-04-28 12:44:37 -07:00
Max Brunsfeld
e48a975b1e Give no-error diagnostic indicator a hover state 2022-04-28 12:35:20 -07:00
Max Brunsfeld
6578ae5393 Use Interactive helper to theme titlebar buttons 2022-04-28 12:08:15 -07:00
Nate Butler
b41bf65c96 Statusbar style tweaks 2022-04-28 14:52:31 -04:00
Nate Butler
6fc68a8ddd Move projectDiagnostics to it's own file and remove unused code 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2022-04-28 14:52:12 -04:00
Nate Butler
425473d296 Update token build script for figma 
- Use syntax tokens instead of manually adding token content
- Add solarized to output
- Add ramp step value to the token description in Figma Tokens

Co-Authored-By: Keith Simmons <keith@the-simmons.net>
 2022-04-28 14:08:59 -04:00
Nate Butler
607719ed26 Update size token function and types 
Co-Authored-By: Keith Simmons <keith@the-simmons.net>
 2022-04-28 14:07:20 -04:00
Max Brunsfeld
772f4579fc Restructure status bar theme to style interactive elements more concisely 
Introduce an `Interactive` wrapper type that allows themes to selectively
override properties of items in a hovered or active state.
 2022-04-28 10:59:32 -07:00
Nate Butler
0cc5a3839d Add the size token 
Introduces the `size` token, a token that will be used for defining standardized sizes for paddings, margins & borders.

Available sizes are `px`, `xs`, `sm`, `md`, `lg`, `xl`

- Adds `size`, types, and token
- Adds the size() function
 2022-04-28 12:31:44 -04:00
Max Brunsfeld
e88156645d Update the styling of the lsp status indicator 2022-04-27 16:48:33 -07:00
Max Brunsfeld
a3700e0dd8 Combine diagnostic status w/ diagnostic message indicators 
Improve the indicator styling
 2022-04-27 14:25:39 -07:00
Max Brunsfeld
9e87be722e Start re-styling diagnostic indicator in status bar 2022-04-27 14:25:39 -07:00
Nate Butler
b23ff7c3ad Update semantic status colors in all themes 
- for `ok`, `error`, `warning` and `info`:
  - backgroundColor values were all placeholder. Add real values
  - Update border values to new style
 2022-04-27 14:25:39 -07:00
Max Brunsfeld
7f63ed3835 Allow styling sidebar icons and groups in themes 2022-04-27 14:25:39 -07:00
Max Brunsfeld
0291f2d54a Move sidebar toggle buttons to the status bar 2022-04-27 14:25:39 -07:00
Antonio Scandurra
c955645bc0 Update share icon and swap its posiiton 2022-04-26 14:35:13 +02:00
Nate Butler
a2591ce1e2 Create common base16 theme constructor 
Co-Authored-By: Keith Simmons <keith@the-simmons.net>
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2022-04-25 19:11:38 -04:00
Nate Butler
9338cd9cf8 Add cave theme 
Sneaking one more in, cave is a nice cool dark theme that isn't super blue.
 2022-04-25 18:19:49 -04:00
Nate Butler
e28d1828f0 Add sulphurpool theme, update solarized 
Co-Authored-By: Keith Simmons <keith@the-simmons.net>
 2022-04-25 18:07:24 -04:00
Keith Simmons
50b5b56f60 Update solarized theme to match main 2022-04-22 15:04:45 -07:00
Keith Simmons
a1576b7dca fix solarized element backgrounds 2022-04-22 14:58:45 -07:00
Keith Simmons
533ba474f1 Add some comments to the theme.ts explaining the logic behind them 2022-04-22 14:58:45 -07:00
Keith Simmons
d0ee686e09 add solarized dark and light syntax themes 2022-04-22 14:58:45 -07:00
Max Brunsfeld
f881c2aa92
Merge pull request #892 from zed-industries/syntax-theme-fixes 
Syntax theme fixes
 2022-04-22 13:24:31 -07:00
Max Brunsfeld
d330f909e6 Allow each theme to style all aspects of syntax highlighting 
Previously, some syntax highlights were controlled in editor.ts,
and shared across all themes.

Co-authored-by: Keith Simmons <keith@zed.dev>
 2022-04-22 12:43:01 -07:00
Nathan Sobo
92f040df00 Apply cursor styles during paint 
This makes the editor's cursor an IBeam and properly deals with nested cursor styles.

Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2022-04-22 10:54:18 -06:00
Antonio Scandurra
fb87bacc7e Merge branch 'main' into auto-update 2022-04-21 09:53:06 +02:00
Nate Butler
7bc6f8b5ee Build tokens for Figma 2022-04-20 15:30:33 -04:00
Nate Butler
ea11f2e183 Increase min-width for all Pickers, minor style changes 
- Increases the Picker min-width from 500 to 540
- Makes some changes to the styling of keyboard shortcuts in the command palette
 2022-04-20 11:54:57 -04:00
Nate Butler
484204c2a0 Reduce key icon size to avoid extra padding on command palette item 
- Also remove unneeded imports
 2022-04-19 02:48:35 -04:00
Nate Butler
408f8d4297 Update inputs, tabs, pickers, autocomplete 2022-04-19 02:34:45 -04:00
Max Brunsfeld
0af129d50a Use primary text color for keystrokes in command palette 2022-04-18 18:14:45 -07:00
Max Brunsfeld
bde52d5c93 Add basic styling to keystrokes in command palette 2022-04-18 17:11:37 -07:00
Nate Butler
ec704cae25 update feature color in dark theme 2022-04-17 22:37:08 -04:00
Nate Butler
726045e78e Update theme feature colors 
- border focus color
- Text feature color
- Match & active match highlight color

Matches should be more legible now in both themes. `activeMatch` is still not hooked up on the rust side, so it won't take any effect yet.

Co-Authored-By: gibusu <95764254+gibusu@users.noreply.github.com>
 2022-04-12 12:44:38 -04:00
Nate Butler
409b818717 Fix incorrect path in theme build script 
`buildThemes.ts` had an incorrect path for generating the theme json files.

It probably happened when we did some reorganization of the styles directory.

Co-Authored-By: gibusu <95764254+gibusu@users.noreply.github.com>
 2022-04-12 12:37:38 -04:00
Max Brunsfeld
c065f283aa Move assets to their own crate, load keymaps in vim tests 
Also, move assets folder to the top-level.

Co-authored-by: Keith Simmons <keith@zed.dev>
 2022-04-11 15:54:52 -07:00
Keith Simmons
36f4d8f9e4 Fix typescript indent size 2022-04-06 10:35:29 -07:00
Nate Butler
b1eda1ac39 Add border to top of status bar 2022-04-06 12:25:15 -04:00
Nate Butler
e584e892f4 Update light theme 2022-04-06 12:25:02 -04:00
Nate Butler
d3cfd1c974 Use standard text sizes for signInPrompt 2022-04-06 12:14:05 -04:00
Nathan Sobo
c289cdcac8 💄 2022-04-06 09:28:56 -06:00
Nathan Sobo
36fede7522 💄 token-building script and output destinations 
Just some organization here.
 2022-04-06 09:26:51 -06:00
Nate Butler
e201826d00 Update Light & Dark themes 2022-04-06 01:46:10 -04:00
Nate Butler
2a2c4071f4 Update light syntax theme and highlights, player selections 2022-04-05 18:49:17 -04:00
Nate Butler
35f56708f5 Update light theme, change player 3 color 
- Changed player 3 color to be less similar to player 1
 2022-04-05 18:23:01 -04:00
Nate Butler
d21dea6112 Squashed commit of the following: 
commit 66d4cbae2ca6d7dd660688d7eb702ae55bf3e0ca
Author: Nate Butler <iamnbutler@gmail.com>
Date:   Tue Apr 5 13:33:33 2022 -0400

    WIP: Improve legibility of contactsPanel and fix errors

    Co-Authored-By: Keith Simmons <keith@the-simmons.net>

commit 000319c583801c5ba4ed7884bbf3da2a591e3f26
Author: Nate Butler <iamnbutler@gmail.com>
Date:   Tue Apr 5 13:13:32 2022 -0400

    WIP
 2022-04-05 13:34:06 -04:00
Keith Simmons
05a05157fa Move style source files to src and build to dist 
Co-authored-by: Nate Butler <nate@zed.dev>
 2022-04-04 14:43:13 -07:00
Nate Butler
b6f85e4895 Update dark, light themes. 2022-04-03 21:15:14 -04:00
Nate Butler
2d51b103d2 Add a combined tokens.json for Figma Tokens 
- Having individual json files for themes and core is useful for copy+pasting while exploring changes
- Figma github sync requires a single json file to pull down
 2022-04-03 15:03:38 -04:00
Nate Butler
d029a5c376 Fix incorrect ramp preset values in color.ts 
- Regenerate themes and tokens as well
 2022-04-03 13:37:47 -04:00
Nate Butler
60295af00a
Add basic support for exporting tokens to Figma Tokens. (#724) 
* WIP on figma token export

* WIP Working export

* Tidy up the figma tokens script

* Correctly format theme json structure for Figma Tokens

* Finish up themeTokens imports
 2022-04-03 13:30:59 -04:00
Nate Butler
433c095f51 Remove leftover console.log 2022-04-03 10:50:41 -04:00
Nate Butler
6a7c8a6995 Refined dark theme styles 2022-04-03 01:04:34 -04:00
Nate Butler
2af313c8e2 WIP 2022-04-02 01:05:28 -04:00
Nate Butler
ffc271e100 WIP 2022-04-01 23:58:04 -04:00
Nate Butler
f633e98081 Add "npm run watch" command to live reload changes 2022-04-01 22:39:18 -04:00
Nathan Sobo
93c0c2af0a Start loading new theme JSON format instead of TOML 
Replaced remaining extends with javascript object extension.
Moved tokens/core.ts to tokens.ts and massaged the types to make it more
obvious when types don't match up.

Co-authored-by: Nathan Sobo <nathan@zed.dev>
 2022-04-01 13:34:39 -07:00
Nathan Sobo
9147a19522 Update style tree based on changes to _base.toml from main 
Co-Authored-By: Nate Butler <1714999+iamnbutler@users.noreply.github.com>
 2022-04-01 09:56:50 -06:00
Nathan Sobo
6734a0e69d Write theme JSON files from buildThemes script 
Co-Authored-By: Nate Butler <1714999+iamnbutler@users.noreply.github.com>
 2022-04-01 09:45:11 -06:00
Nathan Sobo
99738db8a5 Fix TS compile error 2022-04-01 08:25:58 -06:00
Nate Butler
cea3ac6217 Update renamed/moved imports 2022-03-31 23:43:01 -04:00
Nate Butler
1d42cbcf42 Type name 2022-03-31 23:42:45 -04:00
Keith Simmons
e990b46b9d Finish dark.ts initial port and restructure files to get ready for build script 
Build script currently fails to type check. Not sure whats going on. Will fix in the morning.

Co-authored-by: Nate Butler <nate@zed.dev>
 2022-03-31 20:31:18 -07:00
Keith Simmons
ce8d5bc0db wip 2022-03-31 19:05:21 -07:00
Keith Simmons
e3366c490e wip 2022-03-31 17:51:25 -07:00
Nate Butler
b4087b115b WIP for keith 2022-03-31 20:32:47 -04:00
Nate Butler
0b690ac0b4 WIP: Scaffold tokens in dark.ts, no real values yet. 2022-03-31 19:10:44 -04:00
Nate Butler
fb41ad325c Extract search from app 
- Also update border to use borderColor( )
 2022-03-31 11:27:02 -04:00
Nate Butler
c6c6cc591a Update app.ts, editor.ts 2022-03-31 01:38:18 -04:00
Nathan Sobo
b8118ee50e Convert chat panel 2022-03-30 18:45:34 -06:00
Nathan Sobo
4a728bb3d3 Convert project panel styles 2022-03-30 18:26:47 -06:00
Nathan Sobo
89eb34209f Convert editor styles to TypeScript 2022-03-30 17:59:35 -06:00
Nathan Sobo
32b6c3d3d4 Express workspace in terms of new components 
Co-Authored-By: Nate Butler <1714999+iamnbutler@users.noreply.github.com>
 2022-03-29 16:28:19 -06:00
Nate Butler
39f46f64a6 WIP: Color WIP 2022-03-29 17:10:46 -04:00
Nate Butler
9669f5a8f8 WIP: Add rose color tokens to core.ts 2022-03-29 15:33:03 -04:00
Nathan Sobo
1615c6150a Start on TypeScript-based styling system 
Co-Authored-By: Nate Butler <1714999+iamnbutler@users.noreply.github.com>
 2022-03-29 13:08:00 -06:00