oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,722 Commits 1 Branch 0 Tags
36a73d657a6fe1d53e5d0f81f60bfa83d00b77ff
Commit Graph
15 Commits
Author SHA1 Message Date
Marshall Bowers 36a73d657a Remove old Theme definition (#3195) 
This PR removes the old `Theme` definition in favor of the new
`ThemeVariant`s.

The new `SyntaxStyles` have been reverted to the old `SyntaxTheme` that
operates by storing the syntax styles as a vector of
`gpui2::HighlightStyle`s.

This is necessary for the intended usage by `language2`, where we find
the longest key in the theme's syntax styles that matches the capture
name:

https://github.com/zed-industries/zed/blob/18431051d9d750d9e66284a71f7a55a1e31c1374/crates/language2/src/highlight_map.rs#L15-L41
 2023-10-31 23:05:50 -04:00
Marshall BowersNate ButlerMarshall Bowers
 		18431051d9 Rework theme2 with new theme structure (#3194) 
This PR reworks the theme definition in the `theme2` crate to be based
off of the new theme work that @iamnbutler has been working on.

We're still developing the new theme system, but it is complete enough
that we can now load the default theme and use it to theme the storybook
(albeit with some further refining of the color palette required).

---------

Co-authored-by: Nate Butler <iamnbutler@gmail.com>
Co-authored-by: Marshall Bowers <marshall@zed.dev>
 2023-10-31 22:23:00 -04:00
Julia db34de6be4 Port zed/src/languages to zed2 2023-10-30 21:52:29 -04:00
Marshall Bowers a02d806715 Add a story showcasing the color scales 2023-10-30 17:31:15 -04:00
Marshall Bowers 7841a56a11 Start work on defining color scales 2023-10-30 16:21:59 -04:00
Marshall Bowers ba789fc0c4 Remove old theme constructs 2023-10-30 14:47:44 -04:00
Max BrunsfeldandMarshall Bowers 0eae962abf Represent theme's syntax colors with string keys 
Co-authored-by: Marshall Bowers <marshall@zed.dev>
 2023-10-26 16:38:50 +02:00
Conrad Irwin 07b9ec29e6 Revert "Fix settings2 crate tests" 
This reverts commit 6e9c779c51.
 2023-10-26 11:33:58 +02:00
Conrad Irwin 6e9c779c51 Fix settings2 crate tests 2023-10-26 11:27:23 +02:00
Marshall Bowers e67048ee7b Load themes from settings and rework Settings trait 2023-10-25 20:37:55 +02:00
Marshall Bowers 437d147935 Rename player to players 2023-10-25 16:39:06 +02:00
Marshall Bowers 4ca7ddfc42 Finish up ThemeRegistry and remove AnyAssetSource 2023-10-24 17:47:41 +02:00
Marshall Bowers 4740d6ed61 Checkpoint 2023-10-24 17:29:03 +02:00
Marshall Bowers 09866ec3e9 WIP 2023-10-24 16:59:24 +02:00
Antonio Scandurra 56462ef793 Checkpoint 2023-10-23 10:59:29 +02:00