diff --git a/frontend/src/Calendar/Agenda/AgendaEvent.js b/frontend/src/Calendar/Agenda/AgendaEvent.js
index 2f2fd8446..799a3c724 100644
--- a/frontend/src/Calendar/Agenda/AgendaEvent.js
+++ b/frontend/src/Calendar/Agenda/AgendaEvent.js
@@ -147,7 +147,7 @@ class AgendaEvent extends Component {
className={styles.statusIcon}
name={icons.MOVIE_FILE}
kind={kinds.WARNING}
- title={translate('QualityCutoffHasNotBeenMet')}
+ title={translate('QualityCutoffNotMet')}
/>
}
diff --git a/frontend/src/Calendar/Events/CalendarEvent.css b/frontend/src/Calendar/Events/CalendarEvent.css
index 8c17a420f..f5b914cb6 100644
--- a/frontend/src/Calendar/Events/CalendarEvent.css
+++ b/frontend/src/Calendar/Events/CalendarEvent.css
@@ -48,6 +48,10 @@ $fullColorGradient: rgba(244, 245, 246, 0.2);
.statusContainer {
display: flex;
align-items: center;
+
+ &:global(.fullColor) {
+ filter: var(--calendarFullColorFilter)
+ }
}
.statusIcon {
diff --git a/frontend/src/Calendar/Events/CalendarEvent.js b/frontend/src/Calendar/Events/CalendarEvent.js
index dfa73a888..c0397eeef 100644
--- a/frontend/src/Calendar/Events/CalendarEvent.js
+++ b/frontend/src/Calendar/Events/CalendarEvent.js
@@ -76,12 +76,18 @@ class CalendarEvent extends Component {
{title}
-
+
{
queueItem ?
:
null
@@ -98,12 +104,14 @@ class CalendarEvent extends Component {
}
{
- showCutoffUnmetIcon && !!movieFile && movieFile.qualityCutoffNotMet ?
+ showCutoffUnmetIcon &&
+ !!movieFile &&
+ movieFile.qualityCutoffNotMet ?
:
null
}
diff --git a/frontend/src/Calendar/Legend/Legend.js b/frontend/src/Calendar/Legend/Legend.js
index f9759b7aa..1884055d2 100644
--- a/frontend/src/Calendar/Legend/Legend.js
+++ b/frontend/src/Calendar/Legend/Legend.js
@@ -20,10 +20,11 @@ function Legend(props) {
if (showCutoffUnmetIcon) {
iconsToShow.push(
);
}
diff --git a/frontend/src/Calendar/Legend/LegendIconItem.css b/frontend/src/Calendar/Legend/LegendIconItem.css
index d4b07f247..4e073765b 100644
--- a/frontend/src/Calendar/Legend/LegendIconItem.css
+++ b/frontend/src/Calendar/Legend/LegendIconItem.css
@@ -4,4 +4,8 @@
.icon {
margin-right: 5px;
+
+ &:global(.fullColorEvents) {
+ filter: var(--calendarFullColorFilter)
+ }
}
diff --git a/frontend/src/Calendar/Legend/LegendIconItem.js b/frontend/src/Calendar/Legend/LegendIconItem.js
index 5ce5f725b..b6bdeeff7 100644
--- a/frontend/src/Calendar/Legend/LegendIconItem.js
+++ b/frontend/src/Calendar/Legend/LegendIconItem.js
@@ -1,3 +1,4 @@
+import classNames from 'classnames';
import PropTypes from 'prop-types';
import React from 'react';
import Icon from 'Components/Icon';
@@ -6,9 +7,9 @@ import styles from './LegendIconItem.css';
function LegendIconItem(props) {
const {
name,
+ fullColorEvents,
icon,
kind,
- darken,
tooltip
} = props;
@@ -18,9 +19,11 @@ function LegendIconItem(props) {
title={tooltip}
>
@@ -31,14 +34,10 @@ function LegendIconItem(props) {
LegendIconItem.propTypes = {
name: PropTypes.string.isRequired,
+ fullColorEvents: PropTypes.bool.isRequired,
icon: PropTypes.object.isRequired,
kind: PropTypes.string.isRequired,
- darken: PropTypes.bool.isRequired,
tooltip: PropTypes.string.isRequired
};
-LegendIconItem.defaultProps = {
- darken: false
-};
-
export default LegendIconItem;
diff --git a/frontend/src/Components/Icon.css b/frontend/src/Components/Icon.css
index 69ffc40f5..51c09226b 100644
--- a/frontend/src/Components/Icon.css
+++ b/frontend/src/Components/Icon.css
@@ -12,18 +12,10 @@
.info {
color: var(--infoColor);
-
- &:global(.darken) {
- color: color(var(--infoColor) shade(30%));
- }
}
.pink {
color: var(--pink);
-
- &:global(.darken) {
- color: color(var(--pink) shade(30%));
- }
}
.success {
diff --git a/frontend/src/Components/Icon.js b/frontend/src/Components/Icon.js
index 90842b039..d200b8c08 100644
--- a/frontend/src/Components/Icon.js
+++ b/frontend/src/Components/Icon.js
@@ -18,7 +18,6 @@ class Icon extends PureComponent {
kind,
size,
title,
- darken,
isSpinning,
...otherProps
} = this.props;
@@ -27,8 +26,7 @@ class Icon extends PureComponent {