diff options
author | 2019-10-24 15:15:42 +0200 | |
---|---|---|
committer | 2019-10-24 15:15:42 +0200 | |
commit | 54f8b191a94bd78a85b046bbf21dd2245d3a6f3e (patch) | |
tree | ada5876f0e8a697ba4693bba07f5e0f31fea1fc9 /src/features/workspaces/components | |
parent | Update submodules (diff) | |
parent | bump version to 5.4.0 (diff) | |
download | ferdium-app-54f8b191a94bd78a85b046bbf21dd2245d3a6f3e.tar.gz ferdium-app-54f8b191a94bd78a85b046bbf21dd2245d3a6f3e.tar.zst ferdium-app-54f8b191a94bd78a85b046bbf21dd2245d3a6f3e.zip |
Merge https://github.com/meetfranz/franz into franz-5.4.0-release
Diffstat (limited to 'src/features/workspaces/components')
-rw-r--r-- | src/features/workspaces/components/WorkspaceDrawer.js | 9 | ||||
-rw-r--r-- | src/features/workspaces/components/WorkspacesDashboard.js | 5 |
2 files changed, 9 insertions, 5 deletions
diff --git a/src/features/workspaces/components/WorkspaceDrawer.js b/src/features/workspaces/components/WorkspaceDrawer.js index e991b9909..baa94f6b3 100644 --- a/src/features/workspaces/components/WorkspaceDrawer.js +++ b/src/features/workspaces/components/WorkspaceDrawer.js | |||
@@ -7,7 +7,7 @@ import { H1, Icon, ProBadge } from '@meetfranz/ui'; | |||
7 | import { Button } from '@meetfranz/forms/lib'; | 7 | import { Button } from '@meetfranz/forms/lib'; |
8 | import ReactTooltip from 'react-tooltip'; | 8 | import ReactTooltip from 'react-tooltip'; |
9 | 9 | ||
10 | import { mdiPlusBox, mdiSettings } from '@mdi/js'; | 10 | import { mdiPlusBox, mdiSettings, mdiStar } from '@mdi/js'; |
11 | import WorkspaceDrawerItem from './WorkspaceDrawerItem'; | 11 | import WorkspaceDrawerItem from './WorkspaceDrawerItem'; |
12 | import { workspaceActions } from '../actions'; | 12 | import { workspaceActions } from '../actions'; |
13 | import { workspaceStore } from '../index'; | 13 | import { workspaceStore } from '../index'; |
@@ -51,6 +51,8 @@ const styles = theme => ({ | |||
51 | drawer: { | 51 | drawer: { |
52 | background: theme.workspaces.drawer.background, | 52 | background: theme.workspaces.drawer.background, |
53 | width: `${theme.workspaces.drawer.width}px`, | 53 | width: `${theme.workspaces.drawer.width}px`, |
54 | display: 'flex', | ||
55 | flexDirection: 'column', | ||
54 | }, | 56 | }, |
55 | headline: { | 57 | headline: { |
56 | fontSize: '24px', | 58 | fontSize: '24px', |
@@ -74,6 +76,7 @@ const styles = theme => ({ | |||
74 | }, | 76 | }, |
75 | workspaces: { | 77 | workspaces: { |
76 | height: 'auto', | 78 | height: 'auto', |
79 | overflowY: 'scroll', | ||
77 | }, | 80 | }, |
78 | premiumAnnouncement: { | 81 | premiumAnnouncement: { |
79 | padding: '20px', | 82 | padding: '20px', |
@@ -88,7 +91,7 @@ const styles = theme => ({ | |||
88 | addNewWorkspaceLabel: { | 91 | addNewWorkspaceLabel: { |
89 | height: 'auto', | 92 | height: 'auto', |
90 | color: theme.workspaces.drawer.buttons.color, | 93 | color: theme.workspaces.drawer.buttons.color, |
91 | marginTop: 40, | 94 | margin: [40, 0], |
92 | textAlign: 'center', | 95 | textAlign: 'center', |
93 | '& > svg': { | 96 | '& > svg': { |
94 | fill: theme.workspaces.drawer.buttons.color, | 97 | fill: theme.workspaces.drawer.buttons.color, |
@@ -172,7 +175,7 @@ class WorkspaceDrawer extends Component { | |||
172 | className={classes.premiumCtaButton} | 175 | className={classes.premiumCtaButton} |
173 | buttonType="primary" | 176 | buttonType="primary" |
174 | label={intl.formatMessage(messages.reactivatePremiumAccount)} | 177 | label={intl.formatMessage(messages.reactivatePremiumAccount)} |
175 | icon="mdiStar" | 178 | icon={mdiStar} |
176 | onClick={() => { | 179 | onClick={() => { |
177 | onUpgradeAccountClick(); | 180 | onUpgradeAccountClick(); |
178 | }} | 181 | }} |
diff --git a/src/features/workspaces/components/WorkspacesDashboard.js b/src/features/workspaces/components/WorkspacesDashboard.js index 977b23999..b499e02a4 100644 --- a/src/features/workspaces/components/WorkspacesDashboard.js +++ b/src/features/workspaces/components/WorkspacesDashboard.js | |||
@@ -5,6 +5,7 @@ import { defineMessages, intlShape } from 'react-intl'; | |||
5 | import injectSheet from 'react-jss'; | 5 | import injectSheet from 'react-jss'; |
6 | import { Infobox, Badge } from '@meetfranz/ui'; | 6 | import { Infobox, Badge } from '@meetfranz/ui'; |
7 | 7 | ||
8 | import { mdiCheckboxMarkedCircleOutline } from '@mdi/js'; | ||
8 | import Loader from '../../../components/ui/Loader'; | 9 | import Loader from '../../../components/ui/Loader'; |
9 | import WorkspaceItem from './WorkspaceItem'; | 10 | import WorkspaceItem from './WorkspaceItem'; |
10 | import CreateWorkspaceForm from './CreateWorkspaceForm'; | 11 | import CreateWorkspaceForm from './CreateWorkspaceForm'; |
@@ -128,7 +129,7 @@ class WorkspacesDashboard extends Component { | |||
128 | <Appear className={classes.appear}> | 129 | <Appear className={classes.appear}> |
129 | <Infobox | 130 | <Infobox |
130 | type="success" | 131 | type="success" |
131 | icon="mdiCheckboxMarkedCircleOutline" | 132 | icon={mdiCheckboxMarkedCircleOutline} |
132 | dismissable | 133 | dismissable |
133 | onUnmount={updateWorkspaceRequest.reset} | 134 | onUnmount={updateWorkspaceRequest.reset} |
134 | > | 135 | > |
@@ -142,7 +143,7 @@ class WorkspacesDashboard extends Component { | |||
142 | <Appear className={classes.appear}> | 143 | <Appear className={classes.appear}> |
143 | <Infobox | 144 | <Infobox |
144 | type="success" | 145 | type="success" |
145 | icon="mdiCheckboxMarkedCircleOutline" | 146 | icon={mdiCheckboxMarkedCircleOutline} |
146 | dismissable | 147 | dismissable |
147 | onUnmount={deleteWorkspaceRequest.reset} | 148 | onUnmount={deleteWorkspaceRequest.reset} |
148 | > | 149 | > |