chore: revamp theme

crates/ui/src/input/element.rs

@@ -1,11 +1,12 @@
-use super::TextInput;
-use crate::theme::{scale::ColorScaleStep, ActiveTheme};
 use gpui::{
     fill, point, px, relative, size, App, Bounds, Corners, Element, ElementId, ElementInputHandler,
     Entity, GlobalElementId, IntoElement, LayoutId, MouseButton, MouseMoveEvent, PaintQuad, Path,
     Pixels, Point, Style, TextRun, UnderlineStyle, Window, WrappedLine,
 };
 use smallvec::SmallVec;
+use theme::ActiveTheme;
+
+use super::TextInput;
 
 const RIGHT_MARGIN: Pixels = px(5.);
 const BOTTOM_MARGIN: Pixels = px(20.);
@@ -149,7 +150,7 @@ impl TextElement {
                         ),
                         size(px(1.), cursor_height),
                     ),
-                    cx.theme().accent.step(cx, ColorScaleStep::TEN),
+                    cx.theme().element_active,
                 ))
             };
         }
@@ -342,17 +343,11 @@ impl Element for TextElement {
         let mut bounds = bounds;
 
         let (display_text, text_color) = if text.is_empty() {
-            (
-                placeholder,
-                cx.theme().base.step(cx, ColorScaleStep::ELEVEN),
-            )
+            (placeholder, cx.theme().text_muted)
         } else if input.masked {
-            (
-                "*".repeat(text.chars().count()).into(),
-                cx.theme().base.step(cx, ColorScaleStep::TWELVE),
-            )
+            ("*".repeat(text.chars().count()).into(), cx.theme().text)
         } else {
-            (text, cx.theme().base.step(cx, ColorScaleStep::TWELVE))
+            (text, cx.theme().text)
         };
 
         let run = TextRun {
@@ -471,7 +466,7 @@ impl Element for TextElement {
 
         // Paint selections
         if let Some(path) = prepaint.selection_path.take() {
-            window.paint_path(path, cx.theme().accent.step(cx, ColorScaleStep::FOUR));
+            window.paint_path(path, cx.theme().element_disabled);
         }
 
         // Paint multi line text

crates/ui/src/input/input.rs

@@ -1,3 +1,5 @@
+use std::{cell::Cell, ops::Range, rc::Rc};
+
 use gpui::{
     actions, div, point, prelude::FluentBuilder as _, px, AnyElement, App, AppContext, Bounds,
     ClipboardItem, Context, Entity, EntityInputHandler, EventEmitter, FocusHandle, Focusable,
@@ -6,7 +8,7 @@ use gpui::{
     ScrollWheelEvent, SharedString, Styled as _, Subscription, UTF16Selection, Window, WrappedLine,
 };
 use smallvec::SmallVec;
-use std::{cell::Cell, ops::Range, rc::Rc};
+use theme::ActiveTheme;
 use unicode_segmentation::*;
 
 use super::{blink_cursor::BlinkCursor, change::Change, element::TextElement};
@@ -14,7 +16,6 @@ use crate::{
     history::History,
     indicator::Indicator,
     scroll::{Scrollbar, ScrollbarAxis, ScrollbarState},
-    theme::{scale::ColorScaleStep, ActiveTheme},
     Sizable, Size, StyleSized, StyledExt,
 };
 
@@ -1624,9 +1625,8 @@ impl Render for TextInput {
             .cursor_text()
             .when(self.multi_line, |this| this.h_auto())
             .when(self.appearance, |this| {
-                this.bg(cx.theme().base.step(cx, ColorScaleStep::THREE))
-                    .rounded(px(cx.theme().radius))
-                    .when(cx.theme().shadow, |this| this.shadow_sm())
+                this.bg(cx.theme().elevated_surface_background)
+                    .rounded(cx.theme().radius)
                     .when(focused, |this| this.outline(window, cx))
                     .when(prefix.is_none(), |this| this.input_pl(self.size))
                     .when(suffix.is_none(), |this| this.input_pr(self.size))
@@ -1642,7 +1642,7 @@ impl Render for TextInput {
                     .child(TextElement::new(cx.entity().clone())),
             )
             .when(self.loading, |this| {
-                this.child(Indicator::new().color(cx.theme().base.step(cx, ColorScaleStep::ELEVEN)))
+                this.child(Indicator::new().color(cx.theme().text_muted))
             })
             .children(suffix)
             .when(self.is_multi_line(), |this| {