fix(colors): Replaces legacy colors with ui-next colors (#5351)
* Update playwright screenshots and fix broken tests. --------- Co-authored-by: Joe Boccanfuso <joe.boccanfuso@radicalimaging.com>
This commit is contained in:
1 parent
4dfd80f1fd
commit
9a2691a71f
87 files changed
+201
-204
No files matched your search
@@ -87,7 +87,7 @@ function DataSourceConfigurationComponent({
|
||||
}, [configurationAPI, configuredItems, showConfigurationModal]);
|
||||
|
||||
return configuredItems ? (
|
||||
<div className="text-aqua-pale flex items-center overflow-hidden">
|
||||
<div className="text-muted-foreground flex items-center overflow-hidden">
|
||||
<Icons.Settings
|
||||
className="mr-2.5 h-3.5 w-3.5 shrink-0 cursor-pointer"
|
||||
onClick={showConfigurationModal}
|
||||
|
||||
@@ -101,24 +101,24 @@ function DataSourceConfigurationModalComponent({
|
||||
itemIndex < selectedItems.length
|
||||
? classNames(
|
||||
'bg-black/[.4]',
|
||||
itemIndex !== itemLabels.length - 1 ? 'hover:bg-transparent active:bg-secondary-dark' : ''
|
||||
itemIndex !== itemLabels.length - 1 ? 'hover:bg-transparent active:bg-popover' : ''
|
||||
)
|
||||
: 'bg-transparent';
|
||||
|
||||
const getSelectedItemBorderClasses = itemIndex =>
|
||||
itemIndex === currentSelectedItemIndex + 1
|
||||
? classNames('border-2', 'border-solid', 'border-primary-light')
|
||||
? classNames('border-2', 'border-solid', 'border-highlight')
|
||||
: itemIndex < selectedItems.length
|
||||
? 'border border-solid border-primary-active hover:border-primary-light active:border-white'
|
||||
: 'border border-dashed border-secondary-light';
|
||||
? 'border border-solid border-primary hover:border-highlight active:border-white'
|
||||
: 'border border-dashed border-input';
|
||||
|
||||
const getSelectedItemTextClasses = itemIndex =>
|
||||
itemIndex <= selectedItems.length ? 'text-primary-light' : 'text-primary';
|
||||
itemIndex <= selectedItems.length ? 'text-highlight' : 'text-primary';
|
||||
|
||||
const getErrorComponent = (): ReactElement => {
|
||||
return (
|
||||
<div className="flex min-h-[1px] grow flex-col gap-4">
|
||||
<div className="text-primary-light text-[20px]">
|
||||
<div className="text-highlight text-[20px]">
|
||||
{t(`Error fetching ${itemLabels[selectedItems.length]} list`)}
|
||||
</div>
|
||||
<div className="grow bg-black p-4 text-[14px]">{errorMessage}</div>
|
||||
@@ -159,7 +159,12 @@ function DataSourceConfigurationModalComponent({
|
||||
<div className={classNames(NO_WRAP_ELLIPSIS_CLASS_NAMES)}>{t(itemLabel)}</div>
|
||||
</div>
|
||||
{itemLabelIndex < selectedItems.length ? (
|
||||
<div className={classNames('text-[14px] text-white', NO_WRAP_ELLIPSIS_CLASS_NAMES)}>
|
||||
<div
|
||||
className={classNames(
|
||||
'text-foreground text-[14px]',
|
||||
NO_WRAP_ELLIPSIS_CLASS_NAMES
|
||||
)}
|
||||
>
|
||||
{selectedItems[itemLabelIndex].name}
|
||||
</div>
|
||||
) : (
|
||||
|
||||
@@ -126,7 +126,7 @@ const DicomTagBrowser = ({
|
||||
return (
|
||||
<div className="dicom-tag-browser-content bg-muted">
|
||||
<div className="mb-6 flex flex-row items-start pl-1">
|
||||
<div className="flex w-full flex-row items-start gap-4">
|
||||
<div className="flex w-full flex-row items-start gap-6">
|
||||
<div className="flex w-1/3 flex-col">
|
||||
<span className="text-muted-foreground flex h-6 items-center pb-2 text-base">
|
||||
Series
|
||||
@@ -167,7 +167,7 @@ const DicomTagBrowser = ({
|
||||
min={1}
|
||||
max={activeDisplaySet?.images?.length}
|
||||
step={1}
|
||||
className="pt-4"
|
||||
className="pt-3"
|
||||
/>
|
||||
</div>
|
||||
)}
|
||||
|
||||
@@ -39,7 +39,7 @@ const RowComponent = ({
|
||||
<div
|
||||
style={{ ...style, ...rowStyle }}
|
||||
className={classNames(
|
||||
'hover:bg-secondary-main border-secondary-light text-foreground flex w-full flex-row items-center break-all bg-black text-base transition duration-300',
|
||||
'hover:bg-primary/25 border-input text-foreground flex w-full flex-row items-center break-all bg-black text-base',
|
||||
lineHeightClassName
|
||||
)}
|
||||
key={keyPrefix}
|
||||
@@ -74,15 +74,13 @@ const RowComponent = ({
|
||||
function ColumnHeaders({ tagRef, vrRef, keywordRef, valueRef }) {
|
||||
return (
|
||||
<div
|
||||
className={classNames(
|
||||
'bg-secondary-dark ohif-scrollbar flex w-full flex-row overflow-y-scroll'
|
||||
)}
|
||||
className={classNames('bg-popover ohif-scrollbar flex w-full flex-row overflow-y-scroll')}
|
||||
style={rowVerticalPaddingStyle}
|
||||
>
|
||||
<div className="w-4/24 px-3">
|
||||
<label
|
||||
ref={tagRef}
|
||||
className="flex flex-1 select-none flex-col pl-1 text-lg text-white"
|
||||
className="text-foreground flex flex-1 select-none flex-col pl-1 text-lg"
|
||||
>
|
||||
<span className="flex flex-row items-center focus:outline-none">Tag</span>
|
||||
</label>
|
||||
@@ -90,7 +88,7 @@ function ColumnHeaders({ tagRef, vrRef, keywordRef, valueRef }) {
|
||||
<div className="w-2/24 px-3">
|
||||
<label
|
||||
ref={vrRef}
|
||||
className="flex flex-1 select-none flex-col pl-1 text-lg text-white"
|
||||
className="text-foreground flex flex-1 select-none flex-col pl-1 text-lg"
|
||||
>
|
||||
<span className="flex flex-row items-center focus:outline-none">VR</span>
|
||||
</label>
|
||||
@@ -98,7 +96,7 @@ function ColumnHeaders({ tagRef, vrRef, keywordRef, valueRef }) {
|
||||
<div className="w-6/24 px-3">
|
||||
<label
|
||||
ref={keywordRef}
|
||||
className="flex flex-1 select-none flex-col pl-1 text-lg text-white"
|
||||
className="text-foreground flex flex-1 select-none flex-col pl-1 text-lg"
|
||||
>
|
||||
<span className="flex flex-row items-center focus:outline-none">Keyword</span>
|
||||
</label>
|
||||
@@ -106,7 +104,7 @@ function ColumnHeaders({ tagRef, vrRef, keywordRef, valueRef }) {
|
||||
<div className="w-5/24 grow px-3">
|
||||
<label
|
||||
ref={valueRef}
|
||||
className="flex flex-1 select-none flex-col pl-1 text-lg text-white"
|
||||
className="text-foreground flex flex-1 select-none flex-col pl-1 text-lg"
|
||||
>
|
||||
<span className="flex flex-row items-center focus:outline-none">Value</span>
|
||||
</label>
|
||||
|
||||
@@ -16,7 +16,7 @@ function DataSourceSelector() {
|
||||
return (
|
||||
<div style={{ width: '100%', height: '100%' }}>
|
||||
<div className="flex h-screen w-screen items-center justify-center">
|
||||
<div className="bg-secondary-dark mx-auto space-y-2 rounded-lg py-8 px-8 drop-shadow-md">
|
||||
<div className="bg-popover mx-auto space-y-2 rounded-lg py-8 px-8 drop-shadow-md">
|
||||
<img
|
||||
className="mx-auto block h-14"
|
||||
src="./ohif-logo.svg"
|
||||
@@ -27,7 +27,7 @@ function DataSourceSelector() {
|
||||
.filter(it => it.sourceName !== 'dicomjson' && it.sourceName !== 'dicomlocal')
|
||||
.map(ds => (
|
||||
<div key={ds.sourceName}>
|
||||
<h1 className="text-white">
|
||||
<h1 className="text-foreground">
|
||||
{ds.configuration?.friendlyName || ds.friendlyName}
|
||||
</h1>
|
||||
<Button
|
||||
|
||||
@@ -45,7 +45,7 @@ function PanelStudyBrowserHeader({
|
||||
key={index}
|
||||
aria-label={viewPreset.id}
|
||||
value={viewPreset.id}
|
||||
className="text-actions-primary"
|
||||
className="text-primary"
|
||||
>
|
||||
{React.createElement(Icons[viewPreset.iconName] || Icons.MissingIcon)}
|
||||
</ToggleGroupItem>
|
||||
|
||||
@@ -40,7 +40,7 @@ function HeaderPatientInfo({ servicesManager, appConfig }: withAppTypes) {
|
||||
|
||||
return (
|
||||
<div
|
||||
className="hover:bg-primary-dark flex cursor-pointer items-center justify-center gap-1 rounded-lg"
|
||||
className="hover:bg-muted flex cursor-pointer items-center justify-center gap-1 rounded-lg"
|
||||
onClick={handleOnClick}
|
||||
>
|
||||
{isMixedPatients ? (
|
||||
@@ -51,10 +51,10 @@ function HeaderPatientInfo({ servicesManager, appConfig }: withAppTypes) {
|
||||
<div className="flex flex-col justify-center">
|
||||
{expanded ? (
|
||||
<>
|
||||
<div className="self-start text-[13px] font-bold text-white">
|
||||
<div className="text-foreground self-start text-[13px] font-bold">
|
||||
{formattedPatientName}
|
||||
</div>
|
||||
<div className="text-aqua-pale flex gap-2 text-[11px]">
|
||||
<div className="text-muted-foreground flex gap-2 text-[11px]">
|
||||
<div>{formattedPatientID}</div>
|
||||
<div>{patientInfo.PatientSex}</div>
|
||||
<div>{patientInfo.PatientDOB}</div>
|
||||
|
||||
@@ -100,7 +100,7 @@ function ViewerHeader({ appConfig }: withAppTypes<{ appConfig: AppTypes.Config }
|
||||
<div className="text-primary flex cursor-pointer items-center">
|
||||
<Button
|
||||
variant="ghost"
|
||||
className="hover:bg-primary-dark"
|
||||
className="hover:bg-muted"
|
||||
onClick={() => {
|
||||
commandsManager.run('undo');
|
||||
}}
|
||||
@@ -109,7 +109,7 @@ function ViewerHeader({ appConfig }: withAppTypes<{ appConfig: AppTypes.Config }
|
||||
</Button>
|
||||
<Button
|
||||
variant="ghost"
|
||||
className="hover:bg-primary-dark"
|
||||
className="hover:bg-muted"
|
||||
onClick={() => {
|
||||
commandsManager.run('redo');
|
||||
}}
|
||||
|
||||
@@ -113,7 +113,7 @@ export function Toolbox({ buttonSectionId, title }: ToolboxProps) {
|
||||
);
|
||||
})}
|
||||
{activeToolOptions && (
|
||||
<div className="bg-primary-dark mt-1 h-auto px-2">
|
||||
<div className="bg-muted mt-1 h-auto px-2">
|
||||
<ToolSettings options={activeToolOptions} />
|
||||
</div>
|
||||
)}
|
||||
|
||||
Reference in new issue
Block a user