Merge branch 'main' into element-types

crates/ui2/src/components/input.rs

@@ -1,4 +1,4 @@
-use crate::{prelude::*, Label, LabelColor};
+use crate::{prelude::*, Label};
 use gpui::prelude::*;
 
 #[derive(Default, PartialEq)]
@@ -70,15 +70,15 @@ impl Input {
         };
 
         let placeholder_label = Label::new(self.placeholder.clone()).color(if self.disabled {
-            LabelColor::Disabled
+            TextColor::Disabled
         } else {
-            LabelColor::Placeholder
+            TextColor::Placeholder
         });
 
         let label = Label::new(self.value.clone()).color(if self.disabled {
-            LabelColor::Disabled
+            TextColor::Disabled
         } else {
-            LabelColor::Default
+            TextColor::Default
         });
 
         div()