diff options
Diffstat (limited to 'gui/src')
| -rw-r--r-- | gui/src/renderer/components/ErrorBoundary.tsx | 4 | ||||
| -rw-r--r-- | gui/src/renderer/components/HeaderBar.tsx | 4 | ||||
| -rw-r--r-- | gui/src/renderer/components/Launch.tsx | 4 | ||||
| -rw-r--r-- | gui/src/renderer/components/LoginStyles.tsx | 5 | ||||
| -rw-r--r-- | gui/src/renderer/components/common-styles.ts | 20 |
5 files changed, 22 insertions, 15 deletions
diff --git a/gui/src/renderer/components/ErrorBoundary.tsx b/gui/src/renderer/components/ErrorBoundary.tsx index 82e2910cc0..3403789612 100644 --- a/gui/src/renderer/components/ErrorBoundary.tsx +++ b/gui/src/renderer/components/ErrorBoundary.tsx @@ -4,6 +4,7 @@ import { colors, supportEmail } from '../../config.json'; import { messages } from '../../shared/gettext'; import log from '../../shared/logging'; import PlatformWindowContainer from '../containers/PlatformWindowContainer'; +import { sourceSansPro } from './common-styles'; import ImageView from './ImageView'; import { Container, Layout } from './Layout'; @@ -24,9 +25,8 @@ const StyledContainer = styled(Container)({ }); const Title = styled.h1({ - fontFamily: 'DINPro', + ...sourceSansPro, fontSize: '24px', - fontWeight: 900, lineHeight: '30px', color: colors.white60, marginBottom: '4px', diff --git a/gui/src/renderer/components/HeaderBar.tsx b/gui/src/renderer/components/HeaderBar.tsx index 9f6d4b82a3..f2bfc5616d 100644 --- a/gui/src/renderer/components/HeaderBar.tsx +++ b/gui/src/renderer/components/HeaderBar.tsx @@ -7,6 +7,7 @@ import { messages } from '../../shared/gettext'; import { useHistory } from '../lib/history'; import { IReduxState } from '../redux/store'; import { FocusFallback } from './Focus'; +import { sourceSansPro } from './common-styles'; import ImageView from './ImageView'; export enum HeaderBarStyle { @@ -70,9 +71,8 @@ const BrandContainer = styled.div({ }); const Title = styled.span({ - fontFamily: 'DINPro', + ...sourceSansPro, fontSize: '24px', - fontWeight: 900, lineHeight: '30px', color: colors.white80, marginLeft: '9px', diff --git a/gui/src/renderer/components/Launch.tsx b/gui/src/renderer/components/Launch.tsx index ab75dd5cd3..591a89f82e 100644 --- a/gui/src/renderer/components/Launch.tsx +++ b/gui/src/renderer/components/Launch.tsx @@ -2,6 +2,7 @@ import React from 'react'; import styled from 'styled-components'; import { colors } from '../../config.json'; import { messages } from '../../shared/gettext'; +import { sourceSansPro } from './common-styles'; import { HeaderBarSettingsButton } from './HeaderBar'; import ImageView from './ImageView'; import { Container, Header, Layout } from './Layout'; @@ -15,9 +16,8 @@ const StyledContainer = styled(Container)({ }); const Title = styled.h1({ - fontFamily: 'DINPro', + ...sourceSansPro, fontSize: '24px', - fontWeight: 900, lineHeight: '30px', color: colors.white60, marginBottom: '4px', diff --git a/gui/src/renderer/components/LoginStyles.tsx b/gui/src/renderer/components/LoginStyles.tsx index 3677b60d4e..31fd26154b 100644 --- a/gui/src/renderer/components/LoginStyles.tsx +++ b/gui/src/renderer/components/LoginStyles.tsx @@ -2,7 +2,7 @@ import styled from 'styled-components'; import { colors } from '../../config.json'; import ImageView from './ImageView'; import * as Cell from './cell'; -import { bigText, smallText } from './common-styles'; +import { bigText, smallText, sourceSansPro } from './common-styles'; import FormattableTextInput from './FormattableTextInput'; export const StyledAccountDropdownContainer = styled.ul({ @@ -156,12 +156,11 @@ export const StyledSubtitle = styled.span(smallText, { }); export const StyledInput = styled(FormattableTextInput)({ + ...sourceSansPro, minWidth: 0, borderWidth: 0, padding: '10px 12px 12px', - fontFamily: 'DINPro', fontSize: '20px', - fontWeight: 900, lineHeight: '26px', color: colors.blue, backgroundColor: 'transparent', diff --git a/gui/src/renderer/components/common-styles.ts b/gui/src/renderer/components/common-styles.ts index d08ad4f863..fdc448d45e 100644 --- a/gui/src/renderer/components/common-styles.ts +++ b/gui/src/renderer/components/common-styles.ts @@ -1,7 +1,17 @@ +import React from 'react'; import { colors } from '../../config.json'; -export const smallText = { +export const openSans: React.CSSProperties = { fontFamily: 'Open Sans', +}; + +export const sourceSansPro: React.CSSProperties = { + fontFamily: '"Source Sans Pro", "Noto Sans Myanmar", "Noto Sans Thai"', + fontWeight: 'bold', +}; + +export const smallText = { + ...openSans, fontSize: '13px', fontWeight: 600, lineHeight: '20px', @@ -9,22 +19,20 @@ export const smallText = { }; export const mediumText = { - fontFamily: 'Open Sans', + ...openSans, fontSize: '18px', lineHeight: '24px', }; export const buttonText = { ...mediumText, - fontFamily: 'DINPro', - fontWeight: 900, + ...sourceSansPro, color: colors.white, }; export const bigText = { - fontFamily: 'DINPro', + ...sourceSansPro, fontSize: '30px', - fontWeight: 900, lineHeight: '34px', color: colors.white, }; |
