diff --git a/android/app/src/main/assets/fonts/ExpensifyNewKansas-Medium.otf b/android/app/src/main/assets/fonts/ExpensifyNewKansas-Medium.otf old mode 100755 new mode 100644 index a7277555fad9..916184cdd50a Binary files a/android/app/src/main/assets/fonts/ExpensifyNewKansas-Medium.otf and b/android/app/src/main/assets/fonts/ExpensifyNewKansas-Medium.otf differ diff --git a/android/app/src/main/assets/fonts/ExpensifyNewKansas-MediumItalic.otf b/android/app/src/main/assets/fonts/ExpensifyNewKansas-MediumItalic.otf old mode 100755 new mode 100644 index 984ef4bfa2d4..4bc82a0f4141 Binary files a/android/app/src/main/assets/fonts/ExpensifyNewKansas-MediumItalic.otf and b/android/app/src/main/assets/fonts/ExpensifyNewKansas-MediumItalic.otf differ diff --git a/android/link-assets-manifest.json b/android/link-assets-manifest.json index 300d198bd626..3b9e10ad3b7f 100644 --- a/android/link-assets-manifest.json +++ b/android/link-assets-manifest.json @@ -27,11 +27,11 @@ }, { "path": "assets/fonts/native/ExpensifyNewKansas-Medium.otf", - "sha1": "b07181fac8d0602d4b18c339bdbef9589c67c9f9" + "sha1": "6c670679ccb67975edba5e8dd59dc883ff402b25" }, { "path": "assets/fonts/native/ExpensifyNewKansas-MediumItalic.otf", - "sha1": "00636ab2038c9690a123985b70a944c42cf65b8a" + "sha1": "42b8a320808e1f0aed6b65fd06edd51f6cf5515c" } ] } diff --git a/assets/css/fonts.css b/assets/css/fonts.css index 6e48be0e2b56..7834a0ebb861 100644 --- a/assets/css/fonts.css +++ b/assets/css/fonts.css @@ -40,6 +40,20 @@ src: url('/fonts/ExpensifyMono-Bold.woff2') format('woff2'), url('/fonts/ExpensifyMono-Bold.woff') format('woff'); } +@font-face { + font-family: ExpensifyNewKansas-Medium; + font-weight: 500; + font-style: normal; + src: url('/fonts/ExpensifyNewKansas-Medium.woff2') format('woff2'), url('/fonts/ExpensifyNewKansas-Medium.woff') format('woff'); +} + +@font-face { + font-family: ExpensifyNewKansas-MediumItalic; + font-weight: 500; + font-style: italic; + src: url('/fonts/ExpensifyNewKansas-MediumItalic.woff2') format('woff2'), url('/fonts/ExpensifyNewKansas-MediumItalic.woff') format('woff'); +} + * { -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; diff --git a/assets/fonts/native/ExpensifyNewKansas-Medium.otf b/assets/fonts/native/ExpensifyNewKansas-Medium.otf old mode 100755 new mode 100644 index a7277555fad9..916184cdd50a Binary files a/assets/fonts/native/ExpensifyNewKansas-Medium.otf and b/assets/fonts/native/ExpensifyNewKansas-Medium.otf differ diff --git a/assets/fonts/native/ExpensifyNewKansas-MediumItalic.otf b/assets/fonts/native/ExpensifyNewKansas-MediumItalic.otf old mode 100755 new mode 100644 index 984ef4bfa2d4..4bc82a0f4141 Binary files a/assets/fonts/native/ExpensifyNewKansas-MediumItalic.otf and b/assets/fonts/native/ExpensifyNewKansas-MediumItalic.otf differ diff --git a/assets/fonts/web/ExpensifyNewKansas-Medium.otf b/assets/fonts/web/ExpensifyNewKansas-Medium.otf deleted file mode 100755 index a7277555fad9..000000000000 Binary files a/assets/fonts/web/ExpensifyNewKansas-Medium.otf and /dev/null differ diff --git a/assets/fonts/web/ExpensifyNewKansas-Medium.woff b/assets/fonts/web/ExpensifyNewKansas-Medium.woff new file mode 100644 index 000000000000..bd842c5ecb1d Binary files /dev/null and b/assets/fonts/web/ExpensifyNewKansas-Medium.woff differ diff --git a/assets/fonts/web/ExpensifyNewKansas-Medium.woff2 b/assets/fonts/web/ExpensifyNewKansas-Medium.woff2 new file mode 100644 index 000000000000..dba1df7e971e Binary files /dev/null and b/assets/fonts/web/ExpensifyNewKansas-Medium.woff2 differ diff --git a/assets/fonts/web/ExpensifyNewKansas-MediumItalic.otf b/assets/fonts/web/ExpensifyNewKansas-MediumItalic.otf deleted file mode 100755 index 984ef4bfa2d4..000000000000 Binary files a/assets/fonts/web/ExpensifyNewKansas-MediumItalic.otf and /dev/null differ diff --git a/assets/fonts/web/ExpensifyNewKansas-MediumItalic.woff b/assets/fonts/web/ExpensifyNewKansas-MediumItalic.woff new file mode 100644 index 000000000000..d3e7d9e82e15 Binary files /dev/null and b/assets/fonts/web/ExpensifyNewKansas-MediumItalic.woff differ diff --git a/assets/fonts/web/ExpensifyNewKansas-MediumItalic.woff2 b/assets/fonts/web/ExpensifyNewKansas-MediumItalic.woff2 new file mode 100644 index 000000000000..94a0e04fa3b2 Binary files /dev/null and b/assets/fonts/web/ExpensifyNewKansas-MediumItalic.woff2 differ diff --git a/config/webpack/webpack.common.js b/config/webpack/webpack.common.js index ec4f4656fddc..4d98e4d83c90 100644 --- a/config/webpack/webpack.common.js +++ b/config/webpack/webpack.common.js @@ -189,7 +189,7 @@ const webpackConfig = ({envFile = '.env', platform = 'web'}) => ({ use: ['style-loader', 'css-loader'], }, { - test: /\.(woff|woff2|otf)$/i, + test: /\.(woff|woff2)$/i, type: 'asset', }, { diff --git a/ios/NewExpensify.xcodeproj/project.pbxproj b/ios/NewExpensify.xcodeproj/project.pbxproj index 390ba358e87d..b3dab9cee754 100644 --- a/ios/NewExpensify.xcodeproj/project.pbxproj +++ b/ios/NewExpensify.xcodeproj/project.pbxproj @@ -17,23 +17,23 @@ 0F5E5351263B73FD004CA14F /* EnvironmentChecker.m in Sources */ = {isa = PBXBuildFile; fileRef = 0F5E534F263B73FD004CA14F /* EnvironmentChecker.m */; }; 13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; 18D050E0262400AF000D658B /* BridgingFile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18D050DF262400AF000D658B /* BridgingFile.swift */; }; + 1D9EC75069BF4FDB88DF2BA7 /* ExpensifyMono-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = 1B3F09A4E4EA4CFFA5E4E7CD /* ExpensifyMono-Regular.otf */; }; 374FB8D728A133FE000D84EF /* OriginImageRequestHandler.mm in Sources */ = {isa = PBXBuildFile; fileRef = 374FB8D628A133FE000D84EF /* OriginImageRequestHandler.mm */; }; + 5E272EE622CC4C768F4EC64D /* ExpensifyNeue-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = 6BEDED270C49437581EBE50D /* ExpensifyNeue-Regular.otf */; }; 5E2EE3856BE7BC98F354B110 /* libPods-NewExpensify.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3EDF186626B8D2CBA203E08D /* libPods-NewExpensify.a */; }; + 63D866D568A14A61AD27E20A /* ExpensifyNeue-Italic.otf in Resources */ = {isa = PBXBuildFile; fileRef = 1977066010294D51AEB35F3B /* ExpensifyNeue-Italic.otf */; }; 7041848526A8E47D00E09F4D /* RCTStartupTimer.m in Sources */ = {isa = PBXBuildFile; fileRef = 7041848426A8E47D00E09F4D /* RCTStartupTimer.m */; }; 7041848626A8E47D00E09F4D /* RCTStartupTimer.m in Sources */ = {isa = PBXBuildFile; fileRef = 7041848426A8E47D00E09F4D /* RCTStartupTimer.m */; }; 70CF6E82262E297300711ADC /* BootSplash.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 70CF6E81262E297300711ADC /* BootSplash.storyboard */; }; + 9316CFCA15184920AE24E3CC /* ExpensifyMono-Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = 177D06D4BF2346EB90E37D3D /* ExpensifyMono-Bold.otf */; }; + 95C1920F4FFC403E9C16013C /* ExpensifyNeue-BoldItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = 38E61473EAA34C598CB6B345 /* ExpensifyNeue-BoldItalic.otf */; }; + A5158169CD604A77A22AE02A /* ExpensifyNeue-Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = EDFC169F9D7A43BDB924151F /* ExpensifyNeue-Bold.otf */; }; + BDB853621F354EBB84E619C2 /* ExpensifyNewKansas-MediumItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = D2AFB39EC1D44BF9B91D3227 /* ExpensifyNewKansas-MediumItalic.otf */; }; DD79042B2792E76D004484B4 /* RCTBootSplash.m in Sources */ = {isa = PBXBuildFile; fileRef = DD79042A2792E76D004484B4 /* RCTBootSplash.m */; }; E3B48DC1ED4CC64F660388A8 /* libPods-NewExpensify-NewExpensifyTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A2695CF895D81C31AFB4A074 /* libPods-NewExpensify-NewExpensifyTests.a */; }; E9DF872D2525201700607FDC /* AirshipConfig.plist in Resources */ = {isa = PBXBuildFile; fileRef = E9DF872C2525201700607FDC /* AirshipConfig.plist */; }; F0C450EA2705020500FD2970 /* colors.json in Resources */ = {isa = PBXBuildFile; fileRef = F0C450E92705020500FD2970 /* colors.json */; }; - 9316CFCA15184920AE24E3CC /* ExpensifyMono-Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = 177D06D4BF2346EB90E37D3D /* ExpensifyMono-Bold.otf */; }; - 1D9EC75069BF4FDB88DF2BA7 /* ExpensifyMono-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = 1B3F09A4E4EA4CFFA5E4E7CD /* ExpensifyMono-Regular.otf */; }; - A5158169CD604A77A22AE02A /* ExpensifyNeue-Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = EDFC169F9D7A43BDB924151F /* ExpensifyNeue-Bold.otf */; }; - 95C1920F4FFC403E9C16013C /* ExpensifyNeue-BoldItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = 38E61473EAA34C598CB6B345 /* ExpensifyNeue-BoldItalic.otf */; }; - 63D866D568A14A61AD27E20A /* ExpensifyNeue-Italic.otf in Resources */ = {isa = PBXBuildFile; fileRef = 1977066010294D51AEB35F3B /* ExpensifyNeue-Italic.otf */; }; - 5E272EE622CC4C768F4EC64D /* ExpensifyNeue-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = 6BEDED270C49437581EBE50D /* ExpensifyNeue-Regular.otf */; }; - 4FB4804CA0154A0382C7EAE1 /* ExpensifyNewKansas-Medium.otf in Resources */ = {isa = PBXBuildFile; fileRef = 2DEF941BCD3B464CA78A8188 /* ExpensifyNewKansas-Medium.otf */; }; - 07C7A32C41FC466C85598ADD /* ExpensifyNewKansas-MediumItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = 71272DD3D80F4E56884B87CE /* ExpensifyNewKansas-MediumItalic.otf */; }; + FF941A8D48F849269AB85C9A /* ExpensifyNewKansas-Medium.otf in Resources */ = {isa = PBXBuildFile; fileRef = 44BF435285B94E5B95F90994 /* ExpensifyNewKansas-Medium.otf */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -63,29 +63,29 @@ 13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = NewExpensify/AppDelegate.h; sourceTree = ""; }; 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = NewExpensify/Info.plist; sourceTree = ""; }; 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = NewExpensify/main.m; sourceTree = ""; }; + 177D06D4BF2346EB90E37D3D /* ExpensifyMono-Bold.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "ExpensifyMono-Bold.otf"; path = "../assets/fonts/native/ExpensifyMono-Bold.otf"; sourceTree = ""; }; 18D050DF262400AF000D658B /* BridgingFile.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BridgingFile.swift; sourceTree = ""; }; + 1977066010294D51AEB35F3B /* ExpensifyNeue-Italic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "ExpensifyNeue-Italic.otf"; path = "../assets/fonts/native/ExpensifyNeue-Italic.otf"; sourceTree = ""; }; + 1B3F09A4E4EA4CFFA5E4E7CD /* ExpensifyMono-Regular.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "ExpensifyMono-Regular.otf"; path = "../assets/fonts/native/ExpensifyMono-Regular.otf"; sourceTree = ""; }; 374FB8D528A133A7000D84EF /* OriginImageRequestHandler.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = OriginImageRequestHandler.h; path = NewExpensify/OriginImageRequestHandler.h; sourceTree = ""; }; 374FB8D628A133FE000D84EF /* OriginImageRequestHandler.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = OriginImageRequestHandler.mm; path = NewExpensify/OriginImageRequestHandler.mm; sourceTree = ""; }; + 38E61473EAA34C598CB6B345 /* ExpensifyNeue-BoldItalic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "ExpensifyNeue-BoldItalic.otf"; path = "../assets/fonts/native/ExpensifyNeue-BoldItalic.otf"; sourceTree = ""; }; 3EDF186626B8D2CBA203E08D /* libPods-NewExpensify.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-NewExpensify.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 44BF435285B94E5B95F90994 /* ExpensifyNewKansas-Medium.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "ExpensifyNewKansas-Medium.otf"; path = "../assets/fonts/native/ExpensifyNewKansas-Medium.otf"; sourceTree = ""; }; + 6BEDED270C49437581EBE50D /* ExpensifyNeue-Regular.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "ExpensifyNeue-Regular.otf"; path = "../assets/fonts/native/ExpensifyNeue-Regular.otf"; sourceTree = ""; }; 7041848326A8E40900E09F4D /* RCTStartupTimer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = RCTStartupTimer.h; path = NewExpensify/RCTStartupTimer.h; sourceTree = ""; }; 7041848426A8E47D00E09F4D /* RCTStartupTimer.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = RCTStartupTimer.m; path = NewExpensify/RCTStartupTimer.m; sourceTree = ""; }; 70CF6E81262E297300711ADC /* BootSplash.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = BootSplash.storyboard; path = NewExpensify/BootSplash.storyboard; sourceTree = ""; }; A2695CF895D81C31AFB4A074 /* libPods-NewExpensify-NewExpensifyTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-NewExpensify-NewExpensifyTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; B66D52EC75F78B8A06F1E035 /* Pods-NewExpensify.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NewExpensify.debug.xcconfig"; path = "Target Support Files/Pods-NewExpensify/Pods-NewExpensify.debug.xcconfig"; sourceTree = ""; }; + D2AFB39EC1D44BF9B91D3227 /* ExpensifyNewKansas-MediumItalic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "ExpensifyNewKansas-MediumItalic.otf"; path = "../assets/fonts/native/ExpensifyNewKansas-MediumItalic.otf"; sourceTree = ""; }; DD7904292792E76D004484B4 /* RCTBootSplash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RCTBootSplash.h; path = NewExpensify/RCTBootSplash.h; sourceTree = ""; }; DD79042A2792E76D004484B4 /* RCTBootSplash.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RCTBootSplash.m; path = NewExpensify/RCTBootSplash.m; sourceTree = ""; }; E9DF872C2525201700607FDC /* AirshipConfig.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = AirshipConfig.plist; sourceTree = ""; }; ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; }; ED2971642150620600B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS12.0.sdk/System/Library/Frameworks/JavaScriptCore.framework; sourceTree = DEVELOPER_DIR; }; + EDFC169F9D7A43BDB924151F /* ExpensifyNeue-Bold.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "ExpensifyNeue-Bold.otf"; path = "../assets/fonts/native/ExpensifyNeue-Bold.otf"; sourceTree = ""; }; F0C450E92705020500FD2970 /* colors.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = colors.json; path = ../colors.json; sourceTree = ""; }; - 177D06D4BF2346EB90E37D3D /* ExpensifyMono-Bold.otf */ = {isa = PBXFileReference; name = "ExpensifyMono-Bold.otf"; path = "../assets/fonts/native/ExpensifyMono-Bold.otf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; - 1B3F09A4E4EA4CFFA5E4E7CD /* ExpensifyMono-Regular.otf */ = {isa = PBXFileReference; name = "ExpensifyMono-Regular.otf"; path = "../assets/fonts/native/ExpensifyMono-Regular.otf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; - EDFC169F9D7A43BDB924151F /* ExpensifyNeue-Bold.otf */ = {isa = PBXFileReference; name = "ExpensifyNeue-Bold.otf"; path = "../assets/fonts/native/ExpensifyNeue-Bold.otf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; - 38E61473EAA34C598CB6B345 /* ExpensifyNeue-BoldItalic.otf */ = {isa = PBXFileReference; name = "ExpensifyNeue-BoldItalic.otf"; path = "../assets/fonts/native/ExpensifyNeue-BoldItalic.otf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; - 1977066010294D51AEB35F3B /* ExpensifyNeue-Italic.otf */ = {isa = PBXFileReference; name = "ExpensifyNeue-Italic.otf"; path = "../assets/fonts/native/ExpensifyNeue-Italic.otf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; - 6BEDED270C49437581EBE50D /* ExpensifyNeue-Regular.otf */ = {isa = PBXFileReference; name = "ExpensifyNeue-Regular.otf"; path = "../assets/fonts/native/ExpensifyNeue-Regular.otf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; - 2DEF941BCD3B464CA78A8188 /* ExpensifyNewKansas-Medium.otf */ = {isa = PBXFileReference; name = "ExpensifyNewKansas-Medium.otf"; path = "../assets/fonts/native/ExpensifyNewKansas-Medium.otf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; - 71272DD3D80F4E56884B87CE /* ExpensifyNewKansas-MediumItalic.otf */ = {isa = PBXFileReference; name = "ExpensifyNewKansas-MediumItalic.otf"; path = "../assets/fonts/native/ExpensifyNewKansas-MediumItalic.otf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -203,8 +203,8 @@ 38E61473EAA34C598CB6B345 /* ExpensifyNeue-BoldItalic.otf */, 1977066010294D51AEB35F3B /* ExpensifyNeue-Italic.otf */, 6BEDED270C49437581EBE50D /* ExpensifyNeue-Regular.otf */, - 2DEF941BCD3B464CA78A8188 /* ExpensifyNewKansas-Medium.otf */, - 71272DD3D80F4E56884B87CE /* ExpensifyNewKansas-MediumItalic.otf */, + 44BF435285B94E5B95F90994 /* ExpensifyNewKansas-Medium.otf */, + D2AFB39EC1D44BF9B91D3227 /* ExpensifyNewKansas-MediumItalic.otf */, ); name = Resources; sourceTree = ""; @@ -331,8 +331,8 @@ 95C1920F4FFC403E9C16013C /* ExpensifyNeue-BoldItalic.otf in Resources */, 63D866D568A14A61AD27E20A /* ExpensifyNeue-Italic.otf in Resources */, 5E272EE622CC4C768F4EC64D /* ExpensifyNeue-Regular.otf in Resources */, - 4FB4804CA0154A0382C7EAE1 /* ExpensifyNewKansas-Medium.otf in Resources */, - 07C7A32C41FC466C85598ADD /* ExpensifyNewKansas-MediumItalic.otf in Resources */, + FF941A8D48F849269AB85C9A /* ExpensifyNewKansas-Medium.otf in Resources */, + BDB853621F354EBB84E619C2 /* ExpensifyNewKansas-MediumItalic.otf in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index ec08c61314c0..8dda6ab32e26 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -77,7 +77,6 @@ Your photos are used to create chat attachments. UIAppFonts - ExpensifyNewKansas-Meduim.otf ExpensifyMono-Bold.otf ExpensifyMono-Regular.otf ExpensifyNeue-Bold.otf diff --git a/ios/link-assets-manifest.json b/ios/link-assets-manifest.json index 300d198bd626..3b9e10ad3b7f 100644 --- a/ios/link-assets-manifest.json +++ b/ios/link-assets-manifest.json @@ -27,11 +27,11 @@ }, { "path": "assets/fonts/native/ExpensifyNewKansas-Medium.otf", - "sha1": "b07181fac8d0602d4b18c339bdbef9589c67c9f9" + "sha1": "6c670679ccb67975edba5e8dd59dc883ff402b25" }, { "path": "assets/fonts/native/ExpensifyNewKansas-MediumItalic.otf", - "sha1": "00636ab2038c9690a123985b70a944c42cf65b8a" + "sha1": "42b8a320808e1f0aed6b65fd06edd51f6cf5515c" } ] } diff --git a/src/components/Banner.js b/src/components/Banner.js index 4ef13aad42b8..748c8b489f9f 100644 --- a/src/components/Banner.js +++ b/src/components/Banner.js @@ -32,9 +32,11 @@ const propTypes = { /** Callback called when the message is pressed */ onPress: PropTypes.func, + /** Styles to be assigned to the Banner container */ // eslint-disable-next-line react/forbid-prop-types containerStyles: PropTypes.arrayOf(PropTypes.object), + /** Styles to be assigned to the Banner text */ // eslint-disable-next-line react/forbid-prop-types textStyles: PropTypes.arrayOf(PropTypes.object), diff --git a/src/components/BlockingViews/BlockingView.js b/src/components/BlockingViews/BlockingView.js index 5241714bea22..2cf6ff8262c4 100644 --- a/src/components/BlockingViews/BlockingView.js +++ b/src/components/BlockingViews/BlockingView.js @@ -35,7 +35,7 @@ const BlockingView = props => ( width={variables.iconSizeSuperLarge} height={variables.iconSizeSuperLarge} /> - {props.title} + {props.title} {props.subtitle} ); diff --git a/src/components/ConfirmationPage.js b/src/components/ConfirmationPage.js index 1162c81506a9..7c27313720af 100644 --- a/src/components/ConfirmationPage.js +++ b/src/components/ConfirmationPage.js @@ -43,13 +43,7 @@ const ConfirmationPage = props => ( source={{uri: props.illustration}} style={styles.confirmationAnimation} /> - + {props.heading} diff --git a/src/components/CurrentWalletBalance.js b/src/components/CurrentWalletBalance.js index 8b1ee33c5e81..5bc7f251066b 100644 --- a/src/components/CurrentWalletBalance.js +++ b/src/components/CurrentWalletBalance.js @@ -46,7 +46,7 @@ const CurrentWalletBalance = (props) => { ); return ( {`${formattedBalance}`} diff --git a/src/components/EnvironmentBadge.js b/src/components/EnvironmentBadge.js index 12cc13255366..4365bfab1a11 100644 --- a/src/components/EnvironmentBadge.js +++ b/src/components/EnvironmentBadge.js @@ -2,6 +2,7 @@ import React from 'react'; import CONST from '../CONST'; import withEnvironment, {environmentPropTypes} from './withEnvironment'; import Badge from './Badge'; +import styles from '../styles/styles'; const ENVIRONMENT_SHORT_FORM = { [CONST.ENVIRONMENT.DEV]: 'DEV', @@ -20,6 +21,7 @@ const EnvironmentBadge = (props) => { success={props.environment === CONST.ENVIRONMENT.STAGING} error={props.environment !== CONST.ENVIRONMENT.STAGING} text={ENVIRONMENT_SHORT_FORM[props.environment]} + badgeStyles={[styles.alignSelfCenter]} /> ); }; diff --git a/src/components/Header.js b/src/components/Header.js index afbdf1fa778a..a69317122aad 100644 --- a/src/components/Header.js +++ b/src/components/Header.js @@ -15,16 +15,21 @@ const propTypes = { /** Should we show the environment badge (dev/stg)? */ shouldShowEnvironmentBadge: PropTypes.bool, + + /** Additional text styles */ + // eslint-disable-next-line react/forbid-prop-types + textStyles: PropTypes.arrayOf(PropTypes.object), }; const defaultProps = { shouldShowEnvironmentBadge: false, subtitle: '', + textStyles: [], }; const Header = props => ( - + {props.title} {/* If there's no subtitle then display a fragment to avoid an empty space which moves the main title */} diff --git a/src/components/PDFView/PDFInfoMessage.js b/src/components/PDFView/PDFInfoMessage.js index 5d583db40ea5..bb683900a0c2 100644 --- a/src/components/PDFView/PDFInfoMessage.js +++ b/src/components/PDFView/PDFInfoMessage.js @@ -23,7 +23,7 @@ const PDFInfoMessage = props => ( width={variables.iconSizeSuperLarge} height={variables.iconSizeSuperLarge} /> - + {props.translate('attachmentView.pdfPasswordForm.title')} {props.translate('attachmentView.pdfPasswordForm.infoText')} diff --git a/src/components/Section.js b/src/components/Section.js index 83c8900a30a2..cbed28c3de12 100644 --- a/src/components/Section.js +++ b/src/components/Section.js @@ -43,7 +43,7 @@ const Section = (props) => { - {props.title} + {props.title} {props.icon && } diff --git a/src/pages/DetailsPage.js b/src/pages/DetailsPage.js index 1c0ebe9d178b..acb98dfeb550 100755 --- a/src/pages/DetailsPage.js +++ b/src/pages/DetailsPage.js @@ -140,7 +140,7 @@ class DetailsPage extends React.PureComponent { )} {details.displayName && ( - + {isSMSLogin ? this.props.toLocalPhone(details.displayName) : details.displayName} )} diff --git a/src/pages/EnablePayments/TermsPage/ShortTermsForm.js b/src/pages/EnablePayments/TermsPage/ShortTermsForm.js index 97169763b1f3..05b4c6fcff10 100644 --- a/src/pages/EnablePayments/TermsPage/ShortTermsForm.js +++ b/src/pages/EnablePayments/TermsPage/ShortTermsForm.js @@ -19,7 +19,7 @@ const ShortTermsForm = () => ( {Localize.translateLocal('termsStep.monthlyFee')} - {Localize.translateLocal('termsStep.feeAmountZero')} + {Localize.translateLocal('termsStep.feeAmountZero')} @@ -28,7 +28,7 @@ const ShortTermsForm = () => ( {Localize.translateLocal('termsStep.shortTermsForm.perPurchase')} - {Localize.translateLocal('termsStep.feeAmountZero')} + {Localize.translateLocal('termsStep.feeAmountZero')} @@ -40,7 +40,7 @@ const ShortTermsForm = () => ( {Localize.translateLocal('termsStep.shortTermsForm.atmWithdrawal')} - {Localize.translateLocal('common.na')} + {Localize.translateLocal('common.na')} @@ -48,7 +48,7 @@ const ShortTermsForm = () => ( - {Localize.translateLocal('common.na')} + {Localize.translateLocal('common.na')} @@ -62,7 +62,7 @@ const ShortTermsForm = () => ( {Localize.translateLocal('termsStep.shortTermsForm.cashReload')} - {Localize.translateLocal('common.na')} + {Localize.translateLocal('common.na')} diff --git a/src/pages/ErrorPage/GenericErrorPage.js b/src/pages/ErrorPage/GenericErrorPage.js index 711dae907d0a..81487e9a6af3 100644 --- a/src/pages/ErrorPage/GenericErrorPage.js +++ b/src/pages/ErrorPage/GenericErrorPage.js @@ -35,7 +35,7 @@ const GenericErrorPage = props => ( /> - + {props.translate('genericErrorPage.title')} diff --git a/src/pages/ReportDetailsPage.js b/src/pages/ReportDetailsPage.js index 6efd4bf724c4..62afb287ed0e 100644 --- a/src/pages/ReportDetailsPage.js +++ b/src/pages/ReportDetailsPage.js @@ -131,7 +131,7 @@ class ReportDetailsPage extends Component { displayNamesWithTooltips={displayNamesWithTooltips} tooltipEnabled numberOfLines={1} - textStyles={[styles.headerText, styles.mb2, styles.textAlignCenter]} + textStyles={[styles.textHeadline, styles.mb2, styles.textAlignCenter]} shouldUseFullTitle={isChatRoom || isPolicyExpenseChat} /> @@ -140,7 +140,7 @@ class ReportDetailsPage extends Component { styles.sidebarLinkText, styles.optionAlternateText, styles.textLabelSupporting, - styles.mb5, + styles.mb2, ]} numberOfLines={1} > diff --git a/src/pages/home/report/ReportDropUI.js b/src/pages/home/report/ReportDropUI.js index 88fdf202d56b..0ca66904e482 100644 --- a/src/pages/home/report/ReportDropUI.js +++ b/src/pages/home/report/ReportDropUI.js @@ -17,7 +17,7 @@ const ReportDropUI = props => ( - + {props.translate('reportActionCompose.dropToUpload')} diff --git a/src/pages/home/sidebar/SidebarLinks.js b/src/pages/home/sidebar/SidebarLinks.js index 00b0424844be..f6d44c348df6 100644 --- a/src/pages/home/sidebar/SidebarLinks.js +++ b/src/pages/home/sidebar/SidebarLinks.js @@ -142,11 +142,11 @@ class SidebarLinks extends React.Component { nativeID="drag-area" >
- + {this.props.currentUserPersonalDetails.displayName ? this.props.currentUserPersonalDetails.displayName : Str.removeSMSDomain(this.props.session.email)} diff --git a/src/pages/settings/Payments/TransferBalancePage.js b/src/pages/settings/Payments/TransferBalancePage.js index 792866e56db4..b1c1a7dc29cf 100644 --- a/src/pages/settings/Payments/TransferBalancePage.js +++ b/src/pages/settings/Payments/TransferBalancePage.js @@ -186,7 +186,7 @@ class TransferBalancePage extends React.Component { onBackButtonPress={() => Navigation.goBack()} onCloseButtonPress={() => Navigation.dismissModal(true)} /> - + diff --git a/src/pages/workspace/WorkspaceInitialPage.js b/src/pages/workspace/WorkspaceInitialPage.js index 241d275ccf7d..e287bb6c6f70 100644 --- a/src/pages/workspace/WorkspaceInitialPage.js +++ b/src/pages/workspace/WorkspaceInitialPage.js @@ -224,7 +224,7 @@ class WorkspaceInitialPage extends React.Component { diff --git a/src/styles/fontFamily/index.js b/src/styles/fontFamily/index.js index a72945b7c838..3e258bbef7b1 100644 --- a/src/styles/fontFamily/index.js +++ b/src/styles/fontFamily/index.js @@ -5,6 +5,8 @@ const fontFamily = { EXP_NEUE_ITALIC: 'ExpensifyNeue-Italic', EXP_NEUE_BOLD: bold, EXP_NEUE: 'ExpensifyNeue-Regular', + EXP_NEW_KANSAS_MEDIUM: 'ExpensifyNewKansas-Medium', + EXP_NEW_KANSAS_MEDIUM_ITALIC: 'ExpensifyNewKansas-MediumItalic', SYSTEM: 'System', MONOSPACE: 'ExpensifyMono-Regular', MONOSPACE_ITALIC: 'ExpensifyMono-Regular', diff --git a/src/styles/styles.js b/src/styles/styles.js index 82e9ca8f2a87..99fe27a28990 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -48,6 +48,11 @@ const baseCodeTagStyles = { backgroundColor: themeColors.textBackground, }; +const headlineFont = { + fontFamily: fontFamily.EXP_NEW_KANSAS_MEDIUM, + fontWeight: '500', +}; + const webViewStyles = { // As of react-native-render-html v6, don't declare distinct styles for // custom renderers, the API for custom renderers has changed. Declare the @@ -261,15 +266,16 @@ const styles = { fontSize: variables.fontSizeLarge, }, + textXLarge: { + fontSize: variables.fontSizeXLarge, + }, + textXXLarge: { fontSize: variables.fontSizeXXLarge, }, textXXXLarge: { - color: themeColors.heading, - fontFamily: fontFamily.EXP_NEUE_BOLD, fontSize: variables.fontSizeXXXLarge, - fontWeight: fontWeightBold, }, textStrong: { @@ -282,6 +288,12 @@ const styles = { fontStyle: 'italic', }, + textHeadline: { + ...headlineFont, + color: themeColors.heading, + fontSize: variables.fontSizeXLarge, + }, + textDecorationNoLine: { textDecorationLine: 'none', }, @@ -1905,10 +1917,11 @@ const styles = { }, notFoundTextHeader: { - color: themeColors.link, - fontFamily: fontFamily.EXP_NEUE_BOLD, - fontWeight: fontWeightBold, - fontSize: 150, + ...headlineFont, + color: themeColors.heading, + fontSize: variables.fontSizeXLarge, + marginTop: 20, + marginBottom: 8, }, notFoundTextBody: { @@ -2021,13 +2034,6 @@ const styles = { position: 'absolute', }, - displayName: { - fontSize: variables.fontSizeLarge, - fontFamily: fontFamily.EXP_NEUE_BOLD, - fontWeight: fontWeightBold, - color: themeColors.heading, - }, - pageWrapper: { width: '100%', alignItems: 'center', @@ -2166,16 +2172,14 @@ const styles = { }, iouAmountText: { - fontFamily: fontFamily.EXP_NEUE_BOLD, - fontWeight: fontWeightBold, + ...headlineFont, fontSize: variables.iouAmountTextSize, color: themeColors.heading, lineHeight: variables.inputHeight, }, iouAmountTextInput: addOutlineWidth({ - fontFamily: fontFamily.EXP_NEUE_BOLD, - fontWeight: fontWeightBold, + ...headlineFont, fontSize: variables.iouAmountTextSize, color: themeColors.heading, padding: 0, @@ -2543,18 +2547,18 @@ const styles = { shortTermsBorder: { borderWidth: 1, - borderColor: themeColors.shadow, + borderColor: themeColors.border, }, shortTermsHorizontalRule: { borderBottomWidth: 1, - borderColor: themeColors.shadow, + borderColor: themeColors.border, ...spacing.mh3, }, shortTermsLargeHorizontalRule: { borderWidth: 1, - borderColor: themeColors.shadow, + borderColor: themeColors.border, ...spacing.mh3, }, diff --git a/src/styles/variables.js b/src/styles/variables.js index 7d818f8be207..05808f7d6fff 100644 --- a/src/styles/variables.js +++ b/src/styles/variables.js @@ -42,6 +42,7 @@ export default { fontSizeLarge: getValueUsingPixelRatio(17, 19), fontSizeHero: 36, fontSizeh1: 19, + fontSizeXLarge: 22, fontSizeXXLarge: 28, fontSizeXXXLarge: 32, fontSizeNormalHeight: getValueUsingPixelRatio(20, 28),