aboutsummaryrefslogtreecommitdiffstats
path: root/src/features/workspaces/components
diff options
context:
space:
mode:
Diffstat (limited to 'src/features/workspaces/components')
-rw-r--r--src/features/workspaces/components/WorkspaceSwitchingIndicator.tsx18
-rw-r--r--src/features/workspaces/components/WorkspacesDashboard.tsx2
2 files changed, 7 insertions, 13 deletions
diff --git a/src/features/workspaces/components/WorkspaceSwitchingIndicator.tsx b/src/features/workspaces/components/WorkspaceSwitchingIndicator.tsx
index e1cc0f785..0fce811e5 100644
--- a/src/features/workspaces/components/WorkspaceSwitchingIndicator.tsx
+++ b/src/features/workspaces/components/WorkspaceSwitchingIndicator.tsx
@@ -3,9 +3,8 @@ import { observer } from 'mobx-react';
3import withStyles, { WithStylesProps } from 'react-jss'; 3import withStyles, { WithStylesProps } from 'react-jss';
4import classnames from 'classnames'; 4import classnames from 'classnames';
5import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl'; 5import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl';
6import Loader from '../../../components/ui/loader/index'; 6import Loader from '../../../components/ui/loader';
7import { workspaceStore } from '../index'; 7import { workspaceStore } from '../index';
8import { Theme } from '../../../themes';
9 8
10const messages = defineMessages({ 9const messages = defineMessages({
11 switchingTo: { 10 switchingTo: {
@@ -41,8 +40,6 @@ const styles = theme => ({
41 zIndex: 200, 40 zIndex: 200,
42 }, 41 },
43 spinner: { 42 spinner: {
44 width: 40,
45 height: 40,
46 marginRight: 10, 43 marginRight: 10,
47 }, 44 },
48 message: { 45 message: {
@@ -52,14 +49,14 @@ const styles = theme => ({
52 }, 49 },
53}); 50});
54 51
55interface IProps extends WithStylesProps<typeof styles>, WrappedComponentProps { 52interface IProps
56 theme?: Theme; 53 extends WithStylesProps<typeof styles>,
57} 54 WrappedComponentProps {}
58 55
59@observer 56@observer
60class WorkspaceSwitchingIndicator extends Component<IProps> { 57class WorkspaceSwitchingIndicator extends Component<IProps> {
61 render(): ReactElement | null { 58 render(): ReactElement | null {
62 const { classes, intl, theme } = this.props; 59 const { classes, intl } = this.props;
63 const { isSwitchingWorkspace, nextWorkspace } = workspaceStore; 60 const { isSwitchingWorkspace, nextWorkspace } = workspaceStore;
64 61
65 if (!isSwitchingWorkspace) { 62 if (!isSwitchingWorkspace) {
@@ -73,10 +70,7 @@ class WorkspaceSwitchingIndicator extends Component<IProps> {
73 return ( 70 return (
74 <div className={classnames([classes.wrapper])}> 71 <div className={classnames([classes.wrapper])}>
75 <div className={classes.component}> 72 <div className={classes.component}>
76 <Loader 73 <Loader className={classes.spinner} color="#FFFFFF" />
77 className={classes.spinner}
78 color={theme?.workspaces.switchingIndicator.spinnerColor}
79 />
80 <p className={classes.message}> 74 <p className={classes.message}>
81 {`${intl.formatMessage(messages.switchingTo)} ${nextWorkspaceName}`} 75 {`${intl.formatMessage(messages.switchingTo)} ${nextWorkspaceName}`}
82 </p> 76 </p>
diff --git a/src/features/workspaces/components/WorkspacesDashboard.tsx b/src/features/workspaces/components/WorkspacesDashboard.tsx
index ba06730a0..0a417bffd 100644
--- a/src/features/workspaces/components/WorkspacesDashboard.tsx
+++ b/src/features/workspaces/components/WorkspacesDashboard.tsx
@@ -3,7 +3,7 @@ import { observer } from 'mobx-react';
3import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl'; 3import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl';
4import withStyles, { WithStylesProps } from 'react-jss'; 4import withStyles, { WithStylesProps } from 'react-jss';
5import Infobox from '../../../components/ui/infobox/index'; 5import Infobox from '../../../components/ui/infobox/index';
6import Loader from '../../../components/ui/Loader'; 6import Loader from '../../../components/ui/loader';
7import WorkspaceItem from './WorkspaceItem'; 7import WorkspaceItem from './WorkspaceItem';
8import CreateWorkspaceForm from './CreateWorkspaceForm'; 8import CreateWorkspaceForm from './CreateWorkspaceForm';
9import Request from '../../../stores/lib/Request'; 9import Request from '../../../stores/lib/Request';