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

Unify text style names

Browse source
This commit is contained in:
Joseph Lyons 2023-02-24 08:46:28 -05:00
parent 37f910949d
commit f8f1a3f86e
3 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/feedback/src/feedback_info_text.rs
View file

@ -36,7 +36,7 @@ impl View for FeedbackInfoText {
.with_child( .with_child(
Text::new( Text::new(
"We read whatever you submit here. For issues and discussions, visit the ", "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) .with_soft_wrap(false)
.aligned() .aligned()
@ -45,9 +45,9 @@ impl View for FeedbackInfoText {
.with_child( .with_child(
MouseEventHandler::<OpenZedCommunityRepo>::new(0, cx, |state, _| { MouseEventHandler::<OpenZedCommunityRepo>::new(0, cx, |state, _| {
let text = if state.hovered() { let text = if state.hovered() {
theme.feedback.link_hover_text.clone() theme.feedback.link_text_hover.clone()
} else { } else {
theme.feedback.link_text.clone() theme.feedback.link_text_default.clone()
}; };
Label::new("community repo", text.text) Label::new("community repo", text.text)
@ -64,7 +64,7 @@ impl View for FeedbackInfoText {
.boxed(), .boxed(),
) )
.with_child( .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) .with_soft_wrap(false)
.aligned() .aligned()
.boxed(), .boxed(),

6
crates/theme/src/theme.rs
View file

@ -811,9 +811,9 @@ pub struct TerminalStyle {
pub struct FeedbackStyle { pub struct FeedbackStyle {
pub submit_button: Interactive<ContainedText>, pub submit_button: Interactive<ContainedText>,
pub button_margin: f32, pub button_margin: f32,
pub info_text: ContainedText, pub info_text_default: ContainedText,
pub link_text: ContainedText, pub link_text_default: ContainedText,
pub link_hover_text: ContainedText, pub link_text_hover: ContainedText,
} }
#[derive(Clone, Deserialize, Default)] #[derive(Clone, Deserialize, Default)]

6
styles/src/styleTree/feedback.ts
View file

@ -32,8 +32,8 @@ export default function feedback(colorScheme: ColorScheme) {
}, },
}, },
button_margin: 8, button_margin: 8,
info_text: text(layer, "sans", "default", { size: "xs" }), info_text_default: text(layer, "sans", "default", { size: "xs" }),
link_text: text(layer, "sans", "default", { size: "xs", underline: true }), link_text_default: text(layer, "sans", "default", { size: "xs", underline: true }),
link_hover_text: text(layer, "sans", "hovered", { size: "xs", underline: true }) link_text_hover: text(layer, "sans", "hovered", { size: "xs", underline: true })
}; };
} }