feat: ui-v2 Color System Naming

This commit is contained in:
Rodrigo Antinarelli authored and James A. Petts committed 2020-05-15 13:43:46 +02:00
1 parent 5541fb1f4b
commit b6201ebc34
23 files changed
+254 -119

No files matched your search

@@ -18,13 +18,13 @@ function Header({ appLogo = OHIFLogo(), children, t }) {
<div>{children}</div>
</div>
<div className="flex items-center">
<span className="mr-3 text-custom-grayLight text-lg">
<span className="mr-3 text-common-light text-lg">
{t('FOR INVESTIGATIONAL USE ONLY')}
</span>
<IconButton
variant="text"
color="inherit"
className="text-custom-blueBright"
className="text-primary-active"
onClick={showSettingsDropdown}
>
<React.Fragment>
@@ -13,7 +13,7 @@ import {
} from '@ohif/ui';
const isFiltering = (currentFiltersValues, filtersValues) => {
return Object.keys(currentFiltersValues).some(name => {
return Object.keys(currentFiltersValues).some((name) => {
const filterValue = currentFiltersValues[name];
return filterValue !== filtersValues[name];
});
@@ -25,7 +25,7 @@ const StudyListFilter = ({ filtersMeta, filtersValues, numOfStudies }) => {
);
const { sortBy, sortDirection } = currentFiltersValues;
const handleFilterLabelClick = name => {
const handleFilterLabelClick = (name) => {
let _sortDirection = 'ascending';
if (sortBy === name) {
if (sortDirection === 'ascending') {
@@ -36,7 +36,7 @@ const StudyListFilter = ({ filtersMeta, filtersValues, numOfStudies }) => {
}
if (numOfStudies <= 100) {
setcurrentFiltersValues(prevState => ({
setcurrentFiltersValues((prevState) => ({
...prevState,
sortBy: _sortDirection !== 0 ? name : '',
sortDirection: _sortDirection,
@@ -72,8 +72,8 @@ const StudyListFilter = ({ filtersMeta, filtersValues, numOfStudies }) => {
sortDirection={_sortDirection}
onLabelClick={onLabelClick}
value={currentFiltersValues[name]}
onChange={newValue => {
setcurrentFiltersValues(prevState => ({
onChange={(newValue) => {
setcurrentFiltersValues((prevState) => ({
...prevState,
[name]: newValue,
}));
@@ -91,8 +91,8 @@ const StudyListFilter = ({ filtersMeta, filtersValues, numOfStudies }) => {
onLabelClick={onLabelClick}
options={inputProps.options}
value={currentFiltersValues[name]}
onChange={newValue => {
setcurrentFiltersValues(prevState => ({
onChange={(newValue) => {
setcurrentFiltersValues((prevState) => ({
...prevState,
[name]: newValue,
}));
@@ -108,8 +108,8 @@ const StudyListFilter = ({ filtersMeta, filtersValues, numOfStudies }) => {
sortDirection={_sortDirection}
onLabelClick={onLabelClick}
value={currentFiltersValues[name]}
onChange={newValue => {
setcurrentFiltersValues(prevState => ({
onChange={(newValue) => {
setcurrentFiltersValues((prevState) => ({
...prevState,
[name]: newValue,
}));
@@ -134,14 +134,11 @@ const StudyListFilter = ({ filtersMeta, filtersValues, numOfStudies }) => {
return (
<>
<div>
<div className="bg-custom-navyDark">
<div className="bg-primary-dark">
<div className="container m-auto relative flex flex-col pt-5">
<div className="flex flex-row justify-between mb-5 px-12">
<div className="flex flex-row">
<Typography
variant="h4"
className="text-custom-aquaBright mr-6"
>
<Typography variant="h4" className="text-primary-light mr-6">
Study List
</Typography>
<div className="flex flex-row items-end">
@@ -149,12 +146,12 @@ const StudyListFilter = ({ filtersMeta, filtersValues, numOfStudies }) => {
variant="text"
size="small"
color="inherit"
className="text-custom-blueBright"
className="text-primary-active"
startIcon={<Icon name="info-link" className="w-2" />}
>
<span className="flex flex-col flex-1">
<span>Learn more</span>
<span className="opacity-50 pt-1 border-b border-custom-blueBright"></span>
<span className="opacity-50 pt-1 border-b border-primary-active"></span>
</span>
</Button>
</div>
@@ -165,7 +162,7 @@ const StudyListFilter = ({ filtersMeta, filtersValues, numOfStudies }) => {
rounded="full"
variant="outlined"
color="primary"
className="text-custom-blueBright border-custom-blueBright mx-8"
className="text-primary-active border-primary-active mx-8"
startIcon={<Icon name="cancel" />}
onClick={clearFilters}
>
@@ -177,7 +174,7 @@ const StudyListFilter = ({ filtersMeta, filtersValues, numOfStudies }) => {
</Typography>
<Typography
variant="h6"
className="text-custom-grayLight self-end pb-1"
className="text-common-light self-end pb-1"
>
Studies
</Typography>
@@ -187,10 +184,10 @@ const StudyListFilter = ({ filtersMeta, filtersValues, numOfStudies }) => {
</div>
</div>
<div className="sticky z-10 border-b-4 border-black" style={{ top: 58 }}>
<div className="bg-custom-navyDark pt-3 pb-3 ">
<div className="bg-primary-dark pt-3 pb-3 ">
<div className="container m-auto relative flex flex-col">
<div className="flex flex-row w-full">
{filtersMeta.map(filterMeta => {
{filtersMeta.map((filterMeta) => {
return (
<div
key={filterMeta.name}
@@ -208,7 +205,7 @@ const StudyListFilter = ({ filtersMeta, filtersValues, numOfStudies }) => {
</div>
{numOfStudies > 100 && (
<div className="container m-auto">
<div className="bg-custom-blue text-center text-base py-1 rounded-b">
<div className="bg-primary-main text-center text-base py-1 rounded-b">
<p className="text-white">
Filter list to 100 studies or less to enable sorting
</p>
@@ -7,10 +7,10 @@ import {
Icon,
} from '../../../components/';
const StudyListPagination = props => {
const StudyListPagination = (props) => {
const [currentPage, setCurrentPage] = useState(1);
const navigateToPage = page => {
const navigateToPage = (page) => {
const toPage = page < 1 ? 1 : page;
setCurrentPage(toPage);
};
@@ -23,7 +23,7 @@ const StudyListPagination = props => {
<div className="relative mr-3">
<select
defaultValue="25"
className="block appearance-none w-full bg-transparent border border-custom-darkSlateBlue text-white text-base px-2 pr-4 rounded leading-tight focus:outline-none"
className="block appearance-none w-full bg-transparent border border-common-active text-white text-base px-2 pr-4 rounded leading-tight focus:outline-none"
style={{ height: 28 }}
>
<option value="25">25</option>
@@ -50,7 +50,7 @@ const StudyListPagination = props => {
<ButtonGroup color="primary">
<IconButton
size="small"
className="border-custom-darkSlateBlue px-4 py-2 text-base"
className="border-common-active px-4 py-2 text-base"
style={{ padding: '3px 12px', minWidth: 0 }}
color="white"
onClick={() => navigateToPage(1)}
@@ -59,14 +59,14 @@ const StudyListPagination = props => {
</IconButton>
<Button
size="small"
className="border-custom-darkSlateBlue py-2 text-base"
className="border-common-active py-2 text-base"
style={{ padding: '3px 8px', minWidth: 0 }}
color="white"
onClick={() => navigateToPage(currentPage - 1)}
>{`< Previous`}</Button>
<Button
size="small"
className="border-custom-darkSlateBlue py-2 text-base"
className="border-common-active py-2 text-base"
style={{ padding: '3px 20px', minWidth: 0 }}
color="white"
onClick={() => navigateToPage(currentPage + 1)}
@@ -6,11 +6,11 @@ import { format } from 'date-fns';
import { Button, Icon, EmptyStudies } from '@ohif/ui';
const getGridColClass = (filtersMeta, name) => {
const filter = filtersMeta.find(filter => filter.name === name);
const filter = filtersMeta.find((filter) => filter.name === name);
return (filter && filter.gridCol && `w-${filter.gridCol}/24`) || '';
};
const StudyTableRow = props => {
const StudyTableRow = (props) => {
const {
AccessionNumber,
Modalities,
@@ -28,30 +28,30 @@ const StudyTableRow = props => {
const ChevronIconName = isOpened ? 'chevron-down' : 'chevron-right';
const tdClasses = [
'px-4 py-2 text-base',
{ 'border-b border-custom-violetPale': !isOpened },
{ 'border-b border-secondary-light': !isOpened },
];
return (
<>
<tr>
<td
className={classnames('border-0 p-0', {
'border-b border-custom-violetPale bg-custom-navyDark': isOpened,
'border-b border-secondary-light bg-primary-dark': isOpened,
})}
>
<div
className={classnames('w-full transition duration-300', {
'border border-custom-aquaBright rounded overflow-hidden mb-2 hover:border-custom-violetPale': isOpened,
'border border-primary-light rounded overflow-hidden mb-2 hover:border-secondary-light': isOpened,
})}
>
<table className={classnames('w-full p-4')}>
<tbody>
<tr
className={classnames(
'cursor-pointer hover:bg-custom-violetDark transition duration-300 bg-black',
'cursor-pointer hover:bg-secondary-main transition duration-300 bg-black',
{
'bg-custom-navyDark': !isOpened,
'bg-primary-dark': !isOpened,
},
{ 'bg-custom-navy': isOpened }
{ 'bg-secondary-dark': isOpened }
)}
onClick={toggleRow}
>
@@ -115,8 +115,8 @@ const StudyTableRow = props => {
<Icon
name="series-active"
className={classnames('inline-flex mr-2', {
'text-custom-blueBright': isOpened,
'text-custom-violetPale': !isOpened,
'text-primary-active': isOpened,
'text-secondary-light': !isOpened,
})}
/>
{Instances}
@@ -162,7 +162,7 @@ const StudyTableRow = props => {
>
Module 3
</Button>
<div className="ml-5 text-lg text-custom-grayBright inline-flex items-center">
<div className="ml-5 text-lg text-common-bright inline-flex items-center">
<Icon
name="notificationwarning-diamond"
className="mr-2 w-5 h-5"