Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ui] Introduce Roboto #21164

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ const ConfigJSON = styled.pre`
color: ${Colors.tooltipText()};
whitespace: pre-wrap;
font-family: ${FontFamily.monospace};
font-size: 14px;
font-size: 12px;
padding: 8px;
margin: 0;
`;
Expand Down Expand Up @@ -344,7 +344,7 @@ const TypeSchemaContainer = styled.code`
color: ${Colors.textLighter()};
display: block;
white-space: pre-wrap;
font-size: 14px;
font-size: 12px;
line-height: 18px;
`;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export const DagsterCodeMirrorStyle = createGlobalStyle`
color: ${Colors.textDefault()};

font-family: ${FontFamily.monospace};
font-size: 16px;
font-size: 14px;

/* Note: Theme overrides */
&.cm-s-default .cm-comment {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,10 @@ export const Code = styled(Text)`

export const Mono = styled(Text)`
font-family: ${FontFamily.monospace};
font-size: 16px;
font-size: 14px;
`;

export const CaptionMono = styled(Text)`
font-family: ${FontFamily.monospace};
font-size: 14px;
font-size: 12px;
`;
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
export const FontFamily = {
default:
'Inter,-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Oxygen,Ubuntu,Cantarell,Open Sans,Helvetica Neue,Icons16,sans-serif',
'Roboto,Inter,-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Oxygen,Ubuntu,Cantarell,Open Sans,Helvetica Neue,Icons16,sans-serif',
monospace:
'Inconsolata,SF Mono,SFMono-Regular,ui-monospace,Source Code Pro,Menlo,Monaco,Cascadia Mono,Segoe UI Mono,Roboto Mono,Oxygen Mono,Ubuntu Monospace,Fira Mono,Droid Sans Mono,Courier New,monospace',
'Roboto Mono,Inconsolata,SF Mono,SFMono-Regular,ui-monospace,Source Code Pro,Menlo,Monaco,Cascadia Mono,Segoe UI Mono,Roboto Mono,Oxygen Mono,Ubuntu Monospace,Fira Mono,Droid Sans Mono,Courier New,monospace',
};

Large diffs are not rendered by default.

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions js_modules/dagster-ui/packages/ui-components/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -67,3 +67,5 @@ export * as Colors from './palettes/Color';
// your app tree root. E.g. <GlobalInconsolata />
export * from './fonts/GlobalInconsolata';
export * from './fonts/GlobalInter';
export * from './fonts/GlobalRoboto';
export * from './fonts/GlobalRobotoMono';
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ import {
GlobalInconsolata,
GlobalInter,
GlobalPopoverStyle,
GlobalRoboto,
GlobalRobotoMono,
GlobalSuggestStyle,
GlobalToasterStyle,
GlobalTooltipStyle,
Expand Down Expand Up @@ -207,6 +209,8 @@ export const AppProvider = (props: AppProviderProps) => {
<WebSocketProvider websocketClient={websocketClient}>
<GlobalInter />
<GlobalInconsolata />
<GlobalRoboto />
<GlobalRobotoMono />
<GlobalStyle />
<GlobalToasterStyle />
<GlobalTooltipStyle />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ export const RunRoot = () => {
>
<PageHeader
title={
<Heading style={{fontFamily: FontFamily.monospace, fontSize: '20px'}}>
<Heading style={{fontFamily: FontFamily.monospace, fontSize: '18px'}}>
{runId.slice(0, 8)}
</Heading>
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {Box, Colors, FontFamily, Mono, Popover} from '@dagster-io/ui-components';
import {Box, CaptionMono, Colors, FontFamily, Popover} from '@dagster-io/ui-components';
import {Link} from 'react-router-dom';
import styled from 'styled-components';

Expand Down Expand Up @@ -77,10 +77,10 @@ export const RunStatusOverlay = ({name, run}: OverlayProps) => {
<Box flex={{alignItems: 'center', direction: 'row', gap: 8}}>
<RunStatusIndicator status={run.status} />
<Link to={`/runs/${run.id}`}>
<Mono style={{fontSize: '14px'}}>{titleForRun(run)}</Mono>
<CaptionMono>{titleForRun(run)}</CaptionMono>
</Link>
</Box>
<Box flex={{direction: 'column', gap: 4}} padding={{top: 2}}>
<Box flex={{direction: 'column', gap: 4}}>
<RunTime run={run} />
<RunStateSummary run={run} />
</Box>
Expand Down Expand Up @@ -115,7 +115,6 @@ const OverlayTitle = styled.div`

const RunRow = styled.div`
padding: 8px;
font-size: 12px;
display: flex;
align-items: flex-start;
justify-content: space-between;
Expand Down