From a937632d0adba21963a60371953edfaa3d27b8b8 Mon Sep 17 00:00:00 2001 From: "Collin M. Barrett" Date: Sun, 8 Sep 2019 16:35:03 -0500 Subject: [PATCH] blend logo w/colors, fix extra spacing on mobile closes #943, closes #942 --- src/FilterLists.Web/src/App.tsx | 4 ++-- src/FilterLists.Web/src/components/listsTable/ListsTable.tsx | 5 ++--- src/FilterLists.Web/src/hooks/useTablePageSizer.tsx | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/FilterLists.Web/src/App.tsx b/src/FilterLists.Web/src/App.tsx index 8eaacfcb0..8eebe13fc 100644 --- a/src/FilterLists.Web/src/App.tsx +++ b/src/FilterLists.Web/src/App.tsx @@ -9,9 +9,9 @@ const { Header, Content, Footer } = Layout; export const App: React.FC = () => -
+
- +
diff --git a/src/FilterLists.Web/src/components/listsTable/ListsTable.tsx b/src/FilterLists.Web/src/components/listsTable/ListsTable.tsx index 60e35efe6..9e89f704f 100644 --- a/src/FilterLists.Web/src/components/listsTable/ListsTable.tsx +++ b/src/FilterLists.Web/src/components/listsTable/ListsTable.tsx @@ -45,9 +45,8 @@ export const ListsTable = (props: RouteComponentProps & Props) => { loading={lists.length ? false : true} size="small" pagination={{ - size: "small", simple: true, - style: { float: "left" }, + style: { float: "left", margin: "4px 4px" }, pageSize: tablePageSize.pageSize }} scroll={{ x: tablePageSize.isNarrowWindow ? undefined : 1200 }} @@ -67,7 +66,7 @@ export const ListsTable = (props: RouteComponentProps & Props) => { dataIndex={nameof("name")} sorter={(a, b) => a.name.localeCompare(b.name)} defaultSortOrder={"ascend"} - width={tablePageSize.isNarrowWindow ? undefined : 200} + width={tablePageSize.isNarrowWindow ? 576 : 200} className={styles.nogrow} fixed="left" filterDropdown={searchNameColumn.filterDropdown} diff --git a/src/FilterLists.Web/src/hooks/useTablePageSizer.tsx b/src/FilterLists.Web/src/hooks/useTablePageSizer.tsx index b9bb402c2..bd225a280 100644 --- a/src/FilterLists.Web/src/hooks/useTablePageSizer.tsx +++ b/src/FilterLists.Web/src/hooks/useTablePageSizer.tsx @@ -16,6 +16,6 @@ export const useTablePageSizer = () => { }; const calculateSize = () => ({ - pageSize: Math.floor((window.innerHeight - 208) / 57), + pageSize: Math.floor((window.innerHeight - 184) / 57), isNarrowWindow: window.innerWidth < 576 ? true : false }); \ No newline at end of file