From f9ed9dacac5a604f26cee6b81647486f3bdd1421 Mon Sep 17 00:00:00 2001 From: Bill Date: Sun, 25 Jul 2021 04:43:57 -0400 Subject: [PATCH] Card updates --- src/layout/card/content/NitroCardContentView.scss | 1 - src/layout/card/content/NitroCardContentView.tsx | 4 ++-- src/layout/card/content/NitroCardContextView.types.ts | 9 +++++---- src/views/catalog/CatalogView.scss | 1 + src/views/inventory/InventoryView.scss | 1 + src/views/navigator/NavigatorView.scss | 1 + 6 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/layout/card/content/NitroCardContentView.scss b/src/layout/card/content/NitroCardContentView.scss index 4f94a06a..c681fd34 100644 --- a/src/layout/card/content/NitroCardContentView.scss +++ b/src/layout/card/content/NitroCardContentView.scss @@ -1,7 +1,6 @@ .content-area { padding-top: $container-padding-x; padding-bottom: $container-padding-x; - resize: vertical; overflow: auto; &.simple { diff --git a/src/layout/card/content/NitroCardContentView.tsx b/src/layout/card/content/NitroCardContentView.tsx index a09e305f..969069b2 100644 --- a/src/layout/card/content/NitroCardContentView.tsx +++ b/src/layout/card/content/NitroCardContentView.tsx @@ -4,11 +4,11 @@ import { NitroCardContentViewProps } from './NitroCardContextView.types'; export const NitroCardContentView: FC = props => { - const { className = null, children = null } = props; + const { children = null, className = '', ...rest } = props; const { simple = false } = useNitroCardContext(); return ( -
+
{ children }
); diff --git a/src/layout/card/content/NitroCardContextView.types.ts b/src/layout/card/content/NitroCardContextView.types.ts index 78ff6979..120cd9d3 100644 --- a/src/layout/card/content/NitroCardContextView.types.ts +++ b/src/layout/card/content/NitroCardContextView.types.ts @@ -1,4 +1,5 @@ -export interface NitroCardContentViewProps -{ - className?: string; -} +import { DetailsHTMLAttributes } from 'react'; + + +export interface NitroCardContentViewProps extends DetailsHTMLAttributes +{} diff --git a/src/views/catalog/CatalogView.scss b/src/views/catalog/CatalogView.scss index 5f5618dd..4061767a 100644 --- a/src/views/catalog/CatalogView.scss +++ b/src/views/catalog/CatalogView.scss @@ -4,6 +4,7 @@ .content-area { min-height: 350px; height: 350px; + resize: vertical; } font[size="16"] { diff --git a/src/views/inventory/InventoryView.scss b/src/views/inventory/InventoryView.scss index db085c7a..2da93ac4 100644 --- a/src/views/inventory/InventoryView.scss +++ b/src/views/inventory/InventoryView.scss @@ -4,6 +4,7 @@ .content-area { min-height: 240px; height: 240px; + resize: vertical; } .empty-image { diff --git a/src/views/navigator/NavigatorView.scss b/src/views/navigator/NavigatorView.scss index 79f14558..e17312aa 100644 --- a/src/views/navigator/NavigatorView.scss +++ b/src/views/navigator/NavigatorView.scss @@ -4,6 +4,7 @@ .content-area { min-height: 400px; height: 400px; + resize: vertical; } }