aboutsummaryrefslogtreecommitdiffstats
path: root/src/features/workspaces
diff options
context:
space:
mode:
authorLibravatar Stefan Malzner <stefan@adlk.io>2019-09-04 11:51:28 +0200
committerLibravatar Stefan Malzner <stefan@adlk.io>2019-09-04 11:51:28 +0200
commit71544483caadbdd240f423e7660c242ef458a1d2 (patch)
tree4d0d6dc345fe3c19eb2b0f2fc340d29818e098de /src/features/workspaces
parentUpdate en-US.json (diff)
downloadferdium-app-71544483caadbdd240f423e7660c242ef458a1d2.tar.gz
ferdium-app-71544483caadbdd240f423e7660c242ef458a1d2.tar.zst
ferdium-app-71544483caadbdd240f423e7660c242ef458a1d2.zip
Add pre-launch notice
Diffstat (limited to 'src/features/workspaces')
-rw-r--r--src/features/workspaces/components/WorkspaceDrawer.js7
-rw-r--r--src/features/workspaces/components/WorkspaceSwitchingIndicator.js8
2 files changed, 6 insertions, 9 deletions
diff --git a/src/features/workspaces/components/WorkspaceDrawer.js b/src/features/workspaces/components/WorkspaceDrawer.js
index 684e50dd0..e7bc0b157 100644
--- a/src/features/workspaces/components/WorkspaceDrawer.js
+++ b/src/features/workspaces/components/WorkspaceDrawer.js
@@ -7,6 +7,7 @@ import { H1, Icon, ProBadge } from '@meetfranz/ui';
7import { Button } from '@meetfranz/forms/lib'; 7import { Button } from '@meetfranz/forms/lib';
8import ReactTooltip from 'react-tooltip'; 8import ReactTooltip from 'react-tooltip';
9 9
10import { mdiPlusBox, mdiSettings } from '@mdi/js';
10import WorkspaceDrawerItem from './WorkspaceDrawerItem'; 11import WorkspaceDrawerItem from './WorkspaceDrawerItem';
11import { workspaceActions } from '../actions'; 12import { workspaceActions } from '../actions';
12import { GA_CATEGORY_WORKSPACES, workspaceStore } from '../index'; 13import { GA_CATEGORY_WORKSPACES, workspaceStore } from '../index';
@@ -159,7 +160,7 @@ class WorkspaceDrawer extends Component {
159 data-tip={`${intl.formatMessage(messages.workspacesSettingsTooltip)}`} 160 data-tip={`${intl.formatMessage(messages.workspacesSettingsTooltip)}`}
160 > 161 >
161 <Icon 162 <Icon
162 icon="mdiSettings" 163 icon={mdiSettings}
163 size={1.5} 164 size={1.5}
164 className={classes.workspacesSettingsButtonIcon} 165 className={classes.workspacesSettingsButtonIcon}
165 /> 166 />
@@ -184,7 +185,7 @@ class WorkspaceDrawer extends Component {
184 className={classes.premiumCtaButton} 185 className={classes.premiumCtaButton}
185 buttonType="primary" 186 buttonType="primary"
186 label={intl.formatMessage(messages.premiumCtaButtonLabel)} 187 label={intl.formatMessage(messages.premiumCtaButtonLabel)}
187 icon="mdiPlusBox" 188 icon={mdiPlusBox}
188 onClick={() => { 189 onClick={() => {
189 workspaceActions.openWorkspaceSettings(); 190 workspaceActions.openWorkspaceSettings();
190 gaEvent(GA_CATEGORY_WORKSPACES, 'add', 'drawerPremiumCta'); 191 gaEvent(GA_CATEGORY_WORKSPACES, 'add', 'drawerPremiumCta');
@@ -227,7 +228,7 @@ class WorkspaceDrawer extends Component {
227 }} 228 }}
228 > 229 >
229 <Icon 230 <Icon
230 icon="mdiPlusBox" 231 icon={mdiPlusBox}
231 size={1} 232 size={1}
232 className={classes.workspacesSettingsButtonIcon} 233 className={classes.workspacesSettingsButtonIcon}
233 /> 234 />
diff --git a/src/features/workspaces/components/WorkspaceSwitchingIndicator.js b/src/features/workspaces/components/WorkspaceSwitchingIndicator.js
index c4a800a7b..a70d1d66f 100644
--- a/src/features/workspaces/components/WorkspaceSwitchingIndicator.js
+++ b/src/features/workspaces/components/WorkspaceSwitchingIndicator.js
@@ -21,11 +21,8 @@ const styles = theme => ({
21 alignItems: 'flex-start', 21 alignItems: 'flex-start',
22 position: 'absolute', 22 position: 'absolute',
23 transition: 'width 0.5s ease', 23 transition: 'width 0.5s ease',
24 width: '100%',
25 marginTop: '20px',
26 },
27 wrapperWhenDrawerIsOpen: {
28 width: `calc(100% - ${theme.workspaces.drawer.width}px)`, 24 width: `calc(100% - ${theme.workspaces.drawer.width}px)`,
25 marginTop: '20px',
29 }, 26 },
30 component: { 27 component: {
31 background: 'rgba(20, 20, 20, 0.4)', 28 background: 'rgba(20, 20, 20, 0.4)',
@@ -64,14 +61,13 @@ class WorkspaceSwitchingIndicator extends Component {
64 render() { 61 render() {
65 const { classes, theme } = this.props; 62 const { classes, theme } = this.props;
66 const { intl } = this.context; 63 const { intl } = this.context;
67 const { isSwitchingWorkspace, isWorkspaceDrawerOpen, nextWorkspace } = workspaceStore; 64 const { isSwitchingWorkspace, nextWorkspace } = workspaceStore;
68 if (!isSwitchingWorkspace) return null; 65 if (!isSwitchingWorkspace) return null;
69 const nextWorkspaceName = nextWorkspace ? nextWorkspace.name : 'All services'; 66 const nextWorkspaceName = nextWorkspace ? nextWorkspace.name : 'All services';
70 return ( 67 return (
71 <div 68 <div
72 className={classnames([ 69 className={classnames([
73 classes.wrapper, 70 classes.wrapper,
74 isWorkspaceDrawerOpen ? classes.wrapperWhenDrawerIsOpen : null,
75 ])} 71 ])}
76 > 72 >
77 <div className={classes.component}> 73 <div className={classes.component}>