TrizTech/ohif-viewer
17
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix color conflicts

Browse Source
This commit is contained in:
Rodrigo Antinarelli authored and James A. Petts committed 2020-05-15 13:46:23 +02:00
1 parent f4b078912a
commit ba5e1497bf
3 files changed
+15 -15
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

platform/ui/src/components/StudyListTable/StudyListTableRow.js
+6 -6
View File
@@ -10,23 +10,23 @@ const StudyListTableRow = (props) => {
<tr> <tr>
<td <td
className={classnames('border-0 p-0', { className={classnames('border-0 p-0', {
'border-b border-custom-violetPale bg-custom-navyDark': isExpanded, 'border-b border-secondary-light bg-primary-dark': isExpanded,
})} })}
> >
<div <div
className={classnames('w-full transition duration-300', { className={classnames('w-full transition duration-300', {
'border border-custom-aquaBright rounded overflow-hidden mb-2 hover:border-custom-violetPale': isExpanded, 'border border-primary-light rounded overflow-hidden mb-2 hover:border-secondary-light': isExpanded,
})} })}
> >
<table className={classnames('w-full p-4')}> <table className={classnames('w-full p-4')}>
<tbody> <tbody>
<tr <tr
className={classnames( 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': !isExpanded, 'bg-primary-dark': !isExpanded,
}, },
{ 'bg-custom-navy': isExpanded } { 'bg-secondary-dark': isExpanded }
)} )}
onClick={onClickRow} onClick={onClickRow}
> >
@@ -38,7 +38,7 @@ const StudyListTableRow = (props) => {
key={name} key={name}
className={classnames( className={classnames(
'px-4 py-2 text-base', 'px-4 py-2 text-base',
{ 'border-b border-custom-violetPale': !isExpanded }, { 'border-b border-secondary-light': !isExpanded },
`w-${gridCol}/24` || '' `w-${gridCol}/24` || ''
)} )}
> >
platform/ui/src/views/StudyList/StudyList.js
+3 -3
View File
@@ -192,8 +192,8 @@ const StudyList = () => {
<Icon <Icon
name="series-active" name="series-active"
className={classnames('inline-flex mr-2', { className={classnames('inline-flex mr-2', {
'text-custom-blueBright': isExpanded, 'text-primary-active': isExpanded,
'text-custom-violetPale': !isExpanded, 'text-secondary-light': !isExpanded,
})} })}
/> />
{Instances} {Instances}
@@ -231,7 +231,7 @@ const StudyList = () => {
> >
Module 3 Module 3
</Button> </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" /> <Icon name="notificationwarning-diamond" className="mr-2 w-5 h-5" />
Feedback text lorem ipsum dolor sit amet Feedback text lorem ipsum dolor sit amet
</div> </div>
platform/ui/src/views/StudyList/StudyList.mdx
+6 -6
View File
@@ -120,7 +120,7 @@ import { StudyList } from '@ohif/ui';
}, },
]; ];
const isFiltering = (filterValues, defaultFilterValues) => { const isFiltering = (filterValues, defaultFilterValues) => {
return Object.keys(defaultFilterValues).some(name => { return Object.keys(defaultFilterValues).some((name) => {
return filterValues[name] !== defaultFilterValues[name]; return filterValues[name] !== defaultFilterValues[name];
}); });
}; };
@@ -206,8 +206,8 @@ import { StudyList } from '@ohif/ui';
<Icon <Icon
name="series-active" name="series-active"
className={classnames('inline-flex mr-2', { className={classnames('inline-flex mr-2', {
'text-custom-blueBright': isExpanded, 'text-primary-active': isExpanded,
'text-custom-violetPale': !isExpanded, 'text-secondary-light': !isExpanded,
})} })}
/> />
{Instances} {Instances}
@@ -249,7 +249,7 @@ import { StudyList } from '@ohif/ui';
> >
Module 3 Module 3
</Button> </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 <Icon
name="notificationwarning-diamond" name="notificationwarning-diamond"
className="mr-2 w-5 h-5" className="mr-2 w-5 h-5"
@@ -312,13 +312,13 @@ import { StudyList } from '@ohif/ui';
</div> </div>
</div> </div>
<div className="flex items-center"> <div className="flex items-center">
<span className="mr-3 text-custom-grayLight text-lg"> <span className="mr-3 text-common-light text-lg">
FOR INVESTIGATIONAL USE ONLY FOR INVESTIGATIONAL USE ONLY
</span> </span>
<IconButton <IconButton
variant="text" variant="text"
color="inherit" color="inherit"
className="text-custom-blueBright" className="text-primary-active"
onClick={() => {}} onClick={() => {}}
> >
<React.Fragment> <React.Fragment>