From f8f1a3f86ea361726c6c3a0d2c6c6bfd3c0debb9 Mon Sep 17 00:00:00 2001
From: Joseph Lyons <JosephTLyons@gmail.com>
Date: Fri, 24 Feb 2023 08:46:28 -0500
Subject: [PATCH] Unify text style names

---
 crates/feedback/src/feedback_info_text.rs | 8 ++++----
 crates/theme/src/theme.rs                 | 6 +++---
 styles/src/styleTree/feedback.ts          | 6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/crates/feedback/src/feedback_info_text.rs b/crates/feedback/src/feedback_info_text.rs
index 5e0378b95e..0ba5ef49f7 100644
--- a/crates/feedback/src/feedback_info_text.rs
+++ b/crates/feedback/src/feedback_info_text.rs
@@ -36,7 +36,7 @@ impl View for FeedbackInfoText {
             .with_child(
                 Text::new(
                     "We read whatever you submit here. For issues and discussions, visit the ",
-                    theme.feedback.info_text.text.clone(),
+                    theme.feedback.info_text_default.text.clone(),
                 )
                 .with_soft_wrap(false)
                 .aligned()
@@ -45,9 +45,9 @@ impl View for FeedbackInfoText {
             .with_child(
                 MouseEventHandler::<OpenZedCommunityRepo>::new(0, cx, |state, _| {
                     let text = if state.hovered() {
-                        theme.feedback.link_hover_text.clone()
+                        theme.feedback.link_text_hover.clone()
                     } else {
-                        theme.feedback.link_text.clone()
+                        theme.feedback.link_text_default.clone()
                     };
 
                     Label::new("community repo", text.text)
@@ -64,7 +64,7 @@ impl View for FeedbackInfoText {
                 .boxed(),
             )
             .with_child(
-                Text::new(" on GitHub.", theme.feedback.info_text.text.clone())
+                Text::new(" on GitHub.", theme.feedback.info_text_default.text.clone())
                     .with_soft_wrap(false)
                     .aligned()
                     .boxed(),
diff --git a/crates/theme/src/theme.rs b/crates/theme/src/theme.rs
index bc3b048010..ba66ea2d86 100644
--- a/crates/theme/src/theme.rs
+++ b/crates/theme/src/theme.rs
@@ -811,9 +811,9 @@ pub struct TerminalStyle {
 pub struct FeedbackStyle {
     pub submit_button: Interactive<ContainedText>,
     pub button_margin: f32,
-    pub info_text: ContainedText,
-    pub link_text: ContainedText,
-    pub link_hover_text: ContainedText,
+    pub info_text_default: ContainedText,
+    pub link_text_default: ContainedText,
+    pub link_text_hover: ContainedText,
 }
 
 #[derive(Clone, Deserialize, Default)]
diff --git a/styles/src/styleTree/feedback.ts b/styles/src/styleTree/feedback.ts
index 34922b4d00..8e3c6cda97 100644
--- a/styles/src/styleTree/feedback.ts
+++ b/styles/src/styleTree/feedback.ts
@@ -32,8 +32,8 @@ export default function feedback(colorScheme: ColorScheme) {
       },
     },
     button_margin: 8,
-    info_text: text(layer, "sans", "default", { size: "xs" }),
-    link_text: text(layer, "sans", "default", { size: "xs", underline: true }),
-    link_hover_text: text(layer, "sans", "hovered", { size: "xs", underline: true })
+    info_text_default: text(layer, "sans", "default", { size: "xs" }),
+    link_text_default: text(layer, "sans", "default", { size: "xs", underline: true }),
+    link_text_hover: text(layer, "sans", "hovered", { size: "xs", underline: true })
   };
 }