diff --git a/crates/feedback/src/feedback_info_text.rs b/crates/feedback/src/feedback_info_text.rs index 91ff22e90451f6af752cbc59642993e618b60a0e..bc0ee9ea36709fc5fb26278428cfdb0741ae3d84 100644 --- a/crates/feedback/src/feedback_info_text.rs +++ b/crates/feedback/src/feedback_info_text.rs @@ -42,14 +42,14 @@ impl View for FeedbackInfoText { ) .with_child( MouseEventHandler::new::(0, cx, |state, _| { - let contained_text = if state.hovered() { + let style = if state.hovered() { &theme.feedback.link_text_hover } else { &theme.feedback.link_text_default }; - - Label::new("community repo", contained_text.text.clone()) + Label::new("community repo", style.text.clone()) .contained() + .with_style(style.container) .aligned() .left() .clipped() @@ -64,6 +64,8 @@ impl View for FeedbackInfoText { .with_soft_wrap(false) .aligned(), ) + .contained() + .with_style(theme.feedback.info_text_default.container) .aligned() .left() .clipped() diff --git a/styles/src/style_tree/feedback.ts b/styles/src/style_tree/feedback.ts index 0349359533041d4425df3d0c72d120ed18499a30..4226db9753ad0429d4119293c80bace9928b61be 100644 --- a/styles/src/style_tree/feedback.ts +++ b/styles/src/style_tree/feedback.ts @@ -12,9 +12,6 @@ export default function feedback(): any { background: background(theme.highest, "on"), corner_radius: 6, border: border(theme.highest, "on"), - margin: { - right: 4, - }, padding: { bottom: 2, left: 10, @@ -41,9 +38,15 @@ export default function feedback(): any { }, }), button_margin: 8, - info_text_default: text(theme.highest, "sans", "default", { - size: "xs", - }), + info_text_default: { + padding: { + left: 4, + right: 4, + }, + ...text(theme.highest, "sans", "default", { + size: "xs", + }) + }, link_text_default: text(theme.highest, "sans", "default", { size: "xs", underline: true, diff --git a/styles/src/style_tree/toolbar.ts b/styles/src/style_tree/toolbar.ts index adf8fb866f95d1bedcefa295fddd30dae25b76b6..8ec46d9f2a4b2a99e302dbee82c295cb84d410cd 100644 --- a/styles/src/style_tree/toolbar.ts +++ b/styles/src/style_tree/toolbar.ts @@ -2,14 +2,14 @@ import { useTheme } from "../common" import { toggleable_icon_button } from "../component/icon_button" import { interactive, toggleable } from "../element" import { background, border, foreground, text } from "./components" -import { text_button } from "../component"; +import { text_button } from "../component" export const toolbar = () => { const theme = useTheme() return { height: 42, - padding: { left: 4, right: 4 }, + padding: { left: 8, right: 8 }, background: background(theme.highest), border: border(theme.highest, { bottom: true }), item_spacing: 4, @@ -24,9 +24,9 @@ export const toolbar = () => { ...text(theme.highest, "sans", "variant"), corner_radius: 6, padding: { - left: 6, - right: 6, - }, + left: 4, + right: 4, + } }, state: { hovered: {