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 fdff8977529cac768928a8af524cc2d24d7ed751..711f4d98b898f4471b0a42f0f70fd5591488f8c2 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 ccea670f43e336ae6b091860f1e7bf147748c35b..40e438cee32b1442c687d67dc0d6c57c9e820e4c 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 b5598d0243fdf9b67f0f1546b627329b096bd7fc..8e906ad66d16190a2d05ad15e7ac66947b766916 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 48886388bfc191ae48ac0af18d5411871c017499..e0b8ee2f9768b59f9516be86e89b6b5bb29ef6ec 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 ad327f46619dcfea0ecaf9d68704d346da6582e2..98ba2db84fc5e364e4702e7c61aa816445067a25 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 773a2de9f2959409964cd8a2c672e5a181e92a34..813770748dbca7336ec28f642804f5af487f22ca 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 026bc28c5c92b539b7cb3b2245591c36296eff37..fe72c29a34cc743afe90ae6e4b5446f76609dda4 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 2abded65e81195d473c7e5a84f68d8d153bc2c2e..bfc81974086e3d6576a54b3d2392d35b1b25aed2 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 ff7a1c64d64285e681d749fbda541963d8e29eb0..ff7112ffc1641f537e5bd42bade57053145deef9 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 626da984a9722e205a4c939aa7d9d7e9028fc983..d10543a3609a56c0d129656d0dd58e352da346e3 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 defe2950acae97274da50bb4c1f390927576e528..2bca1a1e47c0e95f5ab5dc4b4343ea1936dcb1e0 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 cc25ae2824dc8c5b9a177f94b1664c2a83d4d9f2..69e6575cc8aea89bb03481a5cbf7b6568937a571 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 d9ae37801186c6792783d6575ba0a9cbc50b7876..4e6ab6a623f4240e95b658aa975a4979b494875a 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 54dbefd6ab7fc3aeaa74463df756601ef71bcab0..4c0fbf82902753f90b06437d50f0a14f61b2b5d9 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 f2b6b464471298b70204e6aca615729fd0999cef..f53b7e3755141c6032c710dff915f54fb470de32 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 17308ee2c2452655ba1bd95fe4419e4b8893542a..6a3700018dfc1bd8bdce5319e56bcd88aeca1ced 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 7512f2bdc0f97599e442106675c8f2117910fd3e..4c2b12ad2a6b4ec1b2dddc9b0594925124595cd0 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 8a70b5546624d9ffc0ce0c3a8c295545167fd0c5..1341915ce00abd358d5fb7655914209c0dedf566 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 98c9924ad924d602a0ad69699964b1f6c9467a86..8b2544bfc102c01c38d62064c9000a826943b4a9 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 cb134d4f3645a202cc930aa1ebc5facb2bde47bf..e7c25063d0601bbc57a04fe014c05857037918b7 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 ec9fcfeb8fc88c85e63e953748e06df0ad7b4d88..c82bdc72a37485fddf25fd0ebec9ab084cbcbda6 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 99453386e34766aec957be39cd682e3470a55b1c..cfb7e6cea293b88da552dcb3fb7a0d53541b1f22 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 85a44ea2a4c1a6952df42323c79f620a4611810d..33d299375c98ea8204d3b8838c3e408eb4058eee 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 dfaf46ed68f204a6475fec95ec350ab29903546f..79016c8396e42d27ef0b5969e6396b7d6c4a2b26 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 edd07c053a67addf1b84344b204f949551b01a84..269c6df98bc96f96bb23c19ed8b6d8d4c4a97821 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 9076105312f5a11fa452530f8df88a76e686aaaa..2bafeab8c1c86273ff6d86943c1bf78201ff1cee 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 33ad0bcafd61a48435266d8d5cdb59b8e79e14b6..4c5de94f971a96759587c0ab421958e5b95fc4ba 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 1ece503e3782e904fac04dbdf20dd22d88f847f4..f4ec21771aa2c219996b6ab1be8ce721cd2a571c 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 b68dd89282383bb1082b11474ec034c0b970ee78..5fae96b56cc5b5e46001aac5281a7b2349823f44 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 477c846774803e44663f0d23e8c4898d9f84f3c4..00dbf033d16cba115639fa8f5f9174e9bf225535 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 e65d6b0f8f90b908315458a98e4ffc24c8f35acd..fad47abb23dcce5dcee1790686f0856fc6c796dd 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 b9d95ce9b3c5188f759304034742308ac969630e..5e7a9be2d39f11a7fd61f6f7d9d8217a23871e2a 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 cdc2655516c06060feb77bf06c4c1de333374eec..315a80a11b7f4608c137893cf9fdd884be789b0e 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 ed5b666e05dc76e2477464d8c09282447f437655..b6ca2a50c32eac8d439c9adb9058d7c4972e6508 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 4bb330a9c09d2dfeac225429076c59b2514c7b30..d603dbbfd888cb35721ba028ef77de063587f8c4 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 a512bd448b771b5e26fef13852c73a5dec921332..237bddb448fec3f758cba350d77ff8aa16bcb399 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 24ca5ee8a253ce708893283d52708630e250696c..b5e6f02d331300469c559f3219df3327a50b37ab 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 19422e7204c3f06da1af8d3ba6f0794b909760a6..074f0d99f46b586139bf64b4fc2275569178586c 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 5503e6f865afa8931a66af1b42f612410cebd95b..bb7ed025e12c75adf6a8e0967837cdc9845c442f 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 8d4a528e208ee9dc8c235a0c0e7fbefc634f46a9..9bf0ce2cd5504253d101569f4fe4bbc5cd1d3a31 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 7d2072d6c9daae38b31061f48d332e876341a281..b5f1e78e62a02dbbc75fd37065447771018987bf 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 86d1f31e4093820e6c36a45674c420213e5a48b1..c9c27fd561629491f4feb1bb46ee1fbc4cb41927 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 9dabefd67df3e105b3d2ad9bc74c15e78a078549..6fc2b50ce8e9ad01bb093c2d7c25b11a46d3b684 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 7045ae87d8f9e2b9255ab4e0a2619245536ff45b..ac53284c0563cfb4bdbc1495cb0ff17400231f3c 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 b148e2902b29840dfac8020cadfdb823b922130e..1a8d8b4ed57f28d2ad687b07d0614cb94186c425 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 ce8e0e9e3ccdad380672e6f330bd788804088aca..5ba6b8fe4705ec99b63b699cec0dd3dfcd577a34 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 6660240eec66eb17145d089e6d049a6b95c0e7cf..a4d1fc06ccfc1b1bb77ac93d9b2812211a9e84f0 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 4b5ef95c61495c369fd4807f9bf1a5afac8c094d..37d62e70394af2129c37e9507528050e8cb348f4 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 0140aa539f2078f9c97952678044b28beb3b9abf..f7f30da7df1e94f18713e07c82ebcfe9fbec83e8 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)