diff --git a/projects/mercury/public/public/images/icon_white.png b/projects/mercury/public/public/images/icon_white.png new file mode 100644 index 000000000..6291bdf6a Binary files /dev/null and b/projects/mercury/public/public/images/icon_white.png differ diff --git a/projects/mercury/public/public/images/logo_white.png b/projects/mercury/public/public/images/logo_white.png index 6291bdf6a..298c8e1a0 100644 Binary files a/projects/mercury/public/public/images/logo_white.png and b/projects/mercury/public/public/images/logo_white.png differ diff --git a/projects/mercury/src/App.theme.js b/projects/mercury/src/App.theme.js index c4280d50a..4d2fbbeef 100644 --- a/projects/mercury/src/App.theme.js +++ b/projects/mercury/src/App.theme.js @@ -1,10 +1,33 @@ import {createTheme} from '@mui/material'; -import {blue, indigo, pink} from '@mui/material/colors'; +import {pink} from '@mui/material/colors'; -export default createTheme({ +export const COLORS = { + fsBlueLight: 'rgba(106,134,232,1)', + fsBlueLightTransp25: 'rgba(106,134,232,0.25)', + fsBlueMedium: 'rgba(63,102,177,1)', + fsBlueDark: 'rgba(7, 59, 82, 1)' +}; + +const globalTheme = createTheme({ palette: { - primary: process.env.NODE_ENV === 'development' ? blue : indigo, - secondary: pink + primary: { + main: COLORS.fsBlueMedium, + light: COLORS.fsBlueLight, + dark: COLORS.fsBlueDark + }, + secondary: pink, + background: { + default: '#d9d9d9' + } + } +}); + +export default createTheme({ + ...globalTheme, + typography: { + button: { + textTransform: 'none' + } }, components: { MuiMenu: { @@ -88,6 +111,18 @@ export default createTheme({ } } }, + MuiButton: { + styleOverrides: { + root: { + background: globalTheme.palette.primary.dark, + borderRadius: 15, + borderColor: globalTheme.palette.primary.light, + paddingBottom: 0, + paddingTop: 0, + minHeight: 35 + } + } + }, MuiCardHeader: { styleOverrides: { root: { @@ -117,6 +152,23 @@ export default createTheme({ } } } + }, + MuiPaper: { + styleOverrides: { + root: { + backgroundColor: globalTheme.palette.background.default, + // borderRadius: 15, + border: '1px solid', + borderColor: globalTheme.palette.primary.dark + } + } + }, + MuiBox: { + styleOverrides: { + root: { + borderRadius: 15 + } + } } } }); diff --git a/projects/mercury/src/layout/Layout.js b/projects/mercury/src/layout/Layout.js index cc53be7e8..5d4807065 100644 --- a/projects/mercury/src/layout/Layout.js +++ b/projects/mercury/src/layout/Layout.js @@ -3,11 +3,8 @@ import PropTypes from 'prop-types'; import withStyles from '@mui/styles/withStyles'; import Link from '@mui/material/Link'; import styles from './Layout.styles'; -import Footer from './Footer'; -import TopBar from './TopBar'; import MenuDrawer from './MenuDrawer'; import LoadingInlay from '../common/components/LoadingInlay'; -import versionInfo from '../common/VersionInfo'; import UserContext from '../users/UserContext'; import StatusContext, {VALID_USER_SESSION} from '../status/StatusContext'; import {SERVER_STATUS_UP} from '../status/StatusAPI'; @@ -16,12 +13,7 @@ import StatusAlert from '../status/StatusAlert'; const LOCAL_STORAGE_MENU_KEY = 'FAIRSPACE_MENU_EXPANDED'; const LEFT_MENU_EXPANSION_DELAY = 500; -const Layout = ({ - classes, - renderMenu, - renderMain = () => {}, - renderTopbar = () => -}) => { +const Layout = ({classes, renderMenu, renderMain = () => {}}) => { const [menuExpanded, setMenuExpanded] = useState(window.localStorage.getItem(LOCAL_STORAGE_MENU_KEY) !== 'false'); const [menuOpenDueToHover, setMenuOpenDueToHover] = useState(false); const [timeoutId, setTimeoutId] = useState(); @@ -88,7 +80,6 @@ const Layout = ({ return ( // The app itself consists of a topbar, a drawer and the actual page <> - {renderTopbar()} {renderAlert()} {renderMenu && ( )} -
+
{renderMain()}
-