Nate Butler
2b0c959137
Add terminal colors to ThemeColors, add _background to some color names.
2023-11-02 19:53:52 -04:00
Marshall Bowers
152ac6927f
Add themes2/src/themes directory
2023-11-02 19:17:39 -04:00
Marshall Bowers
d1636bf16b
Finish up theme printer
2023-11-02 19:14:51 -04:00
Marshall Bowers
e48332c81f
Parse VSCode theme files
2023-11-02 18:00:55 -04:00
Nate Butler and Marshall Bowers
058981350c
Scaffold out new theme-importer crate
...
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com >
2023-11-02 17:21:11 -04:00
Nate Butler
972f076b4d
Deserialize theme metadata
2023-11-02 16:31:22 -04:00
Nate Butler
58ac7f2926
[Broken] Load a src theme in test
2023-11-02 16:26:27 -04:00
Nate Butler
809d8786f1
WIP
2023-11-02 14:54:53 -04:00
Nate Butler
004c5d309b
WIP
2023-11-02 14:23:43 -04:00
Marshall Bowers
aa14552fee
Remove unneeded .intos
2023-11-01 22:01:59 -04:00
Marshall Bowers
b9ac1e43cd
Update scale accessors
2023-11-01 22:00:16 -04:00
Marshall Bowers
bd4bff47a0
Merge branch 'main' into n/t2
2023-11-01 21:54:10 -04:00
Marshall Bowers
72d060108d
Make indexing into ColorScales safe ( #3205 )
...
This PR makes indexing into `ColorScale`s safe by constraining the
`ColorScaleStep`s to a set of known values.
Release Notes:
- N/A
2023-11-01 21:52:42 -04:00
Marshall Bowers
220228c183
Fix underflow when indexing into ColorScales
2023-11-01 21:15:06 -04:00
Marshall Bowers
115bd65344
Merge branch 'main' into n/t2
2023-11-01 21:11:26 -04:00
Marshall Bowers
69aafe9ff6
Adjust ColorScale representation ( #3204 )
...
This PR adjusts the representations of `ColorScale`s to allow us to
remove an unsafe `From` impl when converting from the statically-defined
representation of the scale.
Release Notes:
- N/A
2023-11-01 21:10:50 -04:00
Nate Butler
d0975aacac
Merge branch 'main' into n/t2
2023-11-01 16:52:43 -04:00
Nate Butler
3f74f75dee
WIP
2023-11-01 16:19:49 -04:00
Marshall Bowers
b910bbf002
Add ui_font_size setting ( #3199 )
...
This PR adds a new `ui_font_size` setting that can be used to control
the scale of the entire UI.
We use the value in this setting to set the base rem size of the window.
Release Notes:
- N/A
2023-11-01 13:11:12 -04:00
Marshall Bowers
6ed60769ac
Merge branch 'n/t2' of github.com:zed-industries/zed into n/t2
2023-11-01 10:52:29 -04:00
Marshall Bowers
3189cd779e
Remove unused impl
2023-11-01 10:52:25 -04:00
Nate Butler
5d660759bf
Continue refining default syntax theme
2023-11-01 10:50:00 -04:00
Marshall Bowers
d2a8f972f3
Fix return type
2023-11-01 10:48:23 -04:00
Marshall Bowers
8fb7c174b0
Merge branch 'main' into n/t2
2023-11-01 10:46:27 -04:00
Marshall Bowers
bbe53895ef
Return ColorScaleSets from individual color scale functions ( #3197 )
...
This PR adjusts the individual color scale functions to return
`ColorScaleSet`s instead of `DefaultColorScaleSet`s.
We only use the `DefaultColorScaleSet`s to simplify the construction of
the scales, so it isn't necessary to surface them outside of the
function.
Release Notes:
- N/A
2023-11-01 10:45:42 -04:00
Marshall Bowers
b8547e926d
Remove blanket From<&str> impl for Hsla
...
Since this is a fallible operation we don't want to have a blanket
infallible conversion from any arbitrary `&str` to an `Hsla`.
2023-11-01 10:31:03 -04:00
Nate Butler
bfb1f5ecf0
Continue refining theme, update tabs & tab bar
2023-11-01 01:41:33 -04:00
Nate Butler
0efd69c60f
Refine default colors
2023-11-01 00:51:57 -04:00
Marshall Bowers
272f856460
Use Refineable for ThemeStyles ( #3196 )
...
This PR updates the `ThemeStyles` struct to use the `Refineable` trait
instead of a custom declarative macro for generating refinements.
Release Notes:
- N/A
2023-10-31 23:33:51 -04:00
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
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
49571127da
theme2: Correctly reference the dark alpha scale
2023-10-30 17:35:13 -04:00
Marshall Bowers
a02d806715
Add a story showcasing the color scales
2023-10-30 17:31:15 -04:00
Marshall Bowers
991f58409e
Fix alpha channel values for color scales
2023-10-30 17:20:43 -04:00
Marshall Bowers
e0f68c77b0
Add type alias for steps in color scales
2023-10-30 17:08:37 -04:00
Marshall Bowers
b128377cd2
Register all of the color scales
2023-10-30 17:03:33 -04:00
Marshall Bowers
ccccf84867
Define all color scales
2023-10-30 17:00:46 -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
Marshall Bowers
d3cd5f3ec5
Format theme2
2023-10-30 11:26:30 -04:00
Marshall Bowers
3d8516b25f
Convert all themes
2023-10-30 11:22:04 -04:00
Marshall Bowers
2879d231b1
Revert changes to themes
2023-10-30 11:06:45 -04:00
Marshall Bowers
3591ffe4a7
Emit all themes at once
2023-10-30 11:04:03 -04:00
Marshall Bowers
560e115656
Pull syntax colors from JSON theme
2023-10-26 17:06:05 +02:00
Max Brunsfeld and Marshall 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
a0fe859d87
Make theme converter spit out valid Rust structs
2023-10-25 18:20:16 +02:00
Nate Butler