aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/features/workspaces/components/WorkspacesDashboard.js10
-rw-r--r--src/features/workspaces/styles/workspaces-table.scss53
-rw-r--r--src/styles/main.scss3
3 files changed, 8 insertions, 58 deletions
diff --git a/src/features/workspaces/components/WorkspacesDashboard.js b/src/features/workspaces/components/WorkspacesDashboard.js
index a8b3b376c..dd4381a15 100644
--- a/src/features/workspaces/components/WorkspacesDashboard.js
+++ b/src/features/workspaces/components/WorkspacesDashboard.js
@@ -48,7 +48,13 @@ const messages = defineMessages({
48 }, 48 },
49}); 49});
50 50
51const styles = (theme) => ({ 51const styles = theme => ({
52 table: {
53 width: '100%',
54 '& td': {
55 padding: '10px',
56 },
57 },
52 createForm: { 58 createForm: {
53 height: 'auto', 59 height: 'auto',
54 }, 60 },
@@ -164,7 +170,7 @@ class WorkspacesDashboard extends Component {
164 {intl.formatMessage(messages.workspacesRequestFailed)} 170 {intl.formatMessage(messages.workspacesRequestFailed)}
165 </Infobox> 171 </Infobox>
166 ) : ( 172 ) : (
167 <table className="workspace-table"> 173 <table className={classes.table}>
168 {/* ===== Workspaces list ===== */} 174 {/* ===== Workspaces list ===== */}
169 <tbody> 175 <tbody>
170 {workspaces.map(workspace => ( 176 {workspaces.map(workspace => (
diff --git a/src/features/workspaces/styles/workspaces-table.scss b/src/features/workspaces/styles/workspaces-table.scss
deleted file mode 100644
index 6d0e7b4f5..000000000
--- a/src/features/workspaces/styles/workspaces-table.scss
+++ /dev/null
@@ -1,53 +0,0 @@
1@import '../../../styles/config';
2
3.theme__dark .workspace-table {
4 .workspace-table__column-info .mdi { color: $dark-theme-gray-lightest; }
5
6 .workspace-table__row {
7 border-bottom: 1px solid $dark-theme-gray-darker;
8
9 &:hover { background: $dark-theme-gray-darker; }
10 &.workspace-table__row--disabled { color: $dark-theme-gray; }
11 }
12}
13
14.workspace-table {
15 width: 100%;
16
17 .workspace-table__toggle {
18 width: 60px;
19
20 .franz-form__field {
21 margin-bottom: 0;
22 }
23 }
24
25 .workspace-table__column-action {
26 width: 40px
27 }
28
29 .workspace-table__column-info {
30 width: 40px;
31
32 .mdi {
33 color: $theme-gray-light;
34 display: block;
35 font-size: 18px;
36 }
37 }
38
39 .workspace-table__row {
40 border-bottom: 1px solid $theme-gray-lightest;
41
42 &:hover {
43 cursor: initial;
44 background: $theme-gray-lightest;
45 }
46
47 &.workspace-table__row--disabled {
48 color: $theme-gray-light;
49 }
50 }
51
52 td { padding: 10px; }
53}
diff --git a/src/styles/main.scss b/src/styles/main.scss
index 9ba7f5827..784a04d3d 100644
--- a/src/styles/main.scss
+++ b/src/styles/main.scss
@@ -31,9 +31,6 @@ $mdi-font-path: '../node_modules/mdi/fonts';
31@import './invite.scss'; 31@import './invite.scss';
32@import './title-bar.scss'; 32@import './title-bar.scss';
33 33
34// Workspaces legacy css
35@import '../features/workspaces/styles/workspaces-table';
36
37// form 34// form
38@import './input.scss'; 35@import './input.scss';
39@import './radio.scss'; 36@import './radio.scss';