Skip to content

Commit 337d251

Browse files
committed
populated datastreams to green. fix status buttons in ObjectSummary.
1 parent a71c63b commit 337d251

File tree

8 files changed

+34
-25
lines changed

8 files changed

+34
-25
lines changed

client/components/edit/ObjectEditor.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ const ObjectEditor = ({ pid }: ObjectEditorProps): React.ReactElement => {
3333
<h1>Editor: Object {pid}</h1>
3434
<ObjectSummary />
3535
<Grid container>
36-
<Grid item xs={4}>
36+
<Grid item md>
3737
<Box>
3838
<h3>Object Tools</h3>
3939
<ul>
@@ -43,7 +43,7 @@ const ObjectEditor = ({ pid }: ObjectEditorProps): React.ReactElement => {
4343
</ul>
4444
</Box>
4545
</Grid>
46-
<Grid item xs={4}>
46+
<Grid item md>
4747
<Box>
4848
<h3>Datastreams</h3>
4949
<DatastreamList />

client/components/edit/ObjectSummary.module.css

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,24 @@
33
padding-block: 1rem;
44
color: var(--info-text);
55
background-color: var(--info);
6-
border: 1px solid var(--sky-400);
6+
border: 1px solid var(--info-border);
77
}
88

99
.infobox h2 {
1010
margin: 0;
1111
}
1212

13-
.infobox.infobox button {
13+
.infobox button {
1414
min-width: unset;
1515
margin-inline-end: 1ch;
16+
padding-block: 0.5em 0.4em;
1617
font-size: 10pt;
17-
color: var(--button-text);
18-
background-color: var(--button-face);
19-
border-color: var(--info-text);
18+
background-color: white;
19+
border: 1px solid black;
2020

21-
&:hover, &:focus {
22-
color: var(--button-hover-text);
23-
background-color: var(--button-hover);
24-
border-color: var(--button-hover);
25-
}
21+
&:hover,
22+
&:focus {
23+
color: white;
24+
background-color: black;
25+
}
2626
}

client/components/edit/datastream/Datastream.module.css

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
1+
.datastream {
2+
margin-block: 0.125em;
3+
padding-block: 0.375em;
4+
border: 1px solid transparent;
5+
}
6+
17
.enabled {
28
color: var(--selected-text);
39
background-color: var(--selected);
10+
border-color: var(--selected-border);
411
}
512

613
div[role="group"] .datastreamControlButton {

client/components/edit/datastream/Datastream.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const Datastream = ({ datastream }: DatastreamProps): React.ReactElement => {
1414
const { stream, disabled } = datastream;
1515
return (
1616
<ListItem
17-
classes={disabled ? {} : { root: styles.enabled }}
17+
classes={{ root: `${styles.datastream} ${disabled ? "" : styles.enabled}` }}
1818
secondaryAction={<DatastreamControls datastream={stream} disabled={disabled} />}
1919
>
2020
<ListItemText primary={stream} />

client/components/paginate/JobPaginator.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ const JobPaginator = ({ initialCategory, initialJob }: JobPaginatorProps): React
2626

2727
return (
2828
<>
29-
<ul className="breadcrumbs" style={{ marginBlockEnd: 0 }}>
29+
<ul className="breadcrumbs">
3030
<li>
3131
<Link href="/">Main Menu</Link>
3232
</li>

client/styles/global.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
.breadcrumbs {
7171
width: fit-content;
7272
margin-block: 1rem;
73-
padding-inline: 1rem;
73+
padding-inline: 0;
7474
padding-block: 0.5rem;
7575
font-size: 0.875rem;
7676
list-style: none;

client/styles/job-paginator.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ label input[type="radio"] {
145145
}
146146
.thumbnail.selected {
147147
background-color: var(--selected);
148-
border-color: var(--amber-500);
148+
border-color: var(--selected-border);
149149
}
150150
.thumbnail img {
151151
display: block;

client/styles/variables.css

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,25 +29,27 @@
2929
--active: oklch(0.577 0.245 27.325); /* Tailwind red-600 */
3030
--active-text: white;
3131

32-
--selected: var(--amber-200);
32+
--selected: var(--emerald-200);
3333
--selected-text: black;
34+
--selected-border: var(--emerald-500);
3435

3536
--info: var(--sky-100);
3637
--info-text: var(--sky-800);
38+
--info-border: var(--sky-500);
3739

3840
--success: var(--green-100);
3941
--success-text: var(--green-800);
4042

4143
--danger: var(--red-100);
4244
--danger-text: var(--red-800);
4345

44-
--object-status-active: var(--green-600);
45-
--object-status-inactive: var(--yellow-600);
46-
--object-status-deleted: var(--red-600);
47-
--object-status-unknown: var(--gray-600);
46+
--object-status-active: var(--emerald-200);
47+
--object-status-inactive: var(--yellow-200);
48+
--object-status-deleted: var(--red-200);
49+
--object-status-unknown: var(--gray-200);
4850

49-
--object-status-active-hover: var(--green-300);
50-
--object-status-inactive-hover: var(--yellow-300);
51-
--object-status-deleted-hover: var(--red-300);
52-
--object-status-unknown-hover: var(--gray-300);
51+
--object-status-active-text: var(--emerald-800);
52+
--object-status-inactive-text: var(--yellow-800);
53+
--object-status-deleted-text: var(--red-800);
54+
--object-status-unknown-text: var(--gray-800);
5355
}

0 commit comments

Comments
 (0)