Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "ui: Color cleanup (#26673)" (#26681)

Browse source 
This reverts commit 6767e98e00.

Somehow that PR automerged itself even with failed CI checks.

Release Notes:

- N/A
This commit is contained in:
Nate Butler 2025-03-13 11:40:57 -04:00 • committed by GitHub
parent 87cdb68cca
commit b75964a636
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
20 changed files with 161 additions and 139 deletions
Download patch file Download diff file Expand all files Collapse all files

10
crates/assistant_context_editor/src/context_editor.rs
View file

@ -50,7 +50,7 @@ use settings::{update_settings_file, Settings, SettingsStore};
use std::{any::TypeId, borrow::Cow, cmp, ops::Range, path::PathBuf, sync::Arc, time::Duration};
use text::SelectionGoal;
use ui::{
prelude::*, ButtonLike, Disclosure, Elevation, KeyBinding, PopoverMenuHandle, TintColor,
prelude::*, ButtonLike, Disclosure, ElevationIndex, KeyBinding, PopoverMenuHandle, TintColor,
Tooltip,
};
use util::{maybe, ResultExt};
@ -2298,7 +2298,7 @@ impl ContextEditor {
.when_some(tooltip, |button, tooltip| {
button.tooltip(move |_, _| tooltip.clone())
})
.elevation(Elevation::ModalSurface)
.layer(ElevationIndex::ModalSurface)
.child(Label::new(
if AssistantSettings::get_global(cx).are_live_diffs_enabled(cx) {
"Chat"
@ -2357,7 +2357,7 @@ impl ContextEditor {
.when_some(tooltip, |button, tooltip| {
button.tooltip(move |_, _| tooltip.clone())
})
.elevation(Elevation::ModalSurface)
.layer(ElevationIndex::ModalSurface)
.child(Label::new("Suggest Edits"))
.children(
KeyBinding::for_action_in(&Edit, &focus_handle, window, cx)
@ -2661,7 +2661,7 @@ fn render_fold_icon_button(
let editor = editor.clone();
ButtonLike::new(fold_id)
.style(ButtonStyle::Filled)
.elevation(Elevation::ElevatedSurface)
.layer(ElevationIndex::ElevatedSurface)
.child(Icon::new(icon))
.child(Label::new(label.clone()).single_line())
.on_click(move |_, window, cx| {
@ -2721,7 +2721,7 @@ fn quote_selection_fold_placeholder(title: String, editor: WeakEntity<Editor>) -
let editor = editor.clone();
ButtonLike::new(fold_id)
.style(ButtonStyle::Filled)
.elevation(Elevation::ElevatedSurface)
.layer(ElevationIndex::ElevatedSurface)
.child(Icon::new(IconName::TextSnippet))
.child(Label::new(title.clone()).single_line())
.on_click(move |_, window, cx| {