From f0ab27a83da2459af999bb0e0f565ec702a92089 Mon Sep 17 00:00:00 2001 From: Nate Butler Date: Tue, 29 Aug 2023 14:04:17 -0400 Subject: [PATCH] Reorder "Select All" button --- crates/search/src/buffer_search.rs | 2 +- styles/src/style_tree/search.ts | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/crates/search/src/buffer_search.rs b/crates/search/src/buffer_search.rs index 26ae86f375..78729df936 100644 --- a/crates/search/src/buffer_search.rs +++ b/crates/search/src/buffer_search.rs @@ -261,8 +261,8 @@ impl View for BufferSearchBar { .with_height(theme.search.search_bar_row_height); let nav_column = Flex::row() - .with_child(Flex::row().with_children(match_count)) .with_child(self.render_action_button("all", cx)) + .with_child(Flex::row().with_children(match_count)) .with_child(nav_button_for_direction("<", Direction::Prev, cx)) .with_child(nav_button_for_direction(">", Direction::Next, cx)) .constrained() diff --git a/styles/src/style_tree/search.ts b/styles/src/style_tree/search.ts index 73f35b9dd4..c37a4e4b9a 100644 --- a/styles/src/style_tree/search.ts +++ b/styles/src/style_tree/search.ts @@ -168,8 +168,8 @@ export default function search(): any { // Disabled elements should use a disabled state of an interactive element, not a toggleable element with the inactive state being disabled action_button: toggleable({ state: { - inactive: text_button({ variant: "ghost", layer: theme.highest, disabled: true, margin: { right: SEARCH_ROW_SPACING } }), - active: text_button({ variant: "ghost", layer: theme.highest, margin: { right: SEARCH_ROW_SPACING } }) + inactive: text_button({ variant: "ghost", layer: theme.highest, disabled: true, margin: { right: SEARCH_ROW_SPACING }, text_properties: { size: "sm" } }), + active: text_button({ variant: "ghost", layer: theme.highest, margin: { right: SEARCH_ROW_SPACING }, text_properties: { size: "sm" } }) } }), editor, @@ -183,9 +183,8 @@ export default function search(): any { border: border(theme.highest, "negative"), }, match_index: { - ...text(theme.highest, "mono", "variant"), + ...text(theme.highest, "mono", { size: "sm" }), padding: { - left: 9, right: SEARCH_ROW_SPACING, }, },