diff --git a/platform/ui/src/components/Button/Button.jsx b/platform/ui/src/components/Button/Button.jsx index 293a19ed8..a3f656f4f 100644 --- a/platform/ui/src/components/Button/Button.jsx +++ b/platform/ui/src/components/Button/Button.jsx @@ -50,7 +50,7 @@ const variantClasses = { }, contained: { default: - 'bg-custom-aquaBright text-white hover:opacity-80 active:opacity-100 focus:opacity-80', + 'bg-custom-aquaBright text-black hover:opacity-80 active:opacity-100 focus:opacity-80', primary: 'bg-custom-blue text-white hover:opacity-80 active:opacity-100 focus:opacity-80', secondary: diff --git a/platform/ui/src/views/StudyList/StudyList.js b/platform/ui/src/views/StudyList/StudyList.js index 652fb52ec..54aa36364 100644 --- a/platform/ui/src/views/StudyList/StudyList.js +++ b/platform/ui/src/views/StudyList/StudyList.js @@ -69,8 +69,13 @@ const StudyList = ({ studies, perPage }) => { 'h-screen': isEmptyStudies, })} > -
- +
+
+ +
-
-
-
- - Study List - -
- +
+
+
+ {isFiltering() && ( + + )} + + {numOfStudies > 100 ? '>100' : numOfStudies} + + - - Learn more - - - + Studies +
-
- {isFiltering() && ( - +
+ {filtersMeta.map( + ({ name, displayName, inputType, isSortable, gridCol }) => { + return ( +
+ 0 + } + isBeingSorted={sortBy === name} + sortDirection={sortDirection} + onLabelClick={() => handleFilterLabelClick(name)} + inputType={inputType} + > + {inputType !== 'none' && ( + + handleFilterValueChange(event, name) + } + /> + )} + +
+ ); + } )} - - {numOfStudies > 100 ? '>100' : numOfStudies} - - - Studies -
-
- {filtersMeta.map( - ({ name, displayName, inputType, isSortable, gridCol }) => { - return ( -
- 0 - } - isBeingSorted={sortBy === name} - sortDirection={sortDirection} - onLabelClick={() => handleFilterLabelClick(name)} - inputType={inputType} - > - {inputType !== 'none' && ( - handleFilterValueChange(event, name)} - /> - )} - -
- ); - } - )} -
+ {numOfStudies > 100 && ( +
+
+

+ Filter list to 100 studies or less to enable sorting +

+
+
+ )} ); }; diff --git a/platform/ui/src/views/StudyList/components/StudyListTable.js b/platform/ui/src/views/StudyList/components/StudyListTable.js index 2f6b8c36b..e33f91b2f 100644 --- a/platform/ui/src/views/StudyList/components/StudyListTable.js +++ b/platform/ui/src/views/StudyList/components/StudyListTable.js @@ -27,7 +27,7 @@ const TableRow = props => { const toggleRow = () => setIsOpened(!isOpened); const ChevronIconName = isOpened ? 'chevron-down' : 'chevron-right'; const tdClasses = [ - 'px-4 py-2', + 'px-4 py-2 text-base', { 'border-b border-custom-violetPale': !isOpened }, ]; const seriesWidthClasses = { @@ -44,8 +44,8 @@ const TableRow = props => { })} >
@@ -128,33 +128,46 @@ const TableRow = props => { {isOpened && ( - +
-
+
-
+
{
Description
Series
Modality
Instances
-
+
{series.map((seriesItem, i) => (
{ const renderTable = () => { return ( - +
{studies.map((study, i) => ( { <>
- {numOfStudies > 100 && ( -
-

- Filter list to 100 studies or less to enable sorting -

-
- )} - {numOfStudies > 0 && renderTable()} {numOfStudies === 0 && renderEmpty()}
diff --git a/platform/ui/tailwind.config.js b/platform/ui/tailwind.config.js index 4c42ee3e8..b9c908745 100644 --- a/platform/ui/tailwind.config.js +++ b/platform/ui/tailwind.config.js @@ -345,10 +345,11 @@ module.exports = { ...theme('spacing'), ...negative(theme('spacing')), }), - maxHeight: { + maxHeight: theme => ({ full: '100%', screen: '100vh', - }, + ...theme('spacing'), + }), maxWidth: (theme, { breakpoints }) => ({ none: 'none', xs: '20rem',