oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,363 Commits 1 Branch 0 Tags
e43d5dfea8d6942dc807166c6400ea13f4be31da
Commit Graph
226 Commits
Author SHA1 Message Date
Piotr Osiewicz 406edd279a Merge branch 'main' into refine-render-traits 2024-01-03 12:27:42 +01:00
Piotr Osiewicz 7747c5dbd9 Fix up storybooks in theme2 2024-01-03 12:23:05 +01:00
Marshall Bowers e8df1a7284 Fix hint colors (#3855) 
This PR fixes the hint colors, which were no longer correct after #3842.

Release Notes:

- N/A
 2024-01-02 20:34:18 -05:00
Marshall Bowers 93a818d018 Add additional status colors and style diagnostic popovers (#3846) 
This PR adds additional background and border colors for each of the
status colors to the theme.

These colors are then used to style the diagnostic popovers:

<img width="407" alt="Screenshot 2024-01-02 at 4 25 50 PM"
src="https://github.com/zed-industries/zed/assets/1486634/fbc64ea7-3dcd-43b7-8520-91f16304bfba">

<img width="396" alt="Screenshot 2024-01-02 at 4 26 05 PM"
src="https://github.com/zed-industries/zed/assets/1486634/6e4a44bf-4aac-4595-afff-7fbf8b2b9e1f">

Release Notes:

- N/A
 2024-01-02 16:37:55 -05:00
Marshall Bowers d64d91a321 Restore transparency to scroll bar handles (#3843) 
This PR restores the semi-transparency to the scroll bar handle colors
that were lost in #3842.

If we adjust the rendering of the scrollbar to draw the status
indicators on top of the scrollbar handle then we can remove the
transparency.

Release Notes:

- N/A
 2024-01-02 15:39:04 -05:00
Nate ButlerandMarshall Bowers 711b099ea0 Update status colors in zed1 importer 
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
 2024-01-02 14:53:51 -05:00
Nate ButlerandMarshall Bowers ff74c9367a Get zed1 theme importer down to no warnings 
Note: We removed some unused theme colors
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
 2024-01-02 14:47:46 -05:00
Nate ButlerandMarshall Bowers 9c91b65ce2 Use mostly base theme 
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
 2024-01-02 14:30:11 -05:00
Nate ButlerandMarshall Bowers 7ea9725125 Start using base theme in zed1 theme importer 
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
 2024-01-02 14:21:20 -05:00
Marshall Bowers 853192b059 Map suggestion colors from Zed1 themes (#3835) 
This PR maps the suggestions colors from the Zed1 themes to the Zed2
themes.

Release Notes:

- N/A
 2024-01-02 12:08:29 -05:00
Marshall Bowers f5b3e473fc theme_importer: Map drop target colors (#3830) 
This PR maps the drop target background color in the `theme_importer`.

Release Notes:

- N/A
 2024-01-02 10:40:24 -05:00
Piotr Osiewicz 219999cd8d theme2: Move stories to RPITIT for Render 2024-01-01 14:23:02 +01:00
Kirill Bulatov 1c13c3a243 Use ghost_element_background for avatar background color 
Also add a couple todo!()s on top of the comments
 2023-12-30 01:10:48 +02:00
Nathan Sobo 02f7e681a7 Import elevated surface color from hover popover 2023-12-27 11:58:26 -07:00
Marshall Bowers 698460ea89 Style inlay hints (#3806) 
This PR styles the inlay hints after the changes to the themes.

Release Notes:

- N/A
 2023-12-22 23:06:30 -05:00
Marshall Bowers e5148b4a1b Assign player colors from the theme (#3805) 
This PR updates the `theme_importer` to pull in the player colors so
that we can assign them based on the current theme.

Release Notes:

- N/A
 2023-12-22 22:28:41 -05:00
Marshall Bowers 04d26353d2 Adjust muted text colors 2023-12-22 21:25:45 -05:00
Marshall Bowers 9cb613245e Adjust border colors 2023-12-22 21:18:43 -05:00
Marshall Bowers e8a14b1971 Adjust color used for text 2023-12-22 21:10:53 -05:00
Marshall Bowers 1ebfafc03d Map additional text colors from Zed1 themes (#3796) 
This PR maps additional text colors from the Zed1 themes to the Zed2
themes.

Release Notes:

- N/A
 2023-12-22 18:45:58 -05:00
Marshall Bowers b501f4eafc Begin porting Zed1 themes to Zed2 (#3793) 
This PR is a first pass at porting the Zed1 themes to Zed2.

For the initial release of Zed2 we'll be shipping just the themes that
existed in Zed1, ported to Zed2. The new themes that were previously
added just in Zed2 have been removed.

Release Notes:

- N/A
 2023-12-22 17:37:53 -05:00
Marshall Bowers dc64411cca Extend theme_importer in preparation for importing Zed1 themes (#3791) 
This PR extends the `theme_importer` with the overall structure required
to support importing themes from Zed1.

Release Notes:

- N/A
 2023-12-22 13:47:30 -05:00
Marshall Bowers 80143b2571 Fix names for Rosé Pine themes (#3771) 
This PR fixes the names of the Rosé Pine themes.

We want to keep the Unicode "é" in the theme name, both because this is
the actual name of the theme, and also to maintain parity with Zed1.

Release Notes:

- N/A
 2023-12-21 22:45:29 -05:00
Marshall Bowers 94e22ae515 Fix typo in "Noctis Hibernus" theme name (#3770) 
This PR fixes a typo in the name of the "Noctis Hibernus" theme.

Release Notes:

- N/A
 2023-12-21 22:36:40 -05:00
Marshall Bowers afcf6c6852 Map textLink.activeForeground from VS Code to link_text_hover 2023-12-19 18:29:27 -05:00
Nate Butler da7628cc1e Style wrap guides for imported themes 2023-12-18 11:16:22 -05:00
Nate Butler b46f5be490 Style One Dark wrap guides 2023-12-18 11:16:00 -05:00
Marshall Bowers 292fac37bb Use editor.foreground from VS Code for the editor foreground 2023-12-14 17:30:37 -05:00
Marshall Bowers 8bac4e199d Emit editor_foreground color from theme converter 2023-12-14 17:28:45 -05:00
Marshall Bowers 3120a9cbea theme_importer: Fall back to inactive tab background if no active tab background set (#3598) 
This PR makes it so the `theme_importer` falls back to the inactive tab
background color if the theme doesn't not an active tab background
color.

This fixes the active tab color in the Synthwave 84 theme.

Release Notes:

- N/A
 2023-12-11 17:39:46 -05:00
Marshall Bowers e271bbe896 Use editorOverviewRuler.border for the scrollbar track border 2023-12-11 16:54:53 -05:00
Marshall Bowers dfd1b5aa11 Use the editor background for the scrollbar track background 2023-12-11 16:39:26 -05:00
Marshall Bowers 41f55e4d0d Use tab.inactiveForeground from VS Code for muted text color (#3593) 
This PR updates the `theme_importer` to pull in the
`tab.inactiveForeground` color from VS Code to use as the muted text
color.

Release Notes:

- N/A
 2023-12-11 15:57:47 -05:00
Marshall Bowers fe46459982 Pull more scrollbar colors from VS Code 2023-12-11 12:59:03 -05:00
Marshall Bowers 3271cf1030 Map scrollbar colors from VS Code themes 2023-12-11 12:49:54 -05:00
Nate ButlerandMarshall Bowers ea9a42b802 Add new colors to themes 
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
 2023-12-11 12:00:12 -05:00
Nate ButlerandMarshall Bowers b8f9918f75 Add new colors to One Dark 
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
 2023-12-11 11:43:49 -05:00
Nate Butler 6792a216a6 Add new color defs 2023-12-11 11:30:43 -05:00
Marshall Bowers 008c56a09b Adjust which status colors we import from the VS Code theme (#3570) 
This PR adjusts the status colors we import from the VS Code theme to be
the right ones.

Instead of looking at the Git status colors, we use the
`editorGutter.addedBackground`, `editorGutter.modifiedBackground`, and
`editorGutter.deletedBackground` colors for added, modified, and deleted
status colors, respectively.

Release Notes:

- N/A
 2023-12-08 17:56:25 -05:00
Marshall Bowers 2517b1017b Weight scope matches to improve results 2023-12-08 16:35:54 -05:00
Marshall Bowers 2ef3954700 Fix function colors in Gruvbox themes 2023-12-08 16:04:58 -05:00
Marshall Bowers 4353bdb9d5 Restore theme sorting in Zed2 (#3563) 
This PR restores the sorting of themes in the theme selector in Zed2.

Release Notes:

- N/A
 2023-12-08 15:08:35 -05:00
Marshall Bowers 27501d2929 Pull in colors for selected ghost elements 2023-12-08 14:19:56 -05:00
Marshall Bowers 77c8108f9b Use dropdown.background from VS Code for elevated surface background 2023-12-08 14:13:50 -05:00
Marshall Bowers 1c850f495c Use breadcrumb.background from VS Code for toolbar background (#3559) 
This PR changes the color we use for the toolbar background from the VS
Code theme to `breadcrumb.background`.

If this value isn't set then we fall back to the `editor.background`.

Release Notes:

- N/A
 2023-12-08 14:03:18 -05:00
Marshall Bowers 1d35a815a6 Use editorGroupHeader.tabsBackground from VS Code as tab bar background (#3558) 
This PR changes the color we use for the tab bar background from the VS
Code theme to `editorGroupHeader.tabsBackground`.

Release Notes:

- N/A
 2023-12-08 13:50:56 -05:00
Marshall Bowers 62155f3a88 Add fallback to constant tokens for numbers 2023-12-08 13:20:00 -05:00
Marshall Bowers ab5b76e943 Pull Git status colors from VS Code themes 2023-12-08 13:14:22 -05:00
Marshall Bowers 52e4c577d2 Re-import Rosé Pine source themes 2023-12-08 11:45:08 -05:00
Marshall Bowers 6f064cfc36 Improve matching for constructor tokens 2023-12-08 11:34:39 -05:00