update theme
This commit is contained in:
@@ -451,8 +451,12 @@ impl ButtonVariant {
|
||||
match self {
|
||||
ButtonVariant::Primary => cx.theme().on_solid,
|
||||
ButtonVariant::Secondary => cx.theme().text,
|
||||
ButtonVariant::Danger => cx.theme().on_accent,
|
||||
ButtonVariant::Warning => cx.theme().text,
|
||||
// Bezel's destructive pairing: the red plate carries white ink in
|
||||
// both appearances, not the appearance-flipping on_accent.
|
||||
ButtonVariant::Danger => gpui::white(),
|
||||
// warning_muted is a translucent amber wash, so the label is the
|
||||
// amber token itself — dark amber in light, bright in dark.
|
||||
ButtonVariant::Warning => cx.theme().warning,
|
||||
ButtonVariant::Transparent => cx.theme().text_faint,
|
||||
ButtonVariant::Ghost { alt } => {
|
||||
if *alt {
|
||||
@@ -470,7 +474,7 @@ impl ButtonVariant {
|
||||
ButtonVariant::Primary => plate_hover(cx.theme().solid),
|
||||
ButtonVariant::Secondary => cx.theme().surface_raised_hover,
|
||||
ButtonVariant::Danger => plate_hover(cx.theme().danger_strong),
|
||||
ButtonVariant::Warning => cx.theme().element_hover,
|
||||
ButtonVariant::Warning => plate_hover(cx.theme().warning_muted),
|
||||
ButtonVariant::Ghost { .. } => cx.theme().element_hover,
|
||||
ButtonVariant::Transparent => gpui::transparent_black(),
|
||||
ButtonVariant::Custom(colors) => colors.hover,
|
||||
@@ -491,7 +495,7 @@ impl ButtonVariant {
|
||||
ButtonVariant::Primary => plate_active(cx.theme().solid),
|
||||
ButtonVariant::Secondary => plate_active(cx.theme().surface_raised),
|
||||
ButtonVariant::Danger => plate_active(cx.theme().danger_strong),
|
||||
ButtonVariant::Warning => cx.theme().element_active,
|
||||
ButtonVariant::Warning => plate_active(cx.theme().warning_muted),
|
||||
ButtonVariant::Ghost { .. } => cx.theme().element_active,
|
||||
ButtonVariant::Transparent => gpui::transparent_black(),
|
||||
ButtonVariant::Custom(colors) => colors.active,
|
||||
@@ -511,7 +515,7 @@ impl ButtonVariant {
|
||||
ButtonVariant::Primary => cx.theme().element_active,
|
||||
ButtonVariant::Secondary => cx.theme().element_active,
|
||||
ButtonVariant::Danger => plate_active(cx.theme().danger_strong),
|
||||
ButtonVariant::Warning => cx.theme().element_active,
|
||||
ButtonVariant::Warning => plate_active(cx.theme().warning_muted),
|
||||
ButtonVariant::Ghost { .. } => cx.theme().element_active,
|
||||
ButtonVariant::Transparent => gpui::transparent_black(),
|
||||
ButtonVariant::Custom(colors) => colors.active,
|
||||
|
||||
@@ -467,7 +467,7 @@ impl TabGroupSkin {
|
||||
let bar = TabBar::new("tab-bar")
|
||||
.track_scroll(&self.scroll_handle)
|
||||
.h(TABBAR_HEIGHT)
|
||||
.bg(cx.theme().surface)
|
||||
.bg(cx.theme().bg)
|
||||
.when(needs_traffic_light_padding, |this| {
|
||||
this.pl(px(TRAFFIC_LIGHT_PADDING))
|
||||
})
|
||||
@@ -569,7 +569,7 @@ impl TabGroupSkin {
|
||||
h_flex()
|
||||
.h(TABBAR_HEIGHT)
|
||||
.w_full()
|
||||
.bg(cx.theme().surface)
|
||||
.bg(cx.theme().bg)
|
||||
.child(bar.flex_1())
|
||||
.child(window_controls())
|
||||
.into_any_element()
|
||||
@@ -718,7 +718,7 @@ impl TabGroupRenderer for TabGroupSkin {
|
||||
.child(
|
||||
div()
|
||||
.size_full()
|
||||
.bg(cx.theme().surface)
|
||||
.bg(cx.theme().bg)
|
||||
.overflow_hidden()
|
||||
.child(panel.cached(StyleRefinement::default().v_flex().size_full())),
|
||||
)
|
||||
|
||||
@@ -44,7 +44,7 @@ impl NotificationKind {
|
||||
Self::Info => (IconName::Info, cx.theme().text_muted),
|
||||
Self::Success => (IconName::CheckCircle, cx.theme().success),
|
||||
Self::Warning => (IconName::Warning, cx.theme().warning),
|
||||
Self::Error => (IconName::CloseCircle, cx.theme().on_accent),
|
||||
Self::Error => (IconName::CloseCircle, gpui::white()),
|
||||
};
|
||||
Icon::new(name).with_size(Size::Medium).text_color(color)
|
||||
}
|
||||
@@ -284,7 +284,9 @@ impl Render for Notification {
|
||||
};
|
||||
|
||||
let text_color = match self.kind {
|
||||
Some(NotificationKind::Error) => cx.theme().on_accent,
|
||||
// White on the danger plate in both appearances, per bezel's
|
||||
// destructive pairing.
|
||||
Some(NotificationKind::Error) => gpui::white(),
|
||||
_ => cx.theme().text,
|
||||
};
|
||||
|
||||
|
||||
@@ -191,7 +191,9 @@ impl RenderOnce for Tab {
|
||||
.text_sm()
|
||||
.rounded(px(theme::button_radius()))
|
||||
.overflow_hidden()
|
||||
.when(selected && !disabled, |this| this.bg(cx.theme().bg))
|
||||
.when(selected && !disabled, |this| {
|
||||
this.bg(cx.theme().element_active)
|
||||
})
|
||||
.when(!selected && !disabled, |this| {
|
||||
this.hover(|this| {
|
||||
this.bg(cx.theme().element_hover)
|
||||
|
||||
@@ -70,7 +70,9 @@ impl ControlIcon {
|
||||
#[inline]
|
||||
fn hover_fg(&self, cx: &App) -> Hsla {
|
||||
if self.is_close() {
|
||||
cx.theme().on_accent
|
||||
// White on the danger plate in both appearances, per bezel's
|
||||
// destructive pairing.
|
||||
gpui::white()
|
||||
} else {
|
||||
cx.theme().text
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user