diff --git a/build/main.css b/build/main.css index c4d0fb4..3269b9d 100644 --- a/build/main.css +++ b/build/main.css @@ -1,6 +1,5 @@ * { box-sizing: border-box; - font-family: 'Monaco', 'Menlo', 'Ubuntu Mono', 'Consolas', 'source-code-pro', monospace; font-size: 12px; } diff --git a/src/mercury/components/app.jsx b/src/mercury/components/app.jsx index 203e3a3..33f9a1f 100644 --- a/src/mercury/components/app.jsx +++ b/src/mercury/components/app.jsx @@ -10,18 +10,19 @@ import type { StoreState, Dispatch, Workspace as WorkspaceType } from 'types'; type Props = {| +currentWorkspace: WorkspaceType, +background: string, + +font: string, +title: string |}; const App = (props: Props) => { document.title = props.title; - return (
@@ -36,9 +37,14 @@ const mapStateToProps = (state: StoreState): Props => { bg = 'url("' + bg + '") 0% 0% / cover'; } + let font = state.wsh.env.font; + if (!font) { + font = "'Monaco', 'Menlo', 'Ubuntu Mono', 'Consolas', 'source-code-pro', monospace"; + } return { currentWorkspace: state.workspaces[state.selectedWorkspace], background: bg, + font: font, title: state.wsh.env.title || Constants.NAME + ' ' + Constants.VERSION }; };