Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 11 additions & 33 deletions zed/themes/flexoki.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@
"element.active": "#343331",
"element.selected": "#343331",
"element.disabled": "#1C1B1A",
"drop_target.background": "#C403E3C",
"drop_target.background": "#403E3C",
"ghost_element.background": "#00000000",
"ghost_element.hover": "#1C1B1A",
"ghost_element.active": "#282726",
"ghost_element.selected": "#282726",
"ghost_element.hover": "#282726",
"ghost_element.active": "#343331",
"ghost_element.selected": "#343331",
"ghost_element.disabled": "#1C1B1A",
"text": "#CECDC3",
"text.muted": "#878580",
Expand All @@ -35,7 +35,7 @@
"icon": "#CECDC3",
"icon.muted": "#878580",
"icon.disabled": "#575653",
"icon.placholder": "#878580",
"icon.placeholder": "#878580",
"icon.accent": "#4385BE",
"status_bar.background": "#1C1B1A",
"title_bar.background": "#1C1B1A",
Expand Down Expand Up @@ -72,15 +72,9 @@
"terminal.foreground": "#CECDC3",
"terminal.bright_foreground": "#CECDC3",
"terminal.dim_foreground": "#CECDC380",
// The `terminal.ansi.bright_black` color controls the foreground color
// of the terminal's auto-completion suggestions, so instead of being set
// to the `tx` color, it is set to `tx-2`.
"terminal.ansi.black": "#100F0F",
"terminal.ansi.bright_black": "#878580",
"terminal.ansi.dim_black": "#100F0F",
// For the normal color values, the 400 value is used, just like
// suggested in the theme's Mappings, but for the bright color the 200
// value is used, while the dim one uses the 600 value.
"terminal.ansi.red": "#D14D41",
"terminal.ansi.bright_red": "#F89A8A",
"terminal.ansi.dim_red": "#AF3029",
Expand All @@ -103,11 +97,6 @@
"terminal.ansi.bright_white": "#FFFCF0",
"terminal.ansi.dim_white": "#878580",
"link_text.hover": "#4385BE",
// For each of the colors in this section, we'll use the color from the
// Mappings for both the regular class as well as the border class, but
// for the background one the 950 variant will be used.
// For example, for red-400 is used for both `error` and `error.border`,
// but `error.background` uses red-950.
"conflict": "#D0A215",
"conflict.background": "#241E08",
"conflict.border": "#D0A215",
Expand Down Expand Up @@ -164,7 +153,7 @@
"font_weight": null
},
"boolean": {
"color": "#DA702C",
"color": "#D0A215",
"background_color": null,
"font_style": null,
"font_weight": null
Expand Down Expand Up @@ -348,9 +337,9 @@
"element.disabled": "#F2F0E5",
"drop_target.background": "#CECDC3",
"ghost_element.background": "#00000000",
"ghost_element.hover": "#F2F0E5",
"ghost_element.active": "#E6E4D9",
"ghost_element.selected": "#E6E4D9",
"ghost_element.hover": "#E6E4D9",
"ghost_element.active": "#DAD8CE",
"ghost_element.selected": "#DAD8CE",
"ghost_element.disabled": "#F2F0E5",
"text": "#100F0F",
"text.muted": "#6F6E69",
Expand Down Expand Up @@ -397,15 +386,9 @@
"terminal.foreground": "#100F0F",
"terminal.bright_foreground": "#100F0F",
"terminal.dim_foreground": "#100F0F80",
// The `terminal.ansi.bright_black` color controls the foreground color
// of the terminal's auto-completion suggestions, so instead of being set
// to the `tx` color, it is set to `tx-2`.
"terminal.ansi.black": "#100F0F",
"terminal.ansi.bright_black": "#6F6E69",
"terminal.ansi.dim_black": "#100F0F",
// For the normal color values, the 600 value is used, just like
// suggested in the theme's Mappings, but for the bright color the 400
// value is used, while the dim one uses the 800 value.
"terminal.ansi.red": "#AF3029",
"terminal.ansi.bright_red": "#D14D41",
"terminal.ansi.dim_red": "#6C201C",
Expand All @@ -428,11 +411,6 @@
"terminal.ansi.bright_white": "#B7B5AC",
"terminal.ansi.dim_white": "#F2F0E5",
"link_text.hover": "#205EA6",
// For each of the colors in this section, we'll use the color from the
// Mappings for both the regular class as well as the border class, but
// for the background one the 50 variant will be used.
// For example, for red-600 is used for both `error` and `error.border`,
// but `error.background` uses red-50.
"conflict": "#AD8301",
"conflict.background": "#FAEEC6",
"conflict.border": "#AD8301",
Expand Down Expand Up @@ -489,7 +467,7 @@
"font_weight": null
},
"boolean": {
"color": "#BC5215",
"color": "#AD8301",
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is the purpose of this change (from orange to yellow)

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was adjusting it to what I was used to, which is how it looks in VSCode. I notice in Helix, it is orange though. I can get a screenshot later this week when I get back on my PC, though I notice someone else's PR is open and it might move faster if we just do all of the work there.

"background_color": null,
"font_style": null,
"font_weight": null
Expand Down Expand Up @@ -654,4 +632,4 @@
}
}
]
}
}