From 4a103b20015e80514437f6213eed2841d2a03e17 Mon Sep 17 00:00:00 2001
From: vkovtun <viktor.kovtun@id.ethz.ch>
Date: Mon, 7 Aug 2023 18:11:11 +0200
Subject: [PATCH] SSDM-13579: Changed button colors.
---
.../src/js/components/common/theme/ThemeProvider.jsx | 3 +++
.../js/components/database/data-browser/LeftToolbar.jsx | 2 +-
.../js/components/database/data-browser/RightToolbar.jsx | 9 ++++-----
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/ui-admin/src/js/components/common/theme/ThemeProvider.jsx b/ui-admin/src/js/components/common/theme/ThemeProvider.jsx
index a0fbd0d1b00..1d29e47f2c9 100644
--- a/ui-admin/src/js/components/common/theme/ThemeProvider.jsx
+++ b/ui-admin/src/js/components/common/theme/ThemeProvider.jsx
@@ -21,6 +21,9 @@ const config = {
secondary: {
main: lightBlue[600]
},
+ default: {
+ main: '#00000089'
+ },
info: {
main: lightBlue[600]
},
diff --git a/ui-admin/src/js/components/database/data-browser/LeftToolbar.jsx b/ui-admin/src/js/components/database/data-browser/LeftToolbar.jsx
index 6799df1ccd1..35f1687147d 100644
--- a/ui-admin/src/js/components/database/data-browser/LeftToolbar.jsx
+++ b/ui-admin/src/js/components/database/data-browser/LeftToolbar.jsx
@@ -36,7 +36,7 @@ import Popover from '@material-ui/core/Popover'
import InputDialog from '@src/js/components/common/dialog/InputDialog.jsx'
import ConfirmationDialog from "@src/js/components/common/dialog/ConfirmationDialog.jsx";
-const color = 'secondary'
+const color = 'default'
const iconButtonSize = 'medium'
const styles = theme => ({
diff --git a/ui-admin/src/js/components/database/data-browser/RightToolbar.jsx b/ui-admin/src/js/components/database/data-browser/RightToolbar.jsx
index 608e270d892..d63463b444b 100644
--- a/ui-admin/src/js/components/database/data-browser/RightToolbar.jsx
+++ b/ui-admin/src/js/components/database/data-browser/RightToolbar.jsx
@@ -35,7 +35,8 @@ import FileIcon from '@material-ui/icons/InsertDriveFileOutlined'
import FolderIcon from '@material-ui/icons/FolderOpen'
import logger from "@src/js/common/logger.js";
-const color = 'secondary'
+const color = 'default'
+const uploadButtonsColor = 'secondary'
const iconButtonSize = 'medium'
const styles = theme => ({
@@ -77,8 +78,6 @@ class RightToolbar extends React.Component {
super(props, context)
autoBind(this)
- const { controller } = this.props
-
this.state = {
uploadButtonsPopup: null
}
@@ -102,7 +101,7 @@ class RightToolbar extends React.Component {
<div className={classes.uploadButtonsContainer}>
<UploadButton
classes={{ root: classes.button }}
- color={color}
+ color={uploadButtonsColor}
size={buttonSize}
variant='contained'
startIcon={<FileIcon />}
@@ -112,7 +111,7 @@ class RightToolbar extends React.Component {
</UploadButton>
<UploadButton
classes={{ root: classes.button }}
- color={color}
+ color={uploadButtonsColor}
size={buttonSize}
variant='contained'
startIcon={<FolderIcon />}
--
GitLab