From aceab76ae4d20c1dd7f9f8de8bc2da796562e438 Mon Sep 17 00:00:00 2001 From: Marshall Bowers Date: Thu, 6 Mar 2025 12:57:31 -0500 Subject: [PATCH] gpui: Rename `rounded_md` to `rounded_sm` (#26228) This PR renames the `rounded_md` style method to `rounded_sm`. Follow up to https://github.com/zed-industries/zed/pull/26221, which freed up the `rounded_sm` name. Release Notes: - N/A --- crates/assistant/src/assistant_configuration.rs | 2 +- crates/assistant2/src/active_thread.rs | 2 +- crates/assistant2/src/assistant_configuration.rs | 2 +- crates/assistant2/src/ui/context_pill.rs | 2 +- .../assistant_context_editor/src/context_editor.rs | 6 +++--- crates/collab_ui/src/chat_panel.rs | 12 ++++++------ crates/collab_ui/src/chat_panel/message_editor.rs | 2 +- crates/collab_ui/src/notification_panel.rs | 2 +- crates/component_preview/src/component_preview.rs | 2 +- crates/copilot/src/sign_in.rs | 2 +- crates/diagnostics/src/diagnostics.rs | 2 +- crates/editor/src/element.rs | 2 +- .../extensions_ui/src/components/extension_card.rs | 2 +- crates/extensions_ui/src/extensions_ui.rs | 2 +- crates/feedback/src/feedback_modal.rs | 4 ++-- crates/git_ui/src/askpass_modal.rs | 2 +- crates/git_ui/src/git_panel.rs | 2 +- crates/gpui/examples/data_table.rs | 2 +- crates/gpui/examples/window.rs | 2 +- crates/gpui_macros/src/styles.rs | 2 +- crates/language_models/src/provider/anthropic.rs | 2 +- crates/language_models/src/provider/bedrock.rs | 2 +- crates/language_models/src/provider/deepseek.rs | 2 +- crates/language_models/src/provider/google.rs | 2 +- crates/language_models/src/provider/lmstudio.rs | 2 +- crates/language_models/src/provider/mistral.rs | 2 +- crates/language_models/src/provider/ollama.rs | 2 +- crates/language_models/src/provider/open_ai.rs | 2 +- crates/markdown/src/markdown.rs | 2 +- crates/markdown_preview/src/markdown_renderer.rs | 2 +- crates/prompt_library/src/prompt_library.rs | 4 ++-- crates/recent_projects/src/remote_servers.rs | 2 +- crates/recent_projects/src/ssh_connections.rs | 2 +- crates/repl/src/notebook/cell.rs | 2 +- crates/story/src/story.rs | 4 ++-- crates/tasks_ui/src/modal.rs | 2 +- crates/title_bar/src/collab.rs | 2 +- crates/ui/src/components/avatar.rs | 2 +- crates/ui/src/components/button/button_like.rs | 6 +++--- crates/ui/src/components/content_group.rs | 2 +- crates/ui/src/components/dropdown_menu.rs | 2 +- crates/ui/src/components/indicator.rs | 2 +- crates/ui/src/components/keybinding_hint.rs | 2 +- crates/ui/src/components/list/list_item.rs | 8 ++++---- crates/ui/src/components/modal.rs | 2 +- crates/welcome/src/multibuffer_hint.rs | 2 +- crates/zed/src/zed/migrate.rs | 2 +- crates/zeta/src/onboarding_banner.rs | 2 +- crates/zeta/src/onboarding_modal.rs | 4 ++-- 49 files changed, 65 insertions(+), 65 deletions(-) diff --git a/crates/assistant/src/assistant_configuration.rs b/crates/assistant/src/assistant_configuration.rs index fdff897752..711f4d98b8 100644 --- a/crates/assistant/src/assistant_configuration.rs +++ b/crates/assistant/src/assistant_configuration.rs @@ -110,7 +110,7 @@ impl ConfigurationView { .bg(cx.theme().colors().surface_background) .border_1() .border_color(cx.theme().colors().border_variant) - .rounded_md() + .rounded_sm() .when(configuration_view.is_none(), |this| { this.child(div().child(Label::new(format!( "No configuration view for {}", diff --git a/crates/assistant2/src/active_thread.rs b/crates/assistant2/src/active_thread.rs index ccea670f43..40e438cee3 100644 --- a/crates/assistant2/src/active_thread.rs +++ b/crates/assistant2/src/active_thread.rs @@ -645,7 +645,7 @@ impl ActiveThread { Role::System => div().id(("message-container", ix)).py_1().px_2().child( v_flex() .bg(colors.editor_background) - .rounded_md() + .rounded_sm() .child(message_content), ), }; diff --git a/crates/assistant2/src/assistant_configuration.rs b/crates/assistant2/src/assistant_configuration.rs index b5598d0243..8e906ad66d 100644 --- a/crates/assistant2/src/assistant_configuration.rs +++ b/crates/assistant2/src/assistant_configuration.rs @@ -134,7 +134,7 @@ impl AssistantConfiguration { .bg(cx.theme().colors().editor_background) .border_1() .border_color(cx.theme().colors().border_variant) - .rounded_md() + .rounded_sm() .map(|parent| match configuration_view { Some(configuration_view) => parent.child(configuration_view), None => parent.child(div().child(Label::new(format!( diff --git a/crates/assistant2/src/ui/context_pill.rs b/crates/assistant2/src/ui/context_pill.rs index 48886388bf..e0b8ee2f97 100644 --- a/crates/assistant2/src/ui/context_pill.rs +++ b/crates/assistant2/src/ui/context_pill.rs @@ -103,7 +103,7 @@ impl RenderOnce for ContextPill { .pl_1() .pb(px(1.)) .border_1() - .rounded_md() + .rounded_sm() .gap_1() .child(self.icon().size(IconSize::XSmall).color(Color::Muted)); diff --git a/crates/assistant_context_editor/src/context_editor.rs b/crates/assistant_context_editor/src/context_editor.rs index ad327f4661..98ba2db84f 100644 --- a/crates/assistant_context_editor/src/context_editor.rs +++ b/crates/assistant_context_editor/src/context_editor.rs @@ -1241,7 +1241,7 @@ impl ContextEditor { .child("Press") .child( h_flex() - .rounded_md() + .rounded_sm() .px_1() .mr_0p5() .border_1() @@ -2092,7 +2092,7 @@ impl ContextEditor { .ml(gutter_width) .pb_1() .w(max_width - gutter_width) - .rounded_md() + .rounded_sm() .border_1() .border_color(theme.colors().border_variant) .overflow_hidden() @@ -3422,7 +3422,7 @@ fn invoked_slash_command_fold_placeholder( .ml_6() .gap_2() .bg(cx.theme().colors().surface_background) - .rounded_md() + .rounded_sm() .child(Label::new(format!("/{}", command.name.clone()))) .map(|parent| match &command.status { InvokedSlashCommandStatus::Running(_) => { diff --git a/crates/collab_ui/src/chat_panel.rs b/crates/collab_ui/src/chat_panel.rs index 773a2de9f2..813770748d 100644 --- a/crates/collab_ui/src/chat_panel.rs +++ b/crates/collab_ui/src/chat_panel.rs @@ -323,7 +323,7 @@ impl ChatPanel { .my_0p5() .px_0p5() .gap_x_1() - .rounded_md() + .rounded_sm() .child(Icon::new(IconName::ReplyArrowRight).color(Color::Muted)) .when(reply_to_message.is_none(), |el| { el.child( @@ -358,7 +358,7 @@ impl ChatPanel { .my_0p5() .px_0p5() .gap_x_1() - .rounded_md() + .rounded_sm() .overflow_hidden() .hover(|style| style.bg(cx.theme().colors().element_background)) .child(Icon::new(IconName::ReplyArrowRight).color(Color::Muted)) @@ -476,7 +476,7 @@ impl ChatPanel { div() .group("") .bg(background) - .rounded_md() + .rounded_sm() .overflow_hidden() .px_1p5() .py_0p5() @@ -563,7 +563,7 @@ impl ChatPanel { .child( div() .px_1() - .rounded_md() + .rounded_sm() .text_ui_xs(cx) .bg(cx.theme().colors().background) .child("New messages"), @@ -589,7 +589,7 @@ impl ChatPanel { div() .w_6() .bg(cx.theme().colors().element_background) - .hover(|style| style.bg(cx.theme().colors().element_hover).rounded_md()) + .hover(|style| style.bg(cx.theme().colors().element_hover).rounded_sm()) .child(child) } @@ -604,7 +604,7 @@ impl ChatPanel { .absolute() .right_2() .overflow_hidden() - .rounded_md() + .rounded_sm() .border_color(cx.theme().colors().element_selected) .border_1() .when(!self.has_open_menu(message_id), |el| { diff --git a/crates/collab_ui/src/chat_panel/message_editor.rs b/crates/collab_ui/src/chat_panel/message_editor.rs index 026bc28c5c..fe72c29a34 100644 --- a/crates/collab_ui/src/chat_panel/message_editor.rs +++ b/crates/collab_ui/src/chat_panel/message_editor.rs @@ -531,7 +531,7 @@ impl Render for MessageEditor { .px_2() .py_1() .bg(cx.theme().colors().editor_background) - .rounded_md() + .rounded_sm() .child(EditorElement::new( &self.editor, EditorStyle { diff --git a/crates/collab_ui/src/notification_panel.rs b/crates/collab_ui/src/notification_panel.rs index 2abded65e8..bfc8197408 100644 --- a/crates/collab_ui/src/notification_panel.rs +++ b/crates/collab_ui/src/notification_panel.rs @@ -300,7 +300,7 @@ impl NotificationPanel { .hover(|style| { style .bg(cx.theme().colors().element_selected) - .rounded_md() + .rounded_sm() }) .child(Label::new(relative_timestamp).color(Color::Muted)) .tooltip(move |_, cx| { diff --git a/crates/component_preview/src/component_preview.rs b/crates/component_preview/src/component_preview.rs index ff7a1c64d6..ff7112ffc1 100644 --- a/crates/component_preview/src/component_preview.rs +++ b/crates/component_preview/src/component_preview.rs @@ -108,7 +108,7 @@ impl ComponentPreview { v_flex() .border_1() .border_color(cx.theme().colors().border) - .rounded_md() + .rounded_sm() .w_full() .gap_4() .py_4() diff --git a/crates/copilot/src/sign_in.rs b/crates/copilot/src/sign_in.rs index 626da984a9..d10543a360 100644 --- a/crates/copilot/src/sign_in.rs +++ b/crates/copilot/src/sign_in.rs @@ -122,7 +122,7 @@ impl CopilotCodeVerification { .p_1() .border_1() .border_muted(cx) - .rounded_md() + .rounded_sm() .cursor_pointer() .justify_between() .on_mouse_down(gpui::MouseButton::Left, { diff --git a/crates/diagnostics/src/diagnostics.rs b/crates/diagnostics/src/diagnostics.rs index defe2950ac..2bca1a1e47 100644 --- a/crates/diagnostics/src/diagnostics.rs +++ b/crates/diagnostics/src/diagnostics.rs @@ -973,7 +973,7 @@ fn diagnostic_header_renderer(diagnostic: Diagnostic) -> RenderBlock { h_flex() .gap_2() .px_1() - .rounded_md() + .rounded_sm() .bg(color.surface_background.opacity(0.5)) .map(|stack| { stack.child( diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs index cc25ae2824..69e6575cc8 100644 --- a/crates/editor/src/element.rs +++ b/crates/editor/src/element.rs @@ -2717,7 +2717,7 @@ impl EditorElement { .flex_basis(Length::Definite(DefiniteLength::Fraction(0.667))) .pl_0p5() .pr_5() - .rounded_md() + .rounded_sm() .shadow_md() .border_1() .map(|div| { diff --git a/crates/extensions_ui/src/components/extension_card.rs b/crates/extensions_ui/src/components/extension_card.rs index d9ae378011..4e6ab6a623 100644 --- a/crates/extensions_ui/src/components/extension_card.rs +++ b/crates/extensions_ui/src/components/extension_card.rs @@ -40,7 +40,7 @@ impl RenderOnce for ExtensionCard { .bg(cx.theme().colors().elevated_surface_background) .border_1() .border_color(cx.theme().colors().border) - .rounded_md() + .rounded_sm() .children(self.children) .when(self.overridden_by_dev_extension, |card| { card.child( diff --git a/crates/extensions_ui/src/extensions_ui.rs b/crates/extensions_ui/src/extensions_ui.rs index 54dbefd6ab..4c0fbf8290 100644 --- a/crates/extensions_ui/src/extensions_ui.rs +++ b/crates/extensions_ui/src/extensions_ui.rs @@ -632,7 +632,7 @@ impl ExtensionsPage { .px_0p5() .border_1() .border_color(cx.theme().colors().border) - .rounded_md() + .rounded_sm() .child( Label::new(label).size(LabelSize::XSmall), ) diff --git a/crates/feedback/src/feedback_modal.rs b/crates/feedback/src/feedback_modal.rs index f2b6b46447..f53b7e3755 100644 --- a/crates/feedback/src/feedback_modal.rs +++ b/crates/feedback/src/feedback_modal.rs @@ -470,7 +470,7 @@ impl Render for FeedbackModal { .bg(cx.theme().colors().editor_background) .p_2() .border_1() - .rounded_md() + .rounded_sm() .border_color(cx.theme().colors().border) .child(self.feedback_editor.clone()), ) @@ -482,7 +482,7 @@ impl Render for FeedbackModal { .bg(cx.theme().colors().editor_background) .p_2() .border_1() - .rounded_md() + .rounded_sm() .border_color(if self.valid_email_address() { cx.theme().colors().border } else { diff --git a/crates/git_ui/src/askpass_modal.rs b/crates/git_ui/src/askpass_modal.rs index 17308ee2c2..6a3700018d 100644 --- a/crates/git_ui/src/askpass_modal.rs +++ b/crates/git_ui/src/askpass_modal.rs @@ -74,7 +74,7 @@ impl Render for AskPassModal { .px(DynamicSpacing::Base12.rems(cx)) .pt(DynamicSpacing::Base08.rems(cx)) .pb(DynamicSpacing::Base04.rems(cx)) - .rounded_t_md() + .rounded_t_sm() .w_full() .gap_1p5() .child(Icon::new(IconName::GitBranch).size(IconSize::XSmall)) diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rs index 7512f2bdc0..4c2b12ad2a 100644 --- a/crates/git_ui/src/git_panel.rs +++ b/crates/git_ui/src/git_panel.rs @@ -3216,7 +3216,7 @@ impl SplitButton { impl RenderOnce for SplitButton { fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement { h_flex() - .rounded_md() + .rounded_sm() .border_1() .border_color(cx.theme().colors().text_muted.alpha(0.12)) .child(self.left) diff --git a/crates/gpui/examples/data_table.rs b/crates/gpui/examples/data_table.rs index 8a70b55466..1341915ce0 100644 --- a/crates/gpui/examples/data_table.rs +++ b/crates/gpui/examples/data_table.rs @@ -402,7 +402,7 @@ impl Render for DataTable { .overflow_hidden() .border_1() .border_color(rgb(0xE0E0E0)) - .rounded_md() + .rounded_sm() .child( div() .flex() diff --git a/crates/gpui/examples/window.rs b/crates/gpui/examples/window.rs index 98c9924ad9..8b2544bfc1 100644 --- a/crates/gpui/examples/window.rs +++ b/crates/gpui/examples/window.rs @@ -16,7 +16,7 @@ fn button(text: &str, on_click: impl Fn(&mut Window, &mut App) + 'static) -> imp .active(|this| this.opacity(0.85)) .border_1() .border_color(rgb(0xe0e0e0)) - .rounded_md() + .rounded_sm() .cursor_pointer() .child(text.to_string()) .on_click(move |_, window, cx| on_click(window, cx)) diff --git a/crates/gpui_macros/src/styles.rs b/crates/gpui_macros/src/styles.rs index cb134d4f36..e7c25063d0 100644 --- a/crates/gpui_macros/src/styles.rs +++ b/crates/gpui_macros/src/styles.rs @@ -1238,7 +1238,7 @@ fn corner_suffixes() -> Vec { doc_string_suffix: "2px (0.125rem)", }, CornerStyleSuffix { - suffix: "md", + suffix: "sm", radius_tokens: quote! { rems(0.25) }, doc_string_suffix: "4px (0.25rem)", }, diff --git a/crates/language_models/src/provider/anthropic.rs b/crates/language_models/src/provider/anthropic.rs index ec9fcfeb8f..c82bdc72a3 100644 --- a/crates/language_models/src/provider/anthropic.rs +++ b/crates/language_models/src/provider/anthropic.rs @@ -837,7 +837,7 @@ impl Render for ConfigurationView { .bg(cx.theme().colors().editor_background) .border_1() .border_color(cx.theme().colors().border_variant) - .rounded_md() + .rounded_sm() .child(self.render_api_key_editor(cx)), ) .child( diff --git a/crates/language_models/src/provider/bedrock.rs b/crates/language_models/src/provider/bedrock.rs index 99453386e3..cfb7e6cea2 100644 --- a/crates/language_models/src/provider/bedrock.rs +++ b/crates/language_models/src/provider/bedrock.rs @@ -966,7 +966,7 @@ impl Render for ConfigurationView { .bg(bg_color) .border_1() .border_color(border_color) - .rounded_md() + .rounded_sm() }; if self.load_credentials_task.is_some() { diff --git a/crates/language_models/src/provider/deepseek.rs b/crates/language_models/src/provider/deepseek.rs index 85a44ea2a4..33d299375c 100644 --- a/crates/language_models/src/provider/deepseek.rs +++ b/crates/language_models/src/provider/deepseek.rs @@ -636,7 +636,7 @@ impl Render for ConfigurationView { .bg(cx.theme().colors().editor_background) .border_1() .border_color(cx.theme().colors().border_variant) - .rounded_md() + .rounded_sm() .child(self.render_api_key_editor(cx)), ) .child( diff --git a/crates/language_models/src/provider/google.rs b/crates/language_models/src/provider/google.rs index dfaf46ed68..79016c8396 100644 --- a/crates/language_models/src/provider/google.rs +++ b/crates/language_models/src/provider/google.rs @@ -538,7 +538,7 @@ impl Render for ConfigurationView { .bg(cx.theme().colors().editor_background) .border_1() .border_color(cx.theme().colors().border_variant) - .rounded_md() + .rounded_sm() .child(self.render_api_key_editor(cx)), ) .child( diff --git a/crates/language_models/src/provider/lmstudio.rs b/crates/language_models/src/provider/lmstudio.rs index edd07c053a..269c6df98b 100644 --- a/crates/language_models/src/provider/lmstudio.rs +++ b/crates/language_models/src/provider/lmstudio.rs @@ -441,7 +441,7 @@ impl Render for ConfigurationView { div() .bg(inline_code_bg) .px_1p5() - .rounded_md() + .rounded_sm() .child(Label::new("lms get qwen2.5-coder-7b")), ), ), diff --git a/crates/language_models/src/provider/mistral.rs b/crates/language_models/src/provider/mistral.rs index 9076105312..2bafeab8c1 100644 --- a/crates/language_models/src/provider/mistral.rs +++ b/crates/language_models/src/provider/mistral.rs @@ -602,7 +602,7 @@ impl Render for ConfigurationView { .bg(cx.theme().colors().editor_background) .border_1() .border_color(cx.theme().colors().border_variant) - .rounded_md() + .rounded_sm() .child(self.render_api_key_editor(cx)), ) .child( diff --git a/crates/language_models/src/provider/ollama.rs b/crates/language_models/src/provider/ollama.rs index 33ad0bcafd..4c5de94f97 100644 --- a/crates/language_models/src/provider/ollama.rs +++ b/crates/language_models/src/provider/ollama.rs @@ -480,7 +480,7 @@ impl Render for ConfigurationView { div() .bg(inline_code_bg) .px_1p5() - .rounded_md() + .rounded_sm() .child(Label::new("ollama run llama3.2")), ), ), diff --git a/crates/language_models/src/provider/open_ai.rs b/crates/language_models/src/provider/open_ai.rs index 1ece503e37..f4ec21771a 100644 --- a/crates/language_models/src/provider/open_ai.rs +++ b/crates/language_models/src/provider/open_ai.rs @@ -572,7 +572,7 @@ impl Render for ConfigurationView { .bg(cx.theme().colors().editor_background) .border_1() .border_color(cx.theme().colors().border_variant) - .rounded_md() + .rounded_sm() .child(self.render_api_key_editor(cx)), ) .child( diff --git a/crates/markdown/src/markdown.rs b/crates/markdown/src/markdown.rs index b68dd89282..5fae96b56c 100644 --- a/crates/markdown/src/markdown.rs +++ b/crates/markdown/src/markdown.rs @@ -690,7 +690,7 @@ impl Element for MarkdownElement { .flex() .border_1() .border_color(cx.theme().colors().border) - .rounded_md() + .rounded_sm() .when(self.style.table_overflow_x_scroll, |mut table| { table.style().restrict_scroll_to_axis = Some(true); table.overflow_x_scroll() diff --git a/crates/markdown_preview/src/markdown_renderer.rs b/crates/markdown_preview/src/markdown_renderer.rs index 477c846774..00dbf033d1 100644 --- a/crates/markdown_preview/src/markdown_renderer.rs +++ b/crates/markdown_preview/src/markdown_renderer.rs @@ -398,7 +398,7 @@ fn render_markdown_code_block( .px_3() .py_3() .bg(cx.code_block_background_color) - .rounded_md() + .rounded_sm() .child(body) .child( div() diff --git a/crates/prompt_library/src/prompt_library.rs b/crates/prompt_library/src/prompt_library.rs index e65d6b0f8f..fad47abb23 100644 --- a/crates/prompt_library/src/prompt_library.rs +++ b/crates/prompt_library/src/prompt_library.rs @@ -326,7 +326,7 @@ impl PickerDelegate for PromptPickerDelegate { ) -> Div { h_flex() .bg(cx.theme().colors().editor_background) - .rounded_md() + .rounded_sm() .overflow_hidden() .flex_none() .py_1() @@ -992,7 +992,7 @@ impl PromptLibrary { .on_action(cx.listener(Self::move_down_from_title)) .border_1() .border_color(transparent_black()) - .rounded_md() + .rounded_sm() .group_hover("active-editor-header", |this| { this.border_color( cx.theme().colors().border_variant, diff --git a/crates/recent_projects/src/remote_servers.rs b/crates/recent_projects/src/remote_servers.rs index b9d95ce9b3..5e7a9be2d3 100644 --- a/crates/recent_projects/src/remote_servers.rs +++ b/crates/recent_projects/src/remote_servers.rs @@ -914,7 +914,7 @@ impl RemoteServerProjects { .child( h_flex() .bg(theme.colors().editor_background) - .rounded_b_md() + .rounded_b_sm() .w_full() .map(|this| { if let Some(ssh_prompt) = ssh_prompt { diff --git a/crates/recent_projects/src/ssh_connections.rs b/crates/recent_projects/src/ssh_connections.rs index cdc2655516..315a80a11b 100644 --- a/crates/recent_projects/src/ssh_connections.rs +++ b/crates/recent_projects/src/ssh_connections.rs @@ -331,7 +331,7 @@ impl RenderOnce for SshConnectionHeader { .px(DynamicSpacing::Base12.rems(cx)) .pt(DynamicSpacing::Base08.rems(cx)) .pb(DynamicSpacing::Base04.rems(cx)) - .rounded_t_md() + .rounded_t_sm() .w_full() .gap_1p5() .child(Icon::new(IconName::Server).size(IconSize::XSmall)) diff --git a/crates/repl/src/notebook/cell.rs b/crates/repl/src/notebook/cell.rs index ed5b666e05..b6ca2a50c3 100644 --- a/crates/repl/src/notebook/cell.rs +++ b/crates/repl/src/notebook/cell.rs @@ -646,7 +646,7 @@ impl Render for CodeCell { // .w_full() // .mt_3() // .p_3() - // .rounded_md() + // .rounded_sm() // .bg(cx.theme().colors().editor_background) // .border(px(1.)) // .border_color(cx.theme().colors().border) diff --git a/crates/story/src/story.rs b/crates/story/src/story.rs index 4bb330a9c0..d603dbbfd8 100644 --- a/crates/story/src/story.rs +++ b/crates/story/src/story.rs @@ -64,7 +64,7 @@ impl Story { .p_2() .max_w(rems(36.)) .bg(DefaultColor::Container.hsla(&colors)) - .rounded_md() + .rounded_sm() .text_sm() .text_color(DefaultColor::Text.hsla(&colors)) .overflow_hidden() @@ -151,7 +151,7 @@ impl RenderOnce for StoryItem { .child(Story::label(self.label)) .child( div() - .rounded_md() + .rounded_sm() .bg(DefaultColor::Background.hsla(&colors)) .border_1() .border_color(DefaultColor::Border.hsla(&colors)) diff --git a/crates/tasks_ui/src/modal.rs b/crates/tasks_ui/src/modal.rs index a512bd448b..237bddb448 100644 --- a/crates/tasks_ui/src/modal.rs +++ b/crates/tasks_ui/src/modal.rs @@ -500,7 +500,7 @@ impl PickerDelegate for TasksModalDelegate { .h_8() .p_2() .justify_between() - .rounded_b_md() + .rounded_b_sm() .bg(cx.theme().colors().ghost_element_selected) .border_t_1() .border_color(cx.theme().colors().border_variant) diff --git a/crates/title_bar/src/collab.rs b/crates/title_bar/src/collab.rs index 24ca5ee8a2..b5e6f02d33 100644 --- a/crates/title_bar/src/collab.rs +++ b/crates/title_bar/src/collab.rs @@ -220,7 +220,7 @@ impl TitleBar { // When the collaborator is not followed, still draw this wrapper div, but leave // it transparent, so that it does not shift the layout when following. .when_some(leader_selection_color, |div, color| { - div.rounded_md().bg(color) + div.rounded_sm().bg(color) }) .child( Facepile::empty() diff --git a/crates/ui/src/components/avatar.rs b/crates/ui/src/components/avatar.rs index 19422e7204..074f0d99f4 100644 --- a/crates/ui/src/components/avatar.rs +++ b/crates/ui/src/components/avatar.rs @@ -152,7 +152,7 @@ impl RenderOnce for AvatarAudioStatusIndicator { .px(padding_x) .py(px(2.)) .bg(cx.theme().status().error_background) - .rounded_md() + .rounded_sm() .child( Icon::new(match self.audio_status { AudioStatus::Muted => IconName::MicMute, diff --git a/crates/ui/src/components/button/button_like.rs b/crates/ui/src/components/button/button_like.rs index 5503e6f865..bb7ed025e1 100644 --- a/crates/ui/src/components/button/button_like.rs +++ b/crates/ui/src/components/button/button_like.rs @@ -509,9 +509,9 @@ impl RenderOnce for ButtonLike { this.w(width).justify_center().text_center() }) .when_some(self.rounding, |this, rounding| match rounding { - ButtonLikeRounding::All => this.rounded_md(), - ButtonLikeRounding::Left => this.rounded_l_md(), - ButtonLikeRounding::Right => this.rounded_r_md(), + ButtonLikeRounding::All => this.rounded_sm(), + ButtonLikeRounding::Left => this.rounded_l_sm(), + ButtonLikeRounding::Right => this.rounded_r_sm(), }) .gap(DynamicSpacing::Base04.rems(cx)) .map(|this| match self.size { diff --git a/crates/ui/src/components/content_group.rs b/crates/ui/src/components/content_group.rs index 8d4a528e20..9bf0ce2cd5 100644 --- a/crates/ui/src/components/content_group.rs +++ b/crates/ui/src/components/content_group.rs @@ -82,7 +82,7 @@ impl RenderOnce for ContentGroup { .when(self.border, |this| { this.border_1().border_color(cx.theme().colors().border) }) - .rounded_md() + .rounded_sm() .p_2() .children(self.children) } diff --git a/crates/ui/src/components/dropdown_menu.rs b/crates/ui/src/components/dropdown_menu.rs index 7d2072d6c9..b5f1e78e62 100644 --- a/crates/ui/src/components/dropdown_menu.rs +++ b/crates/ui/src/components/dropdown_menu.rs @@ -110,7 +110,7 @@ impl RenderOnce for DropdownMenuTrigger { h_flex() .id("dropdown-menu-trigger") .justify_between() - .rounded_md() + .rounded_sm() .bg(cx.theme().colors().editor_background) .pl_2() .pr_1p5() diff --git a/crates/ui/src/components/indicator.rs b/crates/ui/src/components/indicator.rs index 86d1f31e40..c9c27fd561 100644 --- a/crates/ui/src/components/indicator.rs +++ b/crates/ui/src/components/indicator.rs @@ -77,7 +77,7 @@ impl RenderOnce for Indicator { IndicatorKind::Bar => container .w_full() .h_1p5() - .rounded_t_md() + .rounded_t_sm() .bg(self.color.color(cx)), } } diff --git a/crates/ui/src/components/keybinding_hint.rs b/crates/ui/src/components/keybinding_hint.rs index 9dabefd67d..6fc2b50ce8 100644 --- a/crates/ui/src/components/keybinding_hint.rs +++ b/crates/ui/src/components/keybinding_hint.rs @@ -187,7 +187,7 @@ impl RenderOnce for KeybindingHint { .child( h_flex() .items_center() - .rounded_md() + .rounded_sm() .px_0p5() .mr_0p5() .border_1() diff --git a/crates/ui/src/components/list/list_item.rs b/crates/ui/src/components/list/list_item.rs index 7045ae87d8..ac53284c05 100644 --- a/crates/ui/src/components/list/list_item.rs +++ b/crates/ui/src/components/list/list_item.rs @@ -211,13 +211,13 @@ impl RenderOnce for ListItem { .when(self.selectable, |this| { this.hover(|style| style.bg(cx.theme().colors().ghost_element_hover)) .active(|style| style.bg(cx.theme().colors().ghost_element_active)) - .when(self.outlined, |this| this.rounded_md()) + .when(self.outlined, |this| this.rounded_sm()) .when(self.selected, |this| { this.bg(cx.theme().colors().ghost_element_selected) }) }) }) - .when(self.rounded, |this| this.rounded_md()) + .when(self.rounded, |this| this.rounded_sm()) .child( h_flex() .id("inner_list_item") @@ -260,7 +260,7 @@ impl RenderOnce for ListItem { .when(self.outlined, |this| { this.border_1() .border_color(cx.theme().colors().border) - .rounded_md() + .rounded_sm() .overflow_hidden() }) .when_some(self.on_secondary_mouse_down, |this, on_mouse_down| { @@ -271,7 +271,7 @@ impl RenderOnce for ListItem { .when_some(self.tooltip, |this, tooltip| this.tooltip(tooltip)) .map(|this| { if self.inset { - this.rounded_md() + this.rounded_sm() } else { // When an item is not inset draw the indent spacing inside of the item this.ml(self.indent_level as f32 * self.indent_step_size) diff --git a/crates/ui/src/components/modal.rs b/crates/ui/src/components/modal.rs index b148e2902b..1a8d8b4ed5 100644 --- a/crates/ui/src/components/modal.rs +++ b/crates/ui/src/components/modal.rs @@ -332,7 +332,7 @@ impl RenderOnce for Section { .child( v_flex() .w_full() - .rounded_md() + .rounded_sm() .border_1() .border_color(cx.theme().colors().border) .bg(section_bg) diff --git a/crates/welcome/src/multibuffer_hint.rs b/crates/welcome/src/multibuffer_hint.rs index ce8e0e9e3c..5ba6b8fe47 100644 --- a/crates/welcome/src/multibuffer_hint.rs +++ b/crates/welcome/src/multibuffer_hint.rs @@ -138,7 +138,7 @@ impl Render for MultibufferHint { .bg(cx.theme().status().info_background.opacity(0.5)) .border_1() .border_color(cx.theme().colors().border_variant) - .rounded_md() + .rounded_sm() .overflow_hidden() .child( h_flex() diff --git a/crates/zed/src/zed/migrate.rs b/crates/zed/src/zed/migrate.rs index 6660240eec..a4d1fc06cc 100644 --- a/crates/zed/src/zed/migrate.rs +++ b/crates/zed/src/zed/migrate.rs @@ -174,7 +174,7 @@ impl Render for MigrationBanner { .bg(cx.theme().status().info_background.opacity(0.6)) .border_1() .border_color(cx.theme().colors().border_variant) - .rounded_md() + .rounded_sm() .overflow_hidden() .child( h_flex() diff --git a/crates/zeta/src/onboarding_banner.rs b/crates/zeta/src/onboarding_banner.rs index 4b5ef95c61..37d62e7039 100644 --- a/crates/zeta/src/onboarding_banner.rs +++ b/crates/zeta/src/onboarding_banner.rs @@ -83,7 +83,7 @@ impl Render for ZedPredictBanner { let border_color = cx.theme().colors().editor_foreground.opacity(0.3); let banner = h_flex() - .rounded_md() + .rounded_sm() .border_1() .border_color(border_color) .child( diff --git a/crates/zeta/src/onboarding_modal.rs b/crates/zeta/src/onboarding_modal.rs index 0140aa539f..f7f30da7df 100644 --- a/crates/zeta/src/onboarding_modal.rs +++ b/crates/zeta/src/onboarding_modal.rs @@ -248,7 +248,7 @@ impl Render for ZedPredictModal { .bg(cx.theme().colors().editor_background) .border_1() .border_color(border_color) - .rounded_md() + .rounded_sm() .font(theme::ThemeSettings::get_global(cx).buffer_font.clone()) .text_size(TextSize::XSmall.rems(cx)) .text_color(text_color) @@ -395,7 +395,7 @@ impl Render for ZedPredictModal { v_flex() .mt_2() .p_2() - .rounded_md() + .rounded_sm() .bg(cx.theme().colors().editor_background.opacity(0.5)) .border_1() .border_color(cx.theme().colors().border_variant)