mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-10-26 08:31:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
10213 commits 697 branches 747 tags 245 MiB
Commit graph

720 commits

Author SHA1 Message Date
Antonio Scandurra
7a78e64831 Merge remote-tracking branch 'origin/main' into assistant-2 2023-06-06 19:18:22 +02:00
Antonio Scandurra
ef7ec265c8 Cycle message roles on click 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2023-06-06 18:45:08 +02:00
Nate Butler
7b066df7e6
Tighten up spacing in the project panel (#2574) 
Following https://github.com/zed-industries/zed/pull/2559 the project
panel entries become pretty wide again. This PR tries to mitigate that
and just make some general improvements to visual density in the project
panel.

- Reduces padding around items
- Removes top margin
- Slightly reduces the height of each item
- Fixes an issue where ignored files had the wrong color chevron

Release Notes:

- Improved density of the project panel and tidied up some visual
issues.
 2023-06-06 11:31:53 -04:00
Piotr Osiewicz
a0e2e5db7d
project panel/styles: Align child's chevron with parent path (#2559) 
Z-1012

Release notes:
- Adjust indent of files in subdirectories.
 2023-06-06 16:55:38 +02:00
Antonio Scandurra
2b1aeb07bc Show error message when requests to OpenAI fail 
Co-Authored-By: Julia Risley <julia@zed.dev>
 2023-06-06 16:53:56 +02:00
Antonio Scandurra
69b8267b6b Show the current model and allow clicking on it to change it 2023-06-06 13:13:44 +02:00
Joseph Lyons
7c60f636d5 Fix typos 2023-06-02 22:02:19 -04:00
Antonio Scandurra
f00f16fe37 Show remaining tokens 2023-06-02 17:27:21 +02:00
Sergey Onufrienko
f97999d97f
feat: update themes to use ThemeConfig 2023-06-02 14:11:11 +02:00
Sergey Onufrienko
5fbbc1936f
fix: typescript errors 2023-06-02 14:10:44 +02:00
Sergey Onufrienko
b38f760fcd
feat: add index export 2023-06-02 14:10:19 +02:00
Sergey Onufrienko
d3ed958308
chore: make SyntaxHighlightStyle.color optional 2023-06-02 14:10:02 +02:00
Sergey Onufrienko
6b00db75ad
feat: update and refactor colorScheme 2023-06-02 14:08:35 +02:00
Sergey Onufrienko
56ecfaf2f0
feat: add themeConfig types 2023-06-02 14:07:43 +02:00
Antonio Scandurra
a81d164ea6 Allow saving the OpenAI API key in the assistant panel 2023-06-02 11:38:02 +02:00
Antonio Scandurra
20e65a533c Merge remote-tracking branch 'origin/main' into assistant-2 2023-06-02 09:32:11 +02:00
Max Brunsfeld
62660f2766
Fix more issues with panels and zoom (#2545) 
Release Notes:

* Fixed the behavior of panel buttons when their panel is open. Show the
key binding for closing the containing dock (preview only).
* Improved the styling of zoomed panels and panes, giving them a
stronger border, and color the zoom button with an "active" style
(preview only).
* Improved the stability of panels' zoom state. Close their dock instead
of resetting their zoom state when dismissing panels to reveal other
items (preview only).
 2023-05-31 13:17:12 -07:00
Max Brunsfeld
3f6aa94a5f Use active color for zoom button in a zoomed pane 2023-05-31 12:51:57 -07:00
Nate Butler
1f72f9e18b Add un-hooked up zoomIcon styles 2023-05-31 12:45:55 -07:00
Nate Butler
a10933c063 Update pane/panel zoom styling 2023-05-31 12:45:55 -07:00
Sergii Onufriienko
c6672dbac2
Update theme license logic (#2541) 
Use new theme file structure
```
themes/
  [theme_name]
    [theme_name]-common.ts
    [theme_name]-light.ts
    [theme_name]-dark.ts
    LICENSE
```

Release Notes: 
- N/A
 2023-05-31 18:36:13 +01:00
Mikayla Maki
685e8d7007
Seperate pane and panel styling 
co-authored-by: max <max@zed.dev>
 2023-05-30 16:23:16 -07:00
Sergey Onufrienko
51c7078f47
chore: remove license_text 2023-05-30 18:16:50 +02:00
Sergey Onufrienko
4568f80f2e
feat: read from LICENSE file 2023-05-30 18:12:31 +02:00
Sergey Onufrienko
14efc18eca
refactor: add license file and check it exists 2023-05-30 18:11:54 +02:00
Sergey Onufrienko
05d1dd6b11
refactor: move common to theme folder 2023-05-30 16:53:12 +02:00
Sergey Onufrienko
ac63043c27
chore: move similar themes to one folder 2023-05-30 16:52:28 +02:00
Sergey Onufrienko
0d62e76cd6
refactor: colorSchemes 2023-05-30 15:52:32 +02:00
Sergey Onufrienko
2269c19169
chore: add LICENSE files 2023-05-30 14:06:19 +02:00
Antonio Scandurra
890c42a75a Show time in assistant messages 2023-05-29 16:23:16 +02:00
Antonio Scandurra
52e8bf2928 Show custom header for assistant messages 2023-05-29 15:57:55 +02:00
Sergey Onufrienko
cf75b090d3
feat: organize themes by folders with LICENSE 2023-05-29 15:45:13 +02:00
Nathan Sobo
3904971bd8 Hide assistant gutter 2023-05-26 15:38:03 -06:00
Nate Butler
793486b2e8
Update Diff Modified Color (#2526) 
For some reason the yellow I used for the modified color in light themes
was really light
.
Release Notes:

* Improved the contrast of diff modified color in the editor in light
themes.
 2023-05-24 23:50:37 -04:00
Antonio Scandurra
19b817e48a Improve styling of bottom and right docks 2023-05-23 09:02:45 +02:00
Antonio Scandurra
208ff2fba7 Merge remote-tracking branch 'origin/main' into panels 2023-05-23 08:24:28 +02:00
Mikayla Maki
5c31c84c90
Fixed contrast in project panel and scrollbar 
co-authored-by: nate <nate@zed.dev>
 2023-05-22 15:51:31 -07:00
Mikayla Maki
2d1c4a1971
Revert "Touch up git in project panel and scroll bar styling" 2023-05-22 15:31:14 -07:00
Mikayla Maki
5dfb0e3691
remove border from thumb 2023-05-22 14:56:55 -07:00
Nate Butler
11eb9b17c9 Update project panel & scroll bar git colors 2023-05-22 17:47:52 -04:00
Mikayla Maki
a355b4c135
Add conflict styles to project panel 2023-05-22 10:09:55 -07:00
Mikayla Maki
af73c1af06
Add seperate scrollbar styling 2023-05-22 10:03:02 -07:00
Mikayla Maki
2200a22c07
Wire project panel themes into rust 2023-05-22 09:55:59 -07:00
Nate Butler
b80cb73745 Add git to project panel in theme, use different values for dark and light 2023-05-22 12:09:54 -04:00
Nathan Sobo
ba50b35de6 wip 2023-05-13 14:34:09 -06:00
Antonio Scandurra
cdcb7c8084 Merge branch 'main' into panels 2023-05-10 15:23:37 +02:00
Kirill Bulatov
eec60556ab Highlight include/exclude inputs when errors happen there 2023-05-10 11:11:31 +03:00
Kirill Bulatov
13296d502c Extra rows approach draft 
co-authored-by: Max <max@zed.dev>
 2023-05-10 11:11:31 +03:00
Kirill Bulatov
b5abac6af6 Draft search include/exclude logic 2023-05-10 11:11:31 +03:00
Antonio Scandurra
6ddc610fa2 WIP: Start on TerminalPanel 2023-05-09 10:18:11 +02:00
Nathan Sobo
1ddbda5095 Rename DockItem to Panel 2023-05-09 10:18:11 +02:00
Nathan Sobo
03f8c1206a Rename Sidebar to Dock 2023-05-09 10:18:10 +02:00
Mikayla Maki
8bde496e74
Add branch name in title UI 
co-authored-by: Petros <petros@zed.dev>
 2023-05-08 14:33:59 -07:00
Nate Butler
ab6b3adb2b Add a theme entry for whitespace, use it to style whitespaces 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
Co-Authored-By: Kirill Bulatov <mail4score@gmail.com>
 2023-05-08 19:36:51 +03:00
Julia
f7de0ad8ae Show diagnostic source in diagnostic multibuffer headers 2023-05-01 16:48:27 -04:00
Julia
40ab5c1fb9 Remove underline from diagnostic source 2023-05-01 13:15:41 -04:00
Julia
678c188de0 Re-allow diagnostics hovers to soft wrap 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2023-04-27 14:35:34 -04:00
Julia
3f7533a0b4 Show source of diagnostic hovers 2023-04-27 14:35:34 -04:00
Mikayla Maki
2882e0fa5b Remove new CTA in copilot sign in UI 
Add a trim_end to copilot suggestions
 2023-04-19 16:39:55 -07:00
Mikayla Maki
745e5e3a09 Add italic styles to copilot suggestions 2023-04-19 15:23:19 -07:00
Antonio Scandurra
8610f3acf3 Introduce a button to disable copilot integration 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2023-04-19 20:25:59 +02:00
Nate Butler
957ab65422 Mix neutral and blue to make a predictive color that is unique 2023-04-18 14:47:52 -04:00
Nate Butler
ae0647c3a9 Update predictive color 
Co-Authored-By: Mikayla Maki <mikayla.c.maki@gmail.com>
 2023-04-18 14:29:08 -04:00
Nate Butler
7ba094e10e add license_checksum 2023-04-11 12:56:18 -04:00
Nate Butler
20ec9f6daf Add meta fields to ayu 2023-04-11 12:37:20 -04:00
Nate Butler
65c2fb1cc6 Fix paths after publishing 2023-04-11 12:25:02 -04:00
Nate Butler
de60657d53 Ignore the target folder 2023-04-11 12:23:54 -04:00
Nate Butler
975f5d5fa8 Format 2023-04-11 12:23:21 -04:00
Nate Butler
527f0310e2 Update + publish the Ayu theme 2023-04-11 12:22:49 -04:00
Julia
4b39df4a6b
Merge pull request #2304 from zed-industries/bump-diff-width 
Increase git diff gutter width slightly
 2023-04-06 10:58:55 -04:00
Mikayla Maki
afc9b832c8 Finish device code flow for copilot 2023-03-30 16:50:33 -07:00
Mikayla Maki
f5d4bcd934 Added erorr states and first-pass error handling to the copilot status bar item. 
Added correct icons
Added a new 'Toast' action which allows other crates to easily pop toasts with an optional click action
 2023-03-30 14:10:57 -07:00
Mikayla Maki
cc7c5b416c Add status bar icon reflecting copilot state to Zed status bar 2023-03-29 21:31:33 -07:00
Mikayla Maki
ae3b3ea458 Merge branch 'main' into copilot 2023-03-29 16:57:38 -07:00
Julia
737e2e1b3c Open symbol outline when clicking on editor breadcrumbs 2023-03-29 15:46:43 -04:00
Mikayla Maki
9d8d2bb8f4 Add rough versions of all 3 modals 2023-03-28 18:00:09 -07:00
Mikayla Maki
0ef9cefe0f Finish shape of copilot auth UI 2023-03-28 09:42:01 -07:00
Mikayla Maki
6ff09865eb Create copilot auth popup UI 2023-03-28 09:42:01 -07:00
Nate Butler
ef6c28326d Update editor.ts 2023-03-28 09:42:01 -07:00
Nate Butler
2fede1c01f Use syntax.predictive.color to style suggestions 2023-03-28 09:42:01 -07:00
Antonio Scandurra
6715e5247c Rework SuggestionMap to take highlight style when retrieving chunks 2023-03-28 09:42:01 -07:00
Mikayla Maki
15e29d44b9 Add basic copilot modal 2023-03-28 09:42:00 -07:00
Mikayla Maki
b57d5174aa Add copilot theme, start sketching out the auth modal 2023-03-28 09:42:00 -07:00
Petros Amoiridis
b153bf7118
Add a hovered style to lspStatus background 2023-03-27 14:26:56 +03:00
Petros Amoiridis
374b284a3d
Run prettier on TS files 2023-03-27 14:26:05 +03:00
Mikayla Maki
5cad3d3a67
Merge pull request #2317 from zed-industries/fix-titlebar-right-spacing 
Fix misaligned UI in the right titlebar
 2023-03-23 13:16:40 -07:00
Mikayla Maki
bb5c2833a3 Aligned title bar items to the center and fixed left spacing on the sign in button 
co-authored-by: max <max@zed.dev>
 2023-03-23 13:08:31 -07:00
Petros Amoiridis
d5bb2d13b8
Introduce terminal button count 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2023-03-22 16:13:58 +02:00
Petros Amoiridis
98ae69a61f
Merge pull request #2282 from zed-industries/petros/z-283-make-pop-up-positioning-consistent 
Consistent pop-up menu positions
 2023-03-20 17:55:40 +02:00
Julia
368a6405a1 Increase git diff gutter width slightly 2023-03-17 15:28:38 -04:00
Antonio Scandurra
f9d793cb4a Honor more OpenType features 2023-03-17 13:40:00 +01:00
Petros Amoiridis
3bddf01962
Run prettier to format things 2023-03-17 14:05:49 +02:00
Petros Amoiridis
86ed5b8b83
Position contacts and user menus 
Using the new approach for consistency
 2023-03-17 14:05:46 +02:00
Antonio Scandurra
76167ca65c Allow setting font features on TextStyle 2023-03-17 11:49:22 +01:00
Max Brunsfeld
c4e7611d04 Fix collaborator avatars being clipped and not centered 
Co-authored-by: Nathan Sobo <nathan@zed.dev>
Co-authored-by: Julia Risley <julia@zed.dev>
 2023-03-14 17:59:33 -07:00
Mikayla Maki
2a5ac4f203
Merge pull request #2283 from zed-industries/fix-code-fold-indicator-scaling 
Change fold icon width to scale with font size
 2023-03-14 10:07:25 -07:00
Mikayla Maki
2ba38b2fca Change icon width to scale with font size 2023-03-14 00:42:15 -07:00
Mikayla Maki
88599add56 Remove UI for invite link in prep for beta launch 2023-03-13 12:54:20 -07:00
Mikayla Maki
77a63c6598
Merge pull request #2277 from zed-industries/switch-invite-person-icon 
Update Collab + icon
 2023-03-13 10:54:33 -07:00
Nate Butler
edd925f77b Format 2023-03-13 13:49:00 -04:00
Nate Butler
6497ca8ccb Update icon 2023-03-13 13:47:58 -04:00
Nate Butler
e64fe6d660 Improve contrast of project panel active state in light themes 2023-03-13 13:10:46 -04:00
Nate Butler
7df2440757 Format 2023-03-13 12:59:23 -04:00
Nate Butler
6fd4e28813 Update picker active and hover styles 
Thanks for pointing this out @ForLoveOfCats

Co-Authored-By: Julia <30666851+ForLoveOfCats@users.noreply.github.com>
 2023-03-13 12:59:17 -04:00
Mikayla Maki
30a08467b0
Merge pull request #2263 from zed-industries/language-status-bar 
Language status bar
 2023-03-10 16:26:42 -08:00
Mikayla Maki
c8de738972 Align feedback button styles with other sidebar buttons 
Make feedback button reflect whether you're in a feedback buffer
 2023-03-10 16:19:33 -08:00
Mikayla Maki
37d01c7fb3
Merge pull request #2199 from zed-industries/welcome-experience 
Welcome experience
 2023-03-10 10:48:30 -08:00
Antonio Scandurra
f50b51bdad Adjust styling 2023-03-10 17:37:45 +01:00
Antonio Scandurra
693172854c Show active buffer's language on the right in the status bar 2023-03-10 17:37:34 +01:00
Antonio Scandurra
6e37ff880f Replace "Give Feedback" with an icon and move it to the left 
This is so we can show the current language in the status bar on
the right, and having two pieces of text sitting next to each other
felt too busy.

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2023-03-10 17:02:52 +01:00
Mikayla Maki
648f0e5b7b Remove new logo from style tree 2023-03-09 19:18:17 -08:00
Nate Butler
8ee25be7b9 Update empty pane styling 
Co-Authored-By: Mikayla Maki <mikayla.c.maki@gmail.com>
 2023-03-09 20:18:29 -05:00
Mikayla Maki
daed75096e Fix editor test to clearly show trailing whitespace 
Adjsut default dock size to be a multiple of 16
 2023-03-09 13:18:03 -08:00
Mikayla Maki
718052bb72 Undo accidental indent change of hoverpopover.ts 2023-03-09 13:02:25 -08:00
Nate Butler
baff428de5 Re-add Ayu 2023-03-09 10:51:28 -05:00
Nate Butler
3952e98320 Remove Zed Pro theme 2023-03-09 10:50:11 -05:00
Nate Butler
51be0efa1f Format 2023-03-09 10:47:58 -05:00
Nate Butler
5bfd5e35b3 Add light themes 2023-03-09 10:47:01 -05:00
Mikayla Maki
325827699e Adjust styling for blank page experience 2023-03-08 19:02:13 -08:00
Mikayla Maki
709c101834 Adjust styles on usage note 2023-03-08 18:50:17 -08:00
Mikayla Maki
943ea61452 Add a note on how to check the telemetry 2023-03-08 18:47:52 -08:00
Mikayla Maki
cf6ea6d698 Fix bug with action keybindings not being resolved 2023-03-08 18:11:11 -08:00
Mikayla Maki
152755b043 Add blank pane experience 2023-03-08 17:56:39 -08:00
Mikayla Maki
f62e0b502a Remove welcome experience action 
Make logo switch between light and dark

co-authored-by: Nathan <nathan@zed.dev>
 2023-03-08 14:49:48 -08:00
Nate Butler
344f59adf7 Tweak welcome design 
Co-Authored-By: Mikayla Maki <mikayla.c.maki@gmail.com>
 2023-03-08 17:14:15 -05:00
Nate Butler
9842b7ad1a WIP 
Co-Authored-By: Mikayla Maki <mikayla.c.maki@gmail.com>
 2023-03-08 16:34:27 -05:00
Mikayla Maki
ab4b3293d1 Fix project panel button and style it 
Co-authored-by: max <max@zed.dev>
 2023-03-07 14:49:13 -08:00
Nate Butler
84aefb9dcb Add the rest of the Atelier dark themes 2023-03-07 13:47:18 -08:00
Nate Butler
4e81513af1 Add more Atelier themes 2023-03-07 13:35:32 -08:00
Nate Butler
90296667b0 Remove current staff themes 2023-03-07 13:35:23 -08:00
Nate Butler
e0f9b2b40f Update Atelier Dune 2023-03-07 13:27:01 -08:00
Nate Butler
477453c396 Update existing Atelier themes 2023-03-07 13:22:07 -08:00
Nate Butler
ee154feda4
Merge pull request #2231 from zed-industries/nate/add-gruvbox 
Add Gruvbox Theme
 2023-03-06 18:49:26 -08:00
Mikayla Maki
ba652fc033 Finish basic welcome experience 2023-03-06 16:28:23 -08:00
Max Brunsfeld
c832e4406e Remove more colors from default syntax theme 
These default colors weren't consistent with the rest of the
syntax theme.
 2023-03-06 15:57:04 -08:00
Max Brunsfeld
246a6adab7
Merge pull request #2239 from zed-industries/add-constructor-to-syntax-overrides 
Add constructor to syntax overrides
 2023-03-06 15:27:09 -08:00
Mikayla Maki
4a8527478d Add child item alignment to flex implementation 
Fix checkbox styling

co-authored-by: Nathan <nathan@zed.dev>
 2023-03-06 14:26:32 -08:00
Mikayla Maki
f89f33347d Added CTA buttons to welcome experience 
Co-authored-by: Nathan <nathan@zed.dev>
 2023-03-06 14:26:32 -08:00
Mikayla Maki
5210be95fe Added welcome experience sketch 
Made toolbar hideable
 2023-03-06 14:26:32 -08:00
Mikayla Maki
118435a348 Added basic styling for checkboxes, yay 
Co-authored-by: Max <max@zed.dev>
 2023-03-06 14:25:10 -08:00
Mikayla Maki
416c793076 Start on welcome experience settings 2023-03-06 14:25:10 -08:00
Mikayla Maki
50682dc685
Merge pull request #2233 from zed-industries/fix-code-folding-initialization 
Initialize code fold indicators on buffer startup
 2023-03-03 12:30:53 -08:00
Mikayla Maki
606d683f29 Add interactable fold markers 
Change fold handlers to be driven by the fold map
Switch to a mouse region based implementation for click regions

Co-authored-by: Max <max@zed.dev>
 2023-03-03 12:26:36 -08:00
Nate Butler
f1b5bf051a Fornat 2023-03-03 10:58:43 -08:00
Nate Butler
ad4201f768 Hack to fix syntax.constructor causing TS error 2023-03-03 10:58:25 -08:00
Nate Butler
75a9cfdabe Remove leftover log 2023-03-03 10:22:50 -08:00
Mikayla Maki
9f86ca8574
Update tabBar.ts 2023-03-02 15:48:31 -08:00
Mikayla Maki
6a2a1303c4 Fix failing license 
co-authored-by: nate <nate@zed.dev>
 2023-03-02 12:32:47 -08:00
Nate Butler
f67c3f1f1d Add Gruvbox syntax overrides 2023-03-01 11:49:13 -05:00
Nate Butler
bde0456111 Init gruvbox theme 2023-03-01 10:16:45 -05:00