diff --git a/packages/console-app/config-kube.yml b/packages/console-app/config-kube.yml index 7df27e1..82d2bf7 100644 --- a/packages/console-app/config-kube.yml +++ b/packages/console-app/config-kube.yml @@ -4,7 +4,7 @@ # app: - title: 'Kubnet Console' + title: 'Kubenet Console' org': 'DXOS.org' theme: 'dark' website: 'https://dxos.org' diff --git a/packages/console-app/config-local.yml b/packages/console-app/config-local.yml index b65c0f5..a7262d3 100644 --- a/packages/console-app/config-local.yml +++ b/packages/console-app/config-local.yml @@ -4,7 +4,7 @@ # app: - title: 'Kubnet Console' + title: 'Kubenet Console' org': 'DXOS.org' theme: 'dark' website: 'https://dxos.org' diff --git a/packages/console-app/src/components/AppBar.js b/packages/console-app/src/components/AppBar.js index 7a0f337..5721065 100644 --- a/packages/console-app/src/components/AppBar.js +++ b/packages/console-app/src/components/AppBar.js @@ -11,27 +11,31 @@ import Typography from '@material-ui/core/Typography'; import blueGrey from '@material-ui/core/colors/blueGrey'; import GraphQLIcon from '@material-ui/icons/Adb'; -import DxOSIcon from '../icons/DXOS'; +import DXOSIcon from '../icons/DXOS'; import { graphqlApi } from '../client'; const useStyles = makeStyles((theme) => ({ offset: theme.mixins.denseToolbar, logo: { - paddingBottom: 2, - marginTop: 4, marginRight: theme.spacing(2), - color: '#333', + color: theme.palette.grey[800], '& svg': { - width: 64, - height: 32 + width: 100, + height: 48 } }, + logoLink: { + lineHeight: 0 + }, + title: { display: 'flex', - flex: 1 + flex: 1, + marginTop: 2, + color: theme.palette.grey[800] }, link: { @@ -46,9 +50,9 @@ const AppBar = ({ config }) => { <> - +
- +
diff --git a/packages/console-app/src/containers/Layout.js b/packages/console-app/src/containers/Layout.js index 2e224a2..63093ff 100644 --- a/packages/console-app/src/containers/Layout.js +++ b/packages/console-app/src/containers/Layout.js @@ -55,6 +55,7 @@ const Layout = ({ children }) => {
+
@@ -63,6 +64,7 @@ const Layout = ({ children }) => { {children}
+
diff --git a/packages/console-app/src/icons/DXOS.js b/packages/console-app/src/icons/DXOS.js index 953dc2d..b5a3449 100644 --- a/packages/console-app/src/icons/DXOS.js +++ b/packages/console-app/src/icons/DXOS.js @@ -6,34 +6,9 @@ import React from 'react'; import SvgIcon from '@material-ui/core/SvgIcon'; const Icon = (props) => ( - - - - - - - - - - - - - - - - - - + + + ); diff --git a/packages/console-app/src/theme.js b/packages/console-app/src/theme.js index feca9a0..a485371 100644 --- a/packages/console-app/src/theme.js +++ b/packages/console-app/src/theme.js @@ -14,7 +14,7 @@ export const createTheme = (theme) => createMuiTheme({ // https://stackoverflow.com/questions/60567673/reactjs-material-ui-theme-mixins-toolbar-offset-is-not-adapting-when-toolbar mixins: { denseToolbar: { - minHeight: 48 + height: 48 } }, diff --git a/packages/console-app/src/version.json b/packages/console-app/src/version.json index 10087f1..f210d67 100644 --- a/packages/console-app/src/version.json +++ b/packages/console-app/src/version.json @@ -1,7 +1,7 @@ { "build": { "name": "@dxos/console-app", - "buildDate": "2020-07-20T20:15:46.769Z", + "buildDate": "2020-07-20T20:24:59.591Z", "version": "1.0.0-beta.17" } }