From 2b10284506f1357434ddce4db0ff4df87e5586e1 Mon Sep 17 00:00:00 2001 From: Bill Date: Tue, 11 Jan 2022 01:38:01 -0500 Subject: [PATCH] Update layout --- src/assets/styles/utils.scss | 4 ++++ src/common/Button.tsx | 2 +- src/common/Grid.tsx | 1 + src/layout/card/NitroCardView.scss | 1 - src/layout/draggable-window/DraggableWindow.scss | 1 + 5 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/assets/styles/utils.scss b/src/assets/styles/utils.scss index 0d186c72..88b8d48f 100644 --- a/src/assets/styles/utils.scss +++ b/src/assets/styles/utils.scss @@ -78,3 +78,7 @@ ul { .z-index-1 { z-index: 1; } + +.flex-basis-fit-content { + flex-basis: fit-content; +} diff --git a/src/common/Button.tsx b/src/common/Button.tsx index 582e1dd0..8f65d7b3 100644 --- a/src/common/Button.tsx +++ b/src/common/Button.tsx @@ -13,7 +13,7 @@ export interface ButtonProps extends FlexProps export const Button: FC = props => { - const { variant = 'primary', size = null, active = false, disabled = false, classNames = [], ...rest } = props; + const { variant = 'primary', size = 'sm', active = false, disabled = false, classNames = [], ...rest } = props; const getClassNames = useMemo(() => { diff --git a/src/common/Grid.tsx b/src/common/Grid.tsx index fce48416..4a3a4448 100644 --- a/src/common/Grid.tsx +++ b/src/common/Grid.tsx @@ -23,6 +23,7 @@ export const Grid: FC = props => const newClassNames: string[] = []; if(!grow) newClassNames.push('h-100'); + else newClassNames.push('flex-basis-fit-content'); if(inline) newClassNames.push('inline-grid'); else newClassNames.push('grid'); diff --git a/src/layout/card/NitroCardView.scss b/src/layout/card/NitroCardView.scss index ecc8562f..cb20bf0b 100644 --- a/src/layout/card/NitroCardView.scss +++ b/src/layout/card/NitroCardView.scss @@ -2,7 +2,6 @@ $nitro-card-header-height: 33px; $nitro-card-tabs-height: 33px; .nitro-card { - pointer-events: all; resize: both; @include media-breakpoint-down(sm) { diff --git a/src/layout/draggable-window/DraggableWindow.scss b/src/layout/draggable-window/DraggableWindow.scss index 47e08233..10d69a56 100644 --- a/src/layout/draggable-window/DraggableWindow.scss +++ b/src/layout/draggable-window/DraggableWindow.scss @@ -21,5 +21,6 @@ .draggable-window { display: inline-block; visibility: hidden; + pointer-events: all; } }