From e578f901b2c01cf463b4420a03f8334c32154c79 Mon Sep 17 00:00:00 2001 From: Riley Davis Date: Tue, 7 Mar 2017 13:38:01 -0700 Subject: [PATCH] fix some firefox display things --- .../coral-admin/src/containers/Configure/StreamSettings.js | 1 + client/coral-admin/src/containers/Dashboard/FlagWidget.js | 3 ++- client/coral-admin/src/containers/Dashboard/LikeWidget.js | 5 +++-- client/coral-admin/src/containers/Dashboard/Widget.css | 4 ++++ client/coral-admin/src/containers/Streams/Streams.js | 2 +- 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/client/coral-admin/src/containers/Configure/StreamSettings.js b/client/coral-admin/src/containers/Configure/StreamSettings.js index 5530bc6cd..f77013bc0 100644 --- a/client/coral-admin/src/containers/Configure/StreamSettings.js +++ b/client/coral-admin/src/containers/Configure/StreamSettings.js @@ -171,6 +171,7 @@ const StreamSettings = ({updateSettings, settingsError, settings, errors}) => { + {/* the above card should be the last one if at all possible because of z-index issues with the selects */} ); }; diff --git a/client/coral-admin/src/containers/Dashboard/FlagWidget.js b/client/coral-admin/src/containers/Dashboard/FlagWidget.js index da71ac04a..5ce93f11b 100644 --- a/client/coral-admin/src/containers/Dashboard/FlagWidget.js +++ b/client/coral-admin/src/containers/Dashboard/FlagWidget.js @@ -3,6 +3,7 @@ import {Link} from 'react-router'; import styles from './Widget.css'; import I18n from 'coral-framework/modules/i18n/i18n'; import translations from 'coral-admin/src/translations'; +import range from 'lodash/range'; const lang = new I18n(translations); @@ -44,7 +45,7 @@ const FlagWidget = (props) => { } { /* rows in a table with a fixed height will expand and ignore height. this extra row will expand to fill the extra space. */ - assets.length < 10 ? : null + range(10 - Math.max(assets.length, 1)).map(() => ) } diff --git a/client/coral-admin/src/containers/Dashboard/LikeWidget.js b/client/coral-admin/src/containers/Dashboard/LikeWidget.js index 25e851966..39ee708f8 100644 --- a/client/coral-admin/src/containers/Dashboard/LikeWidget.js +++ b/client/coral-admin/src/containers/Dashboard/LikeWidget.js @@ -3,6 +3,7 @@ import {Link} from 'react-router'; import styles from './Widget.css'; import I18n from 'coral-framework/modules/i18n/i18n'; import translations from 'coral-admin/src/translations'; +import range from 'lodash/range'; const lang = new I18n(translations); @@ -44,8 +45,8 @@ const LikeWidget = (props) => { : {lang.t('dashboard.no_likes')} } { /* rows in a table with a fixed height will expand and ignore height. - this extra row will expand to fill the extra space. */ - assets.length < 10 ? : null + put in some extra rows. */ + range(10 - Math.max(assets.length, 1)).map(() => ) } diff --git a/client/coral-admin/src/containers/Dashboard/Widget.css b/client/coral-admin/src/containers/Dashboard/Widget.css index cb764d9cc..96c773bef 100644 --- a/client/coral-admin/src/containers/Dashboard/Widget.css +++ b/client/coral-admin/src/containers/Dashboard/Widget.css @@ -43,6 +43,10 @@ height: var(--row-height); } +.emptyRow { + height: var(--row-height); +} + .rowLinkify:last-child { border-bottom: none; } diff --git a/client/coral-admin/src/containers/Streams/Streams.js b/client/coral-admin/src/containers/Streams/Streams.js index 96130fcba..bd5ce6e85 100644 --- a/client/coral-admin/src/containers/Streams/Streams.js +++ b/client/coral-admin/src/containers/Streams/Streams.js @@ -80,8 +80,8 @@ class Streams extends Component {
- {closed ? lang.t('streams.closed') : lang.t('streams.open')} {!statusMenuOpen && } + {closed ? lang.t('streams.closed') : lang.t('streams.open')}
{ statusMenuOpen &&