zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-09-18 18:08:07 +03:00
Code Issues Packages Projects Releases Wiki Activity

Reorder "Select All" button

Browse Source
This commit is contained in:
Nate Butler 2023-08-29 14:04:17 -04:00
parent f626c61b1e
commit f0ab27a83d
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/search/src/buffer_search.rs
View File

@ -261,8 +261,8 @@ impl View for BufferSearchBar {
.with_height(theme.search.search_bar_row_height); .with_height(theme.search.search_bar_row_height);
let nav_column = Flex::row() let nav_column = Flex::row()
.with_child(Flex::row().with_children(match_count))
.with_child(self.render_action_button("all", cx)) .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::Prev, cx))
.with_child(nav_button_for_direction(">", Direction::Next, cx)) .with_child(nav_button_for_direction(">", Direction::Next, cx))
.constrained() .constrained()

7
styles/src/style_tree/search.ts
View File

@ -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 // Disabled elements should use a disabled state of an interactive element, not a toggleable element with the inactive state being disabled
action_button: toggleable({ action_button: toggleable({
state: { state: {
inactive: text_button({ variant: "ghost", layer: theme.highest, disabled: true, 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 } }) active: text_button({ variant: "ghost", layer: theme.highest, margin: { right: SEARCH_ROW_SPACING }, text_properties: { size: "sm" } })
} }
}), }),
editor, editor,
@ -183,9 +183,8 @@ export default function search(): any {
border: border(theme.highest, "negative"), border: border(theme.highest, "negative"),
}, },
match_index: { match_index: {
...text(theme.highest, "mono", "variant"), ...text(theme.highest, "mono", { size: "sm" }),
padding: { padding: {
left: 9,
right: SEARCH_ROW_SPACING, right: SEARCH_ROW_SPACING,
}, },
}, },