Commit Graph
813 Commits
Author SHA1 Message Date
Marshall Bowers db4932bb0f Add font_style and font_weight to serialized theme representation (#6838)
This PR adds `font_style` and `font_weight` as fields on the
`HighlightStyleContent` used in the serialized theme representation.

Release Notes:

- N/A
2024-01-26 22:40:31 -05:00
Piotr OsiewiczandKirill 23e18e75d9 Improve performance of JSON schema creation (#6770)
JSON LSP adapter now caches the schema. `workspace_configuration` is
back to being async, and we are also no longer asking for font names
twice while constructing the schema.
Release Notes:
- Improved performance when opening the .json files.

---------

Co-authored-by: Kirill <kirill@zed.dev>
2024-01-26 19:54:45 +01:00
Marshall Bowers 230c5e0d38 Add experimental.theme_overrides to settings file (#6791)
This PR adds **experimental** support for overriding theme values in the
current theme.

Be advised that both the existence of this setting and the structure of
the theme itself are subject to change.

But this is a first step towards allowing Zed users to customize or
bring their own themes.

### How it works

There is a new `experimental.theme_overrides` setting in
`settings.json`.

This accepts an object containing overrides for values in the theme. All
values are optional, and will be overlaid on top of whatever theme you
currently have set by the `theme` field.

There is JSON schema support to show which values are supported.

### Example

Here's an example of it in action:


https://github.com/zed-industries/zed/assets/1486634/173b94b1-4d88-4333-b980-8fed937e6f6d

Release Notes:

- Added `experimental.theme_overrides` to `settings.json` to allow for
customizing the current theme.
  - This setting is experimental and subject to change.
2024-01-26 13:42:58 -05:00
Christian Clauss f58114b0a1 Fix typos discovered by codespell 2024-01-25 18:32:32 +01:00
Mikayla bb634e0bac Fix test error 2024-01-23 21:38:16 -08:00
Piotr Osiewicz 5cb6fc5776 chore: Change AGPL-licensed crates to GPL (except for collab) (#4231)
- [x] Fill in GPL license text.
- [x] live_kit_client depends on live_kit_server as non-dev dependency,
even though it seems to only be used for tests. Is that an issue?

Release Notes:
- N/A
2024-01-24 00:26:58 +01:00
Piotr Osiewicz 1e1b434acc Remove license-file from Cargo.toml as it is apparently redundant (#4218)
Release Notes:

- N/A
2024-01-23 17:40:30 +01:00
Piotr OsiewiczandDavid 3fe512e1aa chore: Add crate licenses. (#4158)
- GPUI and all dependencies: Apache 2
- Everything else: AGPL

Here's a script that I've generated for it:
https://gist.github.com/osiewicz/6afdd6626e517da24a2092807e6f0b6e

Release Notes:
- N/A

---------

Co-authored-by: David <david@zed.dev>
2024-01-23 16:56:22 +01:00
Marshall Bowers 9326d550b1 Add more terminal colors to the theme (#4168)
This PR adds more terminal colors that were present in the Zed1 themes
to the Zed2 theme.

Namely, we now have the `dim_` variants for the various ANSI colors and
various `foreground` colors.

Release Notes:

- Improved terminal colors.
2024-01-19 14:22:53 -05:00
Mikayla 0b43bd7c14 Fix typos detected by crate-ci/typos 2024-01-17 14:31:21 -08:00
Nate Butler 99908fe329 Add the color crate (#4063)
This PR adds the `color` crate, which will be the home of a number of
color-related utilities, and also acts as an interface between
[`palette`](https://crates.io/crates/palette) and the way `gpui` colors
work.

The goal of this crate is to centralize color utilities like mixing and
blending, building color ramps and sets of colors for state and more.

## Todo:

- [x] hex -> Color
- [x] Color mixing
- [x] Color blending using blend modes (overlay, multiply, etc)
- [ ] ~~Build color ramp from color~~
- [x] Build state set from color
- [ ] ~~Update Theme to use the color crate~~

Release Notes:

- None (Internal changes: Adds the `color` crate for working with
colors.)
2024-01-17 11:47:23 -05:00
Piotr Osiewicz 760633c19b Add font name completions to ui_font_family and terminal::font_family 2024-01-16 20:32:21 +01:00
Piotr Osiewicz fec1e8538e Rename all_font_families to all_font_names 2024-01-16 20:32:21 +01:00
Kirill Bulatov 6415aed70c Fix previous theme not being applied on startup 2024-01-16 11:23:34 +02:00
Nate Butler 3d5691ce92 Use srgb, get mix and blend working 2024-01-16 01:08:17 -05:00
Nate Butler b788bc9544 Add a rudimentary state color builder 2024-01-16 00:07:06 -05:00
Max Brunsfeld 461334cad4 Put back logic for resetting buffer font adjustment on settings change. 2024-01-15 17:03:02 -08:00
Max Brunsfeld d5f1ebe4e3 Notify editors on buffer font size changes 2024-01-15 14:53:24 -08:00
Marshall Bowers 79e83919d9 Clean up some theme TODOs (#4034)
This PR cleans up some TODOs we had in the themes.

We won't be addressing these in the immediate term, so no need to have
them show up when folks are looking for TODOs to burn down before
launch.

I added some general notes as signposts until we're ready to revisit
this.

Release Notes:

- N/A
2024-01-12 10:37:18 -05:00
Piotr Osiewicz a4e64c665c settings.json: Suggest font names for buffer_font_family 2024-01-11 23:23:10 +01:00
Kirill BulatovandMarshall Bowers 9b1583509e Fix whitespace symbol colors in the editor, use zed1 one
co-authored-by: Marshall Bowers <marshall@zed.dev>
2024-01-11 17:43:49 +02:00
Mikayla f2bdd30ffc Remove last todos 2024-01-10 12:13:12 -08:00
Mikayla Maki 3a4e71c204 Remove or fix stale todos (#3990)
The software equivalent of dusting

Release Notes:

-
2024-01-09 18:37:35 -08:00
Mikayla 3149f61fee Remove the last of the major todos 2024-01-09 16:14:54 -08:00
Marshall Bowers b3678463e8 Clean up references in doc comments in ui and theme crates (#3985)
This PR cleans up a number of references in doc comments in the `ui` and
`theme` crates so that `rustdoc` will link and display them correctly.

Release Notes:

- N/A
2024-01-09 15:22:36 -05:00
Nate Butler 6161cc7486 Restore removed ColorScaleStep ALL that was breaking the build 2024-01-09 14:16:50 -05:00
Nate ButlerandAntonio Scandurra 0521c1f80e Start documenting Theme crate
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
2024-01-09 12:49:56 -05:00
Marshall Bowers f2585dcaa6 Remove Default impl for StatusColors (#3977)
This PR removes the `Default` impl for `StatusColors`.

Since we need default light and dark variants for `StatusColors`, we
can't use a single `Default` impl.

Release Notes:

- N/A
2024-01-09 11:31:19 -05:00
Marshall Bowers 0800789caf theme: Removed commented-out ActiveTheme impl (#3950)
This PR removes a commented-out implementation for the `ActiveTheme`
trait on the `WindowContext`.

We don't need this implementation as we can go through the
`AppContext`'s implementation.

Release Notes:

- N/A
2024-01-08 13:51:18 -05:00
Marshall Bowers ba318bf17a Decouple theme license generation from TypeScript theme definitions (#3917)
This PR decouples the generation of licenses for the themes we ship from
the TypeScript theme definitions.

For now, we are embedding the license information for the themes in the
`theme_importer`, and emit a combined `LICENSES` file in the `theme`
crate whenever we import themes. This is also where we check that each
theme has a valid license.

We then use this `LICENSES` file when building up the global license
file for Zed.

This decoupling is one step towards us being able to delete the old Zed1
styles.

Release Notes:

- N/A
2024-01-05 13:38:12 -05:00
Conrad Irwin 455d60f20a Merge branch 'main' into channel-guests 2024-01-05 10:05:59 -07:00
Nate Butler f611244312 Update border variant color 2024-01-03 23:13:26 -05:00
Nate Butler aeb21a51df Make scrollbar track transparent 2024-01-03 23:09:24 -05:00
Conrad Irwin ced18721ff Show guests in fewer places 2024-01-03 19:31:43 -07:00
Conrad Irwin 9de8a56f91 Make read only buffers feel more read only 2024-01-03 19:31:43 -07:00
Marshall Bowers fa0362e1f2 Fix predictive text color (#3867)
This PR fixes the predictive text colors, which were no longer correct
after #3842.

Release Notes:

- Fixed predictive text colors.
2024-01-03 17:09:01 -05:00
Max BrunsfeldandMikayla 75f0670dd6 Remove 2 suffix from gpui
Co-authored-by: Mikayla <mikayla@zed.dev>
2024-01-03 12:59:39 -08:00
Max BrunsfeldandMikayla ee573f7906 Remove 2 suffix for theme
Co-authored-by: Mikayla <mikayla@zed.dev>
2024-01-03 12:41:01 -08:00
Nate ButlerandMarshall Bowers e5da901599 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
Max Brunsfeld 7f767a024c Set up UI to allow dragging a channel to the root 2023-10-25 15:39:02 +02:00
Piotr OsiewiczandMax 88e617c9d5 Account for markdown styling in mentions offset calculation.
This also means that we can support smart punctuation.

Co-authored-by: Max <max@zed.dev>
2023-10-23 12:50:57 +02:00
Max Brunsfeld 03b25e2d27 Start styling notification panel 2023-10-22 16:03:33 +02:00
Piotr Osiewicz d9e8e4ba2b Highlight mentions in the Saved chat messages 2023-10-20 15:30:36 +02:00
Max Brunsfeld 256ef99284 Merge branch 'main' into notifications 2023-10-18 17:20:04 -07:00
Max Brunsfeld 1b89d99654 Start work on chat mentions 2023-10-17 17:59:42 -07:00
Conrad Irwin 58950c1d11 Start writing role to database (#3120)
Scaffolding for guest members in channels

Release notes:
- You can now set channels to "public" which will allow anyone to join
and become a member. In a future release guests joining public channels
will have reduced permissions.
2023-10-17 13:40:58 -06:00
Max Brunsfeld f8e8340b84 Display invite response buttons inline in notification panel 2023-10-17 09:12:55 -07:00
Conrad Irwin 9029a2807b Merge branch 'main' into guests 2023-10-17 09:54:17 -06:00
KCaverly 5cba986cee catchup with main 2023-10-16 09:47:07 -04:00
Conrad Irwin a4e960f73a Wire through public access toggle 2023-10-13 16:59:30 -06:00