Merge branch 'switch-to-source-sans-pro-font'

11 files changed, 56 insertions, 24 deletions

diff --git a/gui/assets/css/fonts.css b/gui/assets/css/fonts.css
index d648cd74f5..1f51c1c4c0 100644
--- a/gui/assets/css/fonts.css
+++ b/gui/assets/css/fonts.css
@@ -1,13 +1,37 @@
 @font-face {
-  font-family: DINPro;
+  font-family: 'Source Sans Pro';
   font-weight: bold;
-  src: url('../fonts/DINPro-Bold.otf') format('opentype');
+  src: url('../fonts/SourceSansPro-Black.ttf') format('truetype');
 }
 
 @font-face {
-  font-family: DINPro;
+  font-family: 'Source Sans Pro';
   font-weight: 900;
-  src: url('../fonts/DINPro-Black.otf') format('opentype');
+  src: url('../fonts/SourceSansPro-Black.ttf') format('truetype');
+}
+
+@font-face {
+  font-family: 'Noto Sans Myanmar';
+  font-weight: bold;
+  src: url('../fonts/NotoSansMyanmar-Black.ttf') format('truetype');
+}
+
+@font-face {
+  font-family: 'Noto Sans Myanmar';
+  font-weight: 900;
+  src: url('../fonts/NotoSansMyanmar-Black.ttf') format('truetype');
+}
+
+@font-face {
+  font-family: 'Noto Sans Thai';
+  font-weight: bold;
+  src: url('../fonts/NotoSansThai-Black.ttf') format('truetype');
+}
+
+@font-face {
+  font-family: 'Noto Sans Thai';
+  font-weight: 900;
+  src: url('../fonts/NotoSansThai-Black.ttf') format('truetype');
 }
 
 @font-face {
diff --git a/gui/assets/fonts/DINPro-Black.otf b/gui/assets/fonts/DINPro-Black.otf
deleted file mode 100755
index 2092a7bbdc..0000000000
--- a/gui/assets/fonts/DINPro-Black.otf
+++ /dev/null
diff --git a/gui/assets/fonts/DINPro-Bold.otf b/gui/assets/fonts/DINPro-Bold.otf
deleted file mode 100755
index 7c83953648..0000000000
--- a/gui/assets/fonts/DINPro-Bold.otf
+++ /dev/null
diff --git a/gui/assets/fonts/NotoSansMyanmar-Black.ttf b/gui/assets/fonts/NotoSansMyanmar-Black.ttf
new file mode 100644
index 0000000000..5446ac92cf
--- /dev/null
+++ b/gui/assets/fonts/NotoSansMyanmar-Black.ttf
diff --git a/gui/assets/fonts/NotoSansThai-Black.ttf b/gui/assets/fonts/NotoSansThai-Black.ttf
new file mode 100644
index 0000000000..5dd9265f76
--- /dev/null
+++ b/gui/assets/fonts/NotoSansThai-Black.ttf
diff --git a/gui/assets/fonts/SourceSansPro-Black.ttf b/gui/assets/fonts/SourceSansPro-Black.ttf
new file mode 100755
index 0000000000..4569f24a21
--- /dev/null
+++ b/gui/assets/fonts/SourceSansPro-Black.ttf
diff --git a/gui/src/renderer/components/ErrorBoundary.tsx b/gui/src/renderer/components/ErrorBoundary.tsx
index 82e2910cc0..a67812a055 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',
-  fontSize: '24px',
-  fontWeight: 900,
+  ...sourceSansPro,
+  fontSize: '26px',
   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..f3a69f5af2 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',
-  fontSize: '24px',
-  fontWeight: 900,
+  ...sourceSansPro,
+  fontSize: '26px',
   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..1ca42f1559 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',
-  fontSize: '24px',
-  fontWeight: 900,
+  ...sourceSansPro,
+  fontSize: '26px',
   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..879714ebfe 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,21 @@ export const smallText = {
 };
 
 export const mediumText = {
-  fontFamily: 'Open Sans',
+  ...openSans,
   fontSize: '18px',
   lineHeight: '24px',
 };
 
 export const buttonText = {
-  ...mediumText,
-  fontFamily: 'DINPro',
-  fontWeight: 900,
+  ...sourceSansPro,
+  fontSize: '20px',
+  lineHeight: '24px',
   color: colors.white,
 };
 
 export const bigText = {
-  fontFamily: 'DINPro',
-  fontSize: '30px',
-  fontWeight: 900,
+  ...sourceSansPro,
+  fontSize: '32px',
   lineHeight: '34px',
   color: colors.white,
 };