Commit Graph
169 Commits
Author SHA1 Message Date
Marshall Bowers 2d053a6413 Pull editor inlay hints from VS Code themes 2023-12-07 15:36:13 -05:00
Nate Butler 9136216071 add color_alpha function 2023-12-07 00:15:43 -05:00
Mikayla 8d491f7e44 Merge branch 'main' into terminal-element 2023-12-06 15:20:04 -08:00
Max BrunsfeldandNathan 5392e6ca24 Enable buffer font size adjustment in zed2
Co-authored-by: Nathan <nathan@zed.dev>
2023-12-06 13:52:33 -08:00
Kirill Bulatov c5bcd65546 Pass proper theme colors for inlays and suggestions 2023-12-06 21:48:39 +02:00
Marshall Bowers 1b17e89ef1 Format code 2023-12-05 14:17:22 -05:00
Mikayla abe83c8b69 Merge branch 'main' into terminal-element 2023-12-05 09:33:46 -08:00
Nate Butler 7989ec5072 Work on light theme, update tab 2023-12-04 17:54:37 -05:00
Nate Butler 0767dae65a Ensure disabled buttons don't have interaction styles 2023-12-04 09:37:56 -05:00
Mikayla b75765051a Merge branch 'main' into terminal-element 2023-12-01 16:21:38 -08:00
Mikayla 132385aee8 WIP: layout compiling 2023-11-30 11:01:36 -08:00
Antonio Scandurra 418a3e13d1 Fix errors in theme2 2023-11-30 12:08:00 +01:00
Mikayla d6a5f8a3aa Merge branch 'main' into welcome2 2023-11-28 15:38:51 -08:00
Nate Butler f28e252e50 Merge branch 'main' into refine-keybindings 2023-11-28 14:00:09 -05:00
Mikayla a614cc433c Merge branch 'main' into welcome 2023-11-27 18:55:23 -08:00
Nate Butler f4b6b013ab Update theme2.rs 2023-11-27 09:11:51 -05:00
Nate Butler 18c3668c84 Update one theme colors 2023-11-24 16:57:35 -05:00
Mikayla a11500cd55 WIP 2023-11-21 12:40:00 -08:00
Marshall BowersandNate Butler df13ae0875 Extract Story into separate story crate (#3378)
This PR extracts the `Story` component into a separate `story` crate so
that it can be shared among various crates that define stories.

Release Notes:

- N/A

---------

Co-authored-by: Nate Butler <iamnbutler@gmail.com>
2023-11-21 13:42:00 -05:00
Marshall Bowers 027f2eaefd Fix panic when opening settings in zed2 (#3375)
This PR fixes a panic that occurs when opening the settings in zed2.

We store the `ThemeRegistry` as a global without wrapping it in an
`Arc`, so we need to retrieve it the same way.

Release Notes:

- N/A
2023-11-21 10:58:52 -05:00
42dfefd738 WIP
co-authored-by: conrad <conrad@zed.dev>
co-authored-by: Nathan <nathan@zed.dev>
2023-11-20 14:46:01 -08:00
Conrad Irwin 16cca67638 Merge branch 'main' into derive-element-redux 2023-11-20 09:15:38 -07:00
Nate Butler c6468b1850 kb 2023-11-20 10:46:23 -05:00
Nathan Sobo d2d1f1a1ff Element refinement passing on ui2 2023-11-18 20:05:47 -07:00
Nathan Sobo 43f3ddf86a WIP: Work toward eliminating Component trait
This refactor enhances the overall design by promoting reusable and composable UI component structures within the Zed project codebase.
2023-11-18 00:03:23 -07:00
Julia 9a986fc6ab Merge branch 'main' into unborked-git-zed2-diagnostics-view 2023-11-17 16:32:35 -05:00
Julia 5ded1aa46f Get diagnostic2 tests building and running 2023-11-17 16:32:35 -05:00
Nate Butler e9189b9096 Add ui_font settings and set default rem size accordingly (#3346)
[[PR Description]]
- Adds ui_font_family, ui_font_features, ui_font_size to settings and
default settings
- Use the new ui font settings to set the rem size when the workspace is
created.

Release Notes:

- N/A
2023-11-16 15:40:33 -05:00
Marshall Bowers 89cd4ac842 Parameterize theme2::init to allow loading just the base theme (#3345)
This PR adds a parameter to the `theme2::init` method to indicate what
the theme-loading behavior should be.

This allows us to indicate when we want to load all of the additional
built-in user themes (like in the Zed binary and in the storybook), and
when we don't want to load the user themes (like in tests).

We're using an enum over just a `bool` here for clarity at the call
site.

Release Notes:

- N/A
2023-11-16 13:03:30 -05:00
Nate ButlerandMarshall Bowers 4f9f0ce53c Allow users to set UI font properties in their settings
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
2023-11-16 11:37:46 -05:00
Mikayla 7d62f43366 Merge branch 'main' into element-types 2023-11-14 15:49:10 -08:00
Mikayla 2f92e4ff1b WIP 2023-11-14 14:48:34 -08:00
Nathan Sobo 7d1a6a81df Merge remote-tracking branch 'origin/main' into element-types 2023-11-14 01:55:58 -07:00
Nathan Sobo 4df524687e Rename back to div 2023-11-14 01:41:55 -07:00
Nathan Sobo 14d5584205 Checkpoint 2023-11-14 01:15:48 -07:00
Marshall Bowers bdeec3b434 Use "One Dark" as default theme 2023-11-13 18:44:17 -05:00
Marshall Bowers 8e2a7b803f Merge branch 'main' into one-themes 2023-11-13 18:16:45 -05:00
Nate Butler 062e4fe6a0 Remove unused imports 2023-11-13 17:54:22 -05:00
Nate Butler 98916f54d2 WIP 2023-11-13 17:38:44 -05:00
Nate Butler 70ff9b5fdd Add one syntax theme 2023-11-13 17:09:55 -05:00
Nate Butler f00f2ec9f8 Add one_dark theme 2023-11-13 15:48:05 -05:00
Nate Butler 8935763d3d Allow arrays of colors to be passed in 2023-11-13 15:47:57 -05:00
Nate Butler 2e78d9494a Add color converter util 2023-11-13 15:28:20 -05:00
Marshall Bowers 079616a622 Choose appropriate player colors based on theme appearance 2023-11-13 15:07:13 -05:00
Nate Butler b2c70dc203 Reorganize theme2 crate 2023-11-13 13:58:23 -05:00
Nate Butler 85bfa9caaa Checkpoint Broken 2023-11-13 12:44:50 -05:00
Nate Butler 5322689909 Checkpoint 2023-11-13 12:09:31 -05:00
Nate Butler 2e18121d4c Update Status Colors 2023-11-13 11:56:42 -05:00
Marshall Bowers 407b4ae3be Re-import the Synthwave 84 theme (#3297)
This PR re-imports the Synthwave 84 theme now that we support 3-value
hex colors.

Release Notes:

- N/A
2023-11-09 18:56:42 -05:00
Marshall Bowers 3b3b4c0752 Extend RGBA hex color parsing to support 3-value and 4-value variants (#3295)
This PR extends our support for parsing hex color codes to `Rgba` to
additionally support 3-value (`#rgb`) and 4-value (`#rgba`) formats.

See [here](https://developer.mozilla.org/en-US/docs/Web/CSS/hex-color)
for more details on these hex color variants.

Release Notes:

- N/A
2023-11-09 18:27:47 -05:00