From c8dc9a125ab03b3c9c7a157368ae07abf0ab1882 Mon Sep 17 00:00:00 2001 From: "Collin M. Barrett" Date: Sun, 1 Sep 2019 17:14:06 -0500 Subject: [PATCH] misc linting --- .../src/components/listsTable/ListDrawer.tsx | 2 +- .../src/components/softwareCloud/SoftwareCloud.module.css | 4 ++++ .../src/components/softwareCloud/SoftwareCloud.tsx | 8 ++++++-- .../src/components/softwareCloud/SoftwareIcon.tsx | 5 +++-- 4 files changed, 14 insertions(+), 5 deletions(-) create mode 100644 src/FilterLists.Web.V2/src/components/softwareCloud/SoftwareCloud.module.css diff --git a/src/FilterLists.Web.V2/src/components/listsTable/ListDrawer.tsx b/src/FilterLists.Web.V2/src/components/listsTable/ListDrawer.tsx index 41ea6264f..81a3224e8 100644 --- a/src/FilterLists.Web.V2/src/components/listsTable/ListDrawer.tsx +++ b/src/FilterLists.Web.V2/src/components/listsTable/ListDrawer.tsx @@ -27,7 +27,7 @@ export const ListDrawer = (props: Props) => { software={list.syntaxId ? props.software.filter((s: Software) => s.syntaxIds.includes(list.syntaxId)) : []} tags={list.tagIds && props.tags.filter((t: Tag) => list.tagIds.includes(t.id))} {...rp} /> - : props.lists && props.lists.length && ; + : (props.lists && props.lists.length && ) || null; }; return ; }; \ No newline at end of file diff --git a/src/FilterLists.Web.V2/src/components/softwareCloud/SoftwareCloud.module.css b/src/FilterLists.Web.V2/src/components/softwareCloud/SoftwareCloud.module.css new file mode 100644 index 000000000..5daff62ad --- /dev/null +++ b/src/FilterLists.Web.V2/src/components/softwareCloud/SoftwareCloud.module.css @@ -0,0 +1,4 @@ +/* allow for 2nd row's bottom border to not be chopped in AllListsTable */ +.grow { + max-height: none !important; +} diff --git a/src/FilterLists.Web.V2/src/components/softwareCloud/SoftwareCloud.tsx b/src/FilterLists.Web.V2/src/components/softwareCloud/SoftwareCloud.tsx index ebbed97b4..df58c70ec 100644 --- a/src/FilterLists.Web.V2/src/components/softwareCloud/SoftwareCloud.tsx +++ b/src/FilterLists.Web.V2/src/components/softwareCloud/SoftwareCloud.tsx @@ -1,6 +1,7 @@ import React from 'react'; import { Software } from '../../interfaces/Software'; +import styles from './SoftwareCloud.module.css'; import { SoftwareIcon } from './SoftwareIcon'; interface Props { @@ -10,11 +11,14 @@ interface Props { export const SoftwareCloud = (props: Props) => props.software && props.software.length - ?
+ ?
{props.showLabel &&

{`Software:`}

} {props.software.map((s: Software, i: number) => s.homeUrl - ? + ? : )} diff --git a/src/FilterLists.Web.V2/src/components/softwareCloud/SoftwareIcon.tsx b/src/FilterLists.Web.V2/src/components/softwareCloud/SoftwareIcon.tsx index b0e799f4b..b79cd9890 100644 --- a/src/FilterLists.Web.V2/src/components/softwareCloud/SoftwareIcon.tsx +++ b/src/FilterLists.Web.V2/src/components/softwareCloud/SoftwareIcon.tsx @@ -42,7 +42,8 @@ interface Props { export const SoftwareIcon = (props: Props) => icons[props.id] - ? {icons[props.id].imageTitle} @@ -86,5 +87,5 @@ const icons: { [id: number]: Icon; } = { 31: { image: img31, imageTitle: "AdGuard Home" }, 32: { image: img32, imageTitle: "AdNauseam" }, 33: { image: img33, imageTitle: "Legacy Unix derivatives" }, - 34: { image: img34, imageTitle: "Windows command line" }, + 34: { image: img34, imageTitle: "Windows command line" } }; \ No newline at end of file