From 693cd539560fa591940af026e3e5ad1926c7d01e Mon Sep 17 00:00:00 2001 From: Tom Herold Date: Wed, 1 Feb 2023 17:07:26 +0100 Subject: [PATCH 1/2] fixed spacing of switch orga button --- .../javascripts/components/brain_spinner.tsx | 44 ++++++------------- frontend/stylesheets/main.less | 8 +++- 2 files changed, 20 insertions(+), 32 deletions(-) diff --git a/frontend/javascripts/components/brain_spinner.tsx b/frontend/javascripts/components/brain_spinner.tsx index d14822199c2..265c875ffc0 100644 --- a/frontend/javascripts/components/brain_spinner.tsx +++ b/frontend/javascripts/components/brain_spinner.tsx @@ -38,17 +38,7 @@ export default function BrainSpinner({ message, isLoading = true }: Props) { }} /> ) : null} - {message != null ? ( -
- {message} -
- ) : null} + {message} @@ -67,9 +57,6 @@ export function BrainSpinnerWithError({ const switchToOwningOrganizationButton = ( { if (organizationToSwitchTo != null) { await switchToOrganization(organizationToSwitchTo.name); @@ -87,25 +74,22 @@ export function BrainSpinnerWithError({ return ( - {gotUnhandledError ? messages["tracing.unhandled_initialization_error"] : message} -
-
- {organizationToSwitchTo != null ? switchToOwningOrganizationButton : null} - + <> +
+ {gotUnhandledError ? messages["tracing.unhandled_initialization_error"] : message} +
+ {organizationToSwitchTo != null ?
{switchToOwningOrganizationButton}
: null} +
+
-
+ } isLoading={false} /> diff --git a/frontend/stylesheets/main.less b/frontend/stylesheets/main.less index 9ae4e2b4696..ee3e7f4504d 100644 --- a/frontend/stylesheets/main.less +++ b/frontend/stylesheets/main.less @@ -260,10 +260,14 @@ i.without-icon-margin, } .brain-loading-content { - flex: 1; - flex: none; max-width: 50%; width: 375px; + display: inline-flex; + flex-direction: column; + align-items: center; +} +.brain-loading-content > * { + margin: 1em 0; } .brain-loading-bar { From 0681be45b8b12f3d87f6e145db6c89534e90066e Mon Sep 17 00:00:00 2001 From: Tom Herold Date: Wed, 1 Feb 2023 17:07:51 +0100 Subject: [PATCH 2/2] fix mag not available in status bar --- frontend/stylesheets/trace_view/_status_bar.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/stylesheets/trace_view/_status_bar.less b/frontend/stylesheets/trace_view/_status_bar.less index 718e766440e..2fd9b88b206 100644 --- a/frontend/stylesheets/trace_view/_status_bar.less +++ b/frontend/stylesheets/trace_view/_status_bar.less @@ -1,6 +1,6 @@ .statusbar { - margin-left: 40px; - margin-right: 40px; + margin-left: 35px; + margin-right: 35px; font-size: 14px; display: flex; flex-wrap: wrap;