From 3b0bdaeea9430b31d233ea8d3ced1437aa5c57e0 Mon Sep 17 00:00:00 2001 From: Mikael Finstad Date: Fri, 10 Apr 2020 12:50:16 +0800 Subject: [PATCH] Explicitly set font for a consistent look on all platforms #301 --- src/TimelineControls.jsx | 2 +- src/TopMenu.jsx | 2 +- src/fonts.css | 80 ++++++++++++++++++ src/fonts/open-sans-v17-latin-300.woff2 | Bin 0 -> 14932 bytes src/fonts/open-sans-v17-latin-300italic.woff2 | Bin 0 -> 13860 bytes src/fonts/open-sans-v17-latin-600.woff2 | Bin 0 -> 14880 bytes src/fonts/open-sans-v17-latin-600italic.woff2 | Bin 0 -> 13852 bytes src/fonts/open-sans-v17-latin-700.woff2 | Bin 0 -> 15056 bytes src/fonts/open-sans-v17-latin-700italic.woff2 | Bin 0 -> 13880 bytes src/fonts/open-sans-v17-latin-800.woff2 | Bin 0 -> 15088 bytes src/fonts/open-sans-v17-latin-800italic.woff2 | Bin 0 -> 13960 bytes src/fonts/open-sans-v17-latin-italic.woff2 | Bin 0 -> 13780 bytes src/fonts/open-sans-v17-latin-regular.woff2 | Bin 0 -> 14380 bytes src/index.jsx | 2 + src/main.css | 3 +- 15 files changed, 86 insertions(+), 3 deletions(-) create mode 100644 src/fonts.css create mode 100644 src/fonts/open-sans-v17-latin-300.woff2 create mode 100644 src/fonts/open-sans-v17-latin-300italic.woff2 create mode 100644 src/fonts/open-sans-v17-latin-600.woff2 create mode 100644 src/fonts/open-sans-v17-latin-600italic.woff2 create mode 100644 src/fonts/open-sans-v17-latin-700.woff2 create mode 100644 src/fonts/open-sans-v17-latin-700italic.woff2 create mode 100644 src/fonts/open-sans-v17-latin-800.woff2 create mode 100644 src/fonts/open-sans-v17-latin-800italic.woff2 create mode 100644 src/fonts/open-sans-v17-latin-italic.woff2 create mode 100644 src/fonts/open-sans-v17-latin-regular.woff2 diff --git a/src/TimelineControls.jsx b/src/TimelineControls.jsx index 832e2ac9..adf4c798 100644 --- a/src/TimelineControls.jsx +++ b/src/TimelineControls.jsx @@ -56,7 +56,7 @@ const TimelineControls = memo(({ const isCutTimeManualSet = () => cutTimeManual !== undefined; const cutTimeInputStyle = { - background: 'white', borderRadius: 5, color: 'rgba(0, 0, 0, 0.7)', fontSize: 13, textAlign: 'center', padding: '3px 5px', marginTop: 0, marginBottom: 0, marginLeft: isStart ? 3 : 5, marginRight: isStart ? 5 : 3, border: 'none', boxSizing: 'border-box', fontFamily: 'inherit', width: 90, + background: 'white', borderRadius: 5, color: 'rgba(0, 0, 0, 0.7)', fontSize: 13, textAlign: 'center', padding: '1px 5px', marginTop: 0, marginBottom: 0, marginLeft: isStart ? 3 : 5, marginRight: isStart ? 5 : 3, border: 'none', boxSizing: 'border-box', fontFamily: 'inherit', width: 90, outline: 'none', }; diff --git a/src/TopMenu.jsx b/src/TopMenu.jsx index 6e06c43a..773b1368 100644 --- a/src/TopMenu.jsx +++ b/src/TopMenu.jsx @@ -48,7 +48,7 @@ const TopMenu = memo(({ {filePath && ( -
{renderOutFmt({ height: 20 })}
+ {renderOutFmt({ height: 20, maxWidth: 100 })}