diff --git a/client/src/app-components/articles-list.js b/client/src/app-components/articles-list.js index c6bc1e43..ce1ebd56 100644 --- a/client/src/app-components/articles-list.js +++ b/client/src/app-components/articles-list.js @@ -42,7 +42,7 @@ class ArticlesList extends React.Component { return {i18n('ERROR_RETRIEVING_ARTICLES')}; } - return loading ? : this.renderContent(); + return loading ? : this.renderContent(); } renderContent() { diff --git a/client/src/app-components/articles-list.scss b/client/src/app-components/articles-list.scss index fbf01b92..403c74a1 100644 --- a/client/src/app-components/articles-list.scss +++ b/client/src/app-components/articles-list.scss @@ -5,6 +5,11 @@ position: relative; } + &__loading { + min-width: 300px; + min-height: 300px; + } + &__add-topic-button { display: flex; flex-direction: row; diff --git a/client/src/app/admin/panel/staff/admin-panel-staff-members.js b/client/src/app/admin/panel/staff/admin-panel-staff-members.js index 1631f3af..5b0f14cb 100644 --- a/client/src/app/admin/panel/staff/admin-panel-staff-members.js +++ b/client/src/app/admin/panel/staff/admin-panel-staff-members.js @@ -50,7 +50,7 @@ class AdminPanelStaffMembers extends React.Component { {i18n('INVITE_STAFF')} - {(this.props.loading) ? : this.setState({page: index+1})} />} + {(this.props.loading) ? : this.setState({page: index+1})} />} ); } diff --git a/client/src/app/admin/panel/staff/admin-panel-staff-members.scss b/client/src/app/admin/panel/staff/admin-panel-staff-members.scss index c1885429..c537a078 100644 --- a/client/src/app/admin/panel/staff/admin-panel-staff-members.scss +++ b/client/src/app/admin/panel/staff/admin-panel-staff-members.scss @@ -27,6 +27,11 @@ margin-left: 5px; } + &__loading { + min-width: 300px; + min-height: 300px; + } + @media screen and (max-width: 415px) { .admin-panel-staff-members { &__drowpdown { diff --git a/client/src/app/admin/panel/staff/staff-editor.js b/client/src/app/admin/panel/staff/staff-editor.js index 8337dfa9..60d27eb9 100644 --- a/client/src/app/admin/panel/staff/staff-editor.js +++ b/client/src/app/admin/panel/staff/staff-editor.js @@ -317,7 +317,7 @@ class StaffEditor extends React.Component {
{ loadingStats ? -
: + : statsUtils.renderStatistics({showStatCards: true, showStatsByHours: true, ticketData}) }