diff --git a/android/app/src/main/assets/fonts/Metropolis-Light.ttf b/android/app/src/main/assets/fonts/Metropolis-Light.ttf new file mode 100644 index 0000000000..64a0c83a42 Binary files /dev/null and b/android/app/src/main/assets/fonts/Metropolis-Light.ttf differ diff --git a/android/app/src/main/assets/fonts/Metropolis-SemiBold.ttf b/android/app/src/main/assets/fonts/Metropolis-SemiBold.ttf new file mode 100644 index 0000000000..2f7522d57c Binary files /dev/null and b/android/app/src/main/assets/fonts/Metropolis-SemiBold.ttf differ diff --git a/android/app/src/main/assets/fonts/Metropolis.ttf b/android/app/src/main/assets/fonts/Metropolis.ttf new file mode 100644 index 0000000000..012acd813f Binary files /dev/null and b/android/app/src/main/assets/fonts/Metropolis.ttf differ diff --git a/android/app/src/main/assets/fonts/OpenSans-Regular.ttf b/android/app/src/main/assets/fonts/OpenSans.ttf similarity index 100% rename from android/app/src/main/assets/fonts/OpenSans-Regular.ttf rename to android/app/src/main/assets/fonts/OpenSans.ttf diff --git a/app/components/channel_icon/index.tsx b/app/components/channel_icon/index.tsx index 4efb076316..79f5de15b1 100644 --- a/app/components/channel_icon/index.tsx +++ b/app/components/channel_icon/index.tsx @@ -59,7 +59,7 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => { group: { color: theme.sidebarText, fontSize: 10, - fontWeight: '600', + fontFamily: 'OpenSans-Semibold', }, groupActive: { color: theme.sidebarTextActiveColor, diff --git a/app/components/failed_action/index.tsx b/app/components/failed_action/index.tsx index 3b8bdcc87b..8919c07c52 100644 --- a/app/components/failed_action/index.tsx +++ b/app/components/failed_action/index.tsx @@ -32,7 +32,7 @@ const getStyleFromTheme = makeStyleSheetFromTheme((theme: Theme) => { title: { color: changeOpacity(theme.centerChannelColor, 0.8), fontSize: 20, - fontWeight: '600', + fontFamily: 'OpenSans-Semibold', marginBottom: 15, marginTop: 10, }, diff --git a/app/components/post_list/combined_user_activity/combined_user_activity.tsx b/app/components/post_list/combined_user_activity/combined_user_activity.tsx index 7f77ac036c..074307d1bb 100644 --- a/app/components/post_list/combined_user_activity/combined_user_activity.tsx +++ b/app/components/post_list/combined_user_activity/combined_user_activity.tsx @@ -36,7 +36,8 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => { return { baseText: { color: changeOpacity(theme.centerChannelColor, 0.6), - fontSize: 15, + fontSize: 16, + lineHeight: 20, }, body: { flex: 1, diff --git a/app/components/post_list/combined_user_activity/last_users.tsx b/app/components/post_list/combined_user_activity/last_users.tsx index 50c5d8937d..cd03fb49c2 100644 --- a/app/components/post_list/combined_user_activity/last_users.tsx +++ b/app/components/post_list/combined_user_activity/last_users.tsx @@ -25,12 +25,14 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => { baseText: { color: theme.centerChannelColor, opacity: 0.6, - fontSize: 15, + fontSize: 16, + lineHeight: 20, }, linkText: { color: theme.linkColor, opacity: 0.8, - fontSize: 15, + fontSize: 16, + lineHeight: 20, }, }; }); diff --git a/app/components/post_list/date_separator/index.tsx b/app/components/post_list/date_separator/index.tsx index 602bf4e9f2..ae8d0502be 100644 --- a/app/components/post_list/date_separator/index.tsx +++ b/app/components/post_list/date_separator/index.tsx @@ -34,8 +34,9 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => { }, date: { color: theme.centerChannelColor, - fontSize: 14, - fontWeight: '600', + fontFamily: 'OpenSans-Semibold', + fontSize: 12, + lineHeight: 16, }, }; }); diff --git a/app/components/post_list/new_message_line/index.tsx b/app/components/post_list/new_message_line/index.tsx index 30a5a6783c..628cc0fe1b 100644 --- a/app/components/post_list/new_message_line/index.tsx +++ b/app/components/post_list/new_message_line/index.tsx @@ -64,7 +64,8 @@ const getStyleFromTheme = makeStyleSheetFromTheme((theme: Theme) => { backgroundColor: theme.newMessageSeparator, }, text: { - fontSize: 14, + lineHeight: 16, + fontSize: 12, color: theme.newMessageSeparator, }, }; diff --git a/app/components/post_list/post/body/add_members/index.tsx b/app/components/post_list/post/body/add_members/index.tsx index a80b7ceae6..24e637226f 100644 --- a/app/components/post_list/post/body/add_members/index.tsx +++ b/app/components/post_list/post/body/add_members/index.tsx @@ -39,7 +39,7 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => { return { message: { color: changeOpacity(theme.centerChannelColor, 0.6), - fontSize: 15, + fontSize: 16, lineHeight: 20, }, }; diff --git a/app/components/post_list/post/body/content/embedded_bindings/button_binding/index.tsx b/app/components/post_list/post/body/content/embedded_bindings/button_binding/index.tsx index e951c57e94..6df80cc2d9 100644 --- a/app/components/post_list/post/body/content/embedded_bindings/button_binding/index.tsx +++ b/app/components/post_list/post/body/content/embedded_bindings/button_binding/index.tsx @@ -50,7 +50,7 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => { text: { color: STATUS_COLORS.default, fontSize: 15, - fontWeight: '600', + fontFamily: 'OpenSans-Semibold', lineHeight: 17, }, }; diff --git a/app/components/post_list/post/body/content/embedded_bindings/embed_title.tsx b/app/components/post_list/post/body/content/embedded_bindings/embed_title.tsx index 4ae871fa37..fb8b85c001 100644 --- a/app/components/post_list/post/body/content/embedded_bindings/embed_title.tsx +++ b/app/components/post_list/post/body/content/embedded_bindings/embed_title.tsx @@ -21,7 +21,7 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => { }, title: { color: theme.centerChannelColor, - fontWeight: '600', + fontFamily: 'OpenSans-Semibold', marginBottom: 5, fontSize: 14, lineHeight: 20, diff --git a/app/components/post_list/post/body/content/message_attachments/action_button/index.tsx b/app/components/post_list/post/body/content/message_attachments/action_button/index.tsx index c9fb5c36eb..382eb76060 100644 --- a/app/components/post_list/post/body/content/message_attachments/action_button/index.tsx +++ b/app/components/post_list/post/body/content/message_attachments/action_button/index.tsx @@ -41,7 +41,7 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => { text: { color: STATUS_COLORS.default, fontSize: 15, - fontWeight: '600', + fontFamily: 'OpenSans-Semibold', lineHeight: 17, }, }; diff --git a/app/components/post_list/post/body/content/message_attachments/attachment_fields.tsx b/app/components/post_list/post/body/content/message_attachments/attachment_fields.tsx index 0c6522726a..24d325a7f5 100644 --- a/app/components/post_list/post/body/content/message_attachments/attachment_fields.tsx +++ b/app/components/post_list/post/body/content/message_attachments/attachment_fields.tsx @@ -35,7 +35,7 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => { }, heading: { color: theme.centerChannelColor, - fontWeight: '600', + fontFamily: 'OpenSans-Semibold', }, table: { flex: 1, diff --git a/app/components/post_list/post/body/content/message_attachments/attachment_title.tsx b/app/components/post_list/post/body/content/message_attachments/attachment_title.tsx index e177a237e1..a92e0201d0 100644 --- a/app/components/post_list/post/body/content/message_attachments/attachment_title.tsx +++ b/app/components/post_list/post/body/content/message_attachments/attachment_title.tsx @@ -26,7 +26,7 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => { title: { color: theme.centerChannelColor, fontSize: 14, - fontWeight: '600', + fontFamily: 'OpenSans-Semibold', lineHeight: 20, marginBottom: 5, }, diff --git a/app/components/post_list/post/body/files/file_info.tsx b/app/components/post_list/post/body/files/file_info.tsx index 1ee077dd77..ff41098fa4 100644 --- a/app/components/post_list/post/body/files/file_info.tsx +++ b/app/components/post_list/post/body/files/file_info.tsx @@ -32,7 +32,7 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => { flexDirection: 'column', flexWrap: 'wrap', fontSize: 14, - fontWeight: '600', + fontFamily: 'OpenSans-Semibold', color: theme.centerChannelColor, paddingRight: 10, }, diff --git a/app/components/post_list/post/body/message/message.tsx b/app/components/post_list/post/body/message/message.tsx index d5f0086619..726743acd4 100644 --- a/app/components/post_list/post/body/message/message.tsx +++ b/app/components/post_list/post/body/message/message.tsx @@ -42,8 +42,9 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => { }, message: { color: theme.centerChannelColor, - fontSize: 15, - lineHeight: 20, + fontFamily: 'OpenSans', + fontSize: 16, + lineHeight: 24, }, pendingPost: { opacity: 0.5, diff --git a/app/components/post_list/post/header/display_name/index.tsx b/app/components/post_list/post/header/display_name/index.tsx index c419c9c009..0a83f7dbba 100644 --- a/app/components/post_list/post/header/display_name/index.tsx +++ b/app/components/post_list/post/header/display_name/index.tsx @@ -28,15 +28,14 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => { return { displayName: { color: theme.centerChannelColor, - fontSize: 15, - fontWeight: '600', + fontFamily: 'OpenSans-Semibold', + fontSize: 16, + lineHeight: 24, flexGrow: 1, - paddingVertical: 2, }, displayNameContainer: { maxWidth: '60%', marginRight: 5, - marginBottom: 3, }, displayNameContainerBotReplyWidth: { maxWidth: '50%', diff --git a/app/components/post_list/post/header/header.tsx b/app/components/post_list/post/header/header.tsx index de57551dad..0298cd6c66 100644 --- a/app/components/post_list/post/header/header.tsx +++ b/app/components/post_list/post/header/header.tsx @@ -56,6 +56,7 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => { time: { color: theme.centerChannelColor, fontSize: 12, + lineHeight: 16, marginTop: 5, opacity: 0.5, flex: 1, diff --git a/app/components/post_list/post/system_message/__snapshots__/system_message_helpers.test.js.snap b/app/components/post_list/post/system_message/__snapshots__/system_message_helpers.test.js.snap index f9553fe580..e600f34494 100644 --- a/app/components/post_list/post/system_message/__snapshots__/system_message_helpers.test.js.snap +++ b/app/components/post_list/post/system_message/__snapshots__/system_message_helpers.test.js.snap @@ -18,7 +18,7 @@ exports[`renderSystemMessage uses renderer for Channel Display Name update 1`] = Array [ Object { "color": "rgba(63,67,80,0.6)", - "fontSize": 15, + "fontSize": 16, "lineHeight": 20, }, Object { @@ -37,7 +37,7 @@ exports[`renderSystemMessage uses renderer for Channel Display Name update 1`] = style={ Object { "color": "rgba(63,67,80,0.6)", - "fontSize": 15, + "fontSize": 16, "lineHeight": 20, } } @@ -67,7 +67,7 @@ exports[`renderSystemMessage uses renderer for Channel Header update 1`] = ` Array [ Object { "color": "rgba(63,67,80,0.6)", - "fontSize": 15, + "fontSize": 16, "lineHeight": 20, }, Object { @@ -86,7 +86,7 @@ exports[`renderSystemMessage uses renderer for Channel Header update 1`] = ` style={ Object { "color": "rgba(63,67,80,0.6)", - "fontSize": 15, + "fontSize": 16, "lineHeight": 20, } } @@ -103,7 +103,7 @@ exports[`renderSystemMessage uses renderer for Channel Purpose update 1`] = ` style={ Object { "color": "rgba(63,67,80,0.6)", - "fontSize": 15, + "fontSize": 16, "lineHeight": 20, } } @@ -130,7 +130,7 @@ exports[`renderSystemMessage uses renderer for Guest added and join to channel 1 Array [ Object { "color": "rgba(63,67,80,0.6)", - "fontSize": 15, + "fontSize": 16, "lineHeight": 20, }, Object { @@ -149,7 +149,7 @@ exports[`renderSystemMessage uses renderer for Guest added and join to channel 1 style={ Object { "color": "rgba(63,67,80,0.6)", - "fontSize": 15, + "fontSize": 16, "lineHeight": 20, } } @@ -179,7 +179,7 @@ exports[`renderSystemMessage uses renderer for Guest added and join to channel 2 Array [ Object { "color": "rgba(63,67,80,0.6)", - "fontSize": 15, + "fontSize": 16, "lineHeight": 20, }, Object { @@ -198,7 +198,7 @@ exports[`renderSystemMessage uses renderer for Guest added and join to channel 2 style={ Object { "color": "rgba(63,67,80,0.6)", - "fontSize": 15, + "fontSize": 16, "lineHeight": 20, } } @@ -211,7 +211,7 @@ exports[`renderSystemMessage uses renderer for Guest added and join to channel 2 Array [ Object { "color": "rgba(63,67,80,0.6)", - "fontSize": 15, + "fontSize": 16, "lineHeight": 20, }, Object { @@ -247,7 +247,7 @@ exports[`renderSystemMessage uses renderer for OLD archived channel without a us style={ Object { "color": "rgba(63,67,80,0.6)", - "fontSize": 15, + "fontSize": 16, "lineHeight": 20, } } @@ -277,7 +277,7 @@ exports[`renderSystemMessage uses renderer for archived channel 1`] = ` Array [ Object { "color": "rgba(63,67,80,0.6)", - "fontSize": 15, + "fontSize": 16, "lineHeight": 20, }, Object { @@ -296,7 +296,7 @@ exports[`renderSystemMessage uses renderer for archived channel 1`] = ` style={ Object { "color": "rgba(63,67,80,0.6)", - "fontSize": 15, + "fontSize": 16, "lineHeight": 20, } } @@ -326,7 +326,7 @@ exports[`renderSystemMessage uses renderer for unarchived channel 1`] = ` Array [ Object { "color": "rgba(63,67,80,0.6)", - "fontSize": 15, + "fontSize": 16, "lineHeight": 20, }, Object { @@ -345,7 +345,7 @@ exports[`renderSystemMessage uses renderer for unarchived channel 1`] = ` style={ Object { "color": "rgba(63,67,80,0.6)", - "fontSize": 15, + "fontSize": 16, "lineHeight": 20, } } diff --git a/app/components/post_list/post/system_message/system_message.tsx b/app/components/post_list/post/system_message/system_message.tsx index 5f5320644a..1f029219cb 100644 --- a/app/components/post_list/post/system_message/system_message.tsx +++ b/app/components/post_list/post/system_message/system_message.tsx @@ -46,7 +46,7 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => { return { systemMessage: { color: changeOpacity(theme.centerChannelColor, 0.6), - fontSize: 15, + fontSize: 16, lineHeight: 20, }, }; diff --git a/app/components/system_header/index.tsx b/app/components/system_header/index.tsx index 28e294cf31..7bbdfc3352 100644 --- a/app/components/system_header/index.tsx +++ b/app/components/system_header/index.tsx @@ -40,7 +40,7 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => { displayName: { color: theme.centerChannelColor, fontSize: 15, - fontWeight: '600', + fontFamily: 'OpenSans-Semibold', flexGrow: 1, paddingVertical: 2, }, diff --git a/app/components/tag/index.tsx b/app/components/tag/index.tsx index ddf1306c3c..19343e91ae 100644 --- a/app/components/tag/index.tsx +++ b/app/components/tag/index.tsx @@ -32,8 +32,8 @@ const getStyleFromTheme = makeStyleSheetFromTheme((theme: Theme) => { }, text: { color: theme.centerChannelColor, + fontFamily: 'OpenSans-Semibold', fontSize: 10, - fontWeight: '600', }, title: { backgroundColor: changeOpacity(theme.sidebarHeaderTextColor, 0.15), diff --git a/app/screens/about/index.tsx b/app/screens/about/index.tsx index 00e9dee474..15bb7634cb 100644 --- a/app/screens/about/index.tsx +++ b/app/screens/about/index.tsx @@ -320,7 +320,7 @@ const getStyleSheet = makeStyleSheetFromTheme((theme) => { footerTitleText: { color: changeOpacity(theme.centerChannelColor, 0.5), fontSize: 11, - fontWeight: '600', + fontFamily: 'OpenSans-Semibold', lineHeight: 13, }, footerText: { diff --git a/app/screens/channel/channel_nav_bar/channel_title/channel_display_name/index.tsx b/app/screens/channel/channel_nav_bar/channel_title/channel_display_name/index.tsx index 6431af1e4f..36b1d05ebf 100644 --- a/app/screens/channel/channel_nav_bar/channel_title/channel_display_name/index.tsx +++ b/app/screens/channel/channel_nav_bar/channel_title/channel_display_name/index.tsx @@ -46,7 +46,7 @@ const getStyle = makeStyleSheetFromTheme((theme) => { text: { color: theme.sidebarHeaderTextColor, fontSize: 18, - fontWeight: 'bold', + fontFamily: 'OpenSans-Semibold', textAlign: 'center', flex: 0, flexShrink: 1, diff --git a/app/screens/channel/channel_nav_bar/channel_title/index.tsx b/app/screens/channel/channel_nav_bar/channel_title/index.tsx index d162950802..b89121c89c 100644 --- a/app/screens/channel/channel_nav_bar/channel_title/index.tsx +++ b/app/screens/channel/channel_nav_bar/channel_title/index.tsx @@ -141,7 +141,7 @@ const getStyle = makeStyleSheetFromTheme((theme) => { text: { color: theme.sidebarHeaderTextColor, fontSize: 18, - fontWeight: 'bold', + fontFamily: 'OpenSans-Semibold', textAlign: 'center', flex: 0, flexShrink: 1, diff --git a/app/screens/channel/index.tsx b/app/screens/channel/index.tsx index e7b7491b83..226dbacbc3 100644 --- a/app/screens/channel/index.tsx +++ b/app/screens/channel/index.tsx @@ -45,7 +45,7 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => ({ }, sectionTitle: { fontSize: 16, - fontWeight: '600', + fontFamily: 'OpenSans-Semibold', color: theme.centerChannelColor, }, })); diff --git a/app/screens/forgot_password/index.tsx b/app/screens/forgot_password/index.tsx index 05ea25edb8..67b11fb429 100644 --- a/app/screens/forgot_password/index.tsx +++ b/app/screens/forgot_password/index.tsx @@ -173,7 +173,7 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => ({ borderColor: '#d6e9c6', }, emailId: { - fontWeight: 'bold', + fontFamily: 'OpenSans-Semibold', }, successTxtColor: { color: '#3c763d', diff --git a/app/screens/home/channel_list/index.tsx b/app/screens/home/channel_list/index.tsx index 05c0abecfa..8c5a27722b 100644 --- a/app/screens/home/channel_list/index.tsx +++ b/app/screens/home/channel_list/index.tsx @@ -34,7 +34,7 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => ({ }, sectionTitle: { fontSize: 24, - fontWeight: '600', + fontFamily: 'OpenSans-Semibold', color: theme.centerChannelColor, }, })); diff --git a/app/screens/home/tab_bar/home.tsx b/app/screens/home/tab_bar/home.tsx index 72f729465f..9c965039f9 100644 --- a/app/screens/home/tab_bar/home.tsx +++ b/app/screens/home/tab_bar/home.tsx @@ -43,8 +43,7 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => ({ }, mentions: { fontSize: 10, - fontWeight: 'bold', - fontFamily: 'Open Sans', + fontFamily: 'OpenSans-Semibold', lineHeight: Platform.select({android: 15, ios: 12.6}), borderColor: theme.centerChannelBg, borderWidth: 2, diff --git a/app/screens/login/index.tsx b/app/screens/login/index.tsx index 0dda020314..15135fdd11 100644 --- a/app/screens/login/index.tsx +++ b/app/screens/login/index.tsx @@ -466,7 +466,7 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => ({ marginTop: 15, marginBottom: 15, fontSize: 32, - fontWeight: '600', + fontFamily: 'OpenSans-Semibold', }, })); diff --git a/app/screens/login_options/index.tsx b/app/screens/login_options/index.tsx index a18d7e5a3d..ddcb603a9d 100644 --- a/app/screens/login_options/index.tsx +++ b/app/screens/login_options/index.tsx @@ -41,7 +41,7 @@ const getStyles = makeStyleSheetFromTheme((theme: Theme) => ({ marginTop: 15, marginBottom: 15, fontSize: 32, - fontWeight: '600', + fontFamily: 'OpenSans-Semibold', }, subheader: { textAlign: 'center', diff --git a/app/screens/mfa/__snapshots__/mfa.test.tsx.snap b/app/screens/mfa/__snapshots__/mfa.test.tsx.snap index 96bdbfee54..8c173a54a3 100644 --- a/app/screens/mfa/__snapshots__/mfa.test.tsx.snap +++ b/app/screens/mfa/__snapshots__/mfa.test.tsx.snap @@ -66,8 +66,8 @@ exports[`*** MFA Screen *** MFA screen should match snapshot 1`] = ` Array [ Object { "color": "#3f4350", + "fontFamily": "OpenSans-Semibold", "fontSize": 32, - "fontWeight": "600", "marginBottom": 15, "marginTop": 15, "textAlign": "center", @@ -75,7 +75,6 @@ exports[`*** MFA Screen *** MFA screen should match snapshot 1`] = ` Object { "color": "rgba(63,67,80,0.6)", "fontSize": 20, - "fontWeight": "400", }, ] } diff --git a/app/screens/mfa/index.tsx b/app/screens/mfa/index.tsx index 3244e7b080..10c65f6948 100644 --- a/app/screens/mfa/index.tsx +++ b/app/screens/mfa/index.tsx @@ -209,12 +209,11 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => ({ marginTop: 15, marginBottom: 15, fontSize: 32, - fontWeight: '600', + fontFamily: 'OpenSans-Semibold', }, label: { color: changeOpacity(theme.centerChannelColor, 0.6), fontSize: 20, - fontWeight: '400', }, container: { flex: 1, diff --git a/app/screens/server/index.tsx b/app/screens/server/index.tsx index b9b4911175..694d25b3e8 100644 --- a/app/screens/server/index.tsx +++ b/app/screens/server/index.tsx @@ -401,7 +401,6 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => ({ marginTop: 15, marginBottom: 15, fontSize: 20, - fontWeight: '400', }, connectText: { textAlign: 'center', diff --git a/app/screens/sso/sso_with_redirect_url.tsx b/app/screens/sso/sso_with_redirect_url.tsx index 923c57924f..e036d750a8 100644 --- a/app/screens/sso/sso_with_redirect_url.tsx +++ b/app/screens/sso/sso_with_redirect_url.tsx @@ -146,7 +146,6 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => { errorText: { color: changeOpacity(theme.centerChannelColor, 0.6), fontSize: 16, - fontWeight: '400', lineHeight: 23, textAlign: 'center', }, @@ -159,7 +158,6 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => { infoText: { color: changeOpacity(theme.centerChannelColor, 0.6), fontSize: 16, - fontWeight: '400', lineHeight: 23, marginBottom: 6, }, diff --git a/app/screens/sso/sso_with_webview.tsx b/app/screens/sso/sso_with_webview.tsx index a3b24dee42..f6a5da2f52 100644 --- a/app/screens/sso/sso_with_webview.tsx +++ b/app/screens/sso/sso_with_webview.tsx @@ -253,7 +253,6 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => { errorText: { color: changeOpacity(theme.centerChannelColor, 0.4), fontSize: 16, - fontWeight: '400', lineHeight: 23, paddingHorizontal: 30, }, diff --git a/app/utils/font_family.ts b/app/utils/font_family.ts index 765fec89af..5da2abb6f2 100644 --- a/app/utils/font_family.ts +++ b/app/utils/font_family.ts @@ -14,7 +14,7 @@ import {StyleSheet, Text} from 'react-native'; const setFontFamily = () => { const styles = StyleSheet.create({ defaultText: { - fontFamily: 'Open Sans', + fontFamily: 'OpenSans', fontSize: 16, }, }); diff --git a/app/utils/markdown/index.ts b/app/utils/markdown/index.ts index 56bc2813ca..f52a22f1c3 100644 --- a/app/utils/markdown/index.ts +++ b/app/utils/markdown/index.ts @@ -14,60 +14,61 @@ export const getMarkdownTextStyles = makeStyleSheetFromTheme((theme: Theme) => { return { emph: { - fontStyle: 'italic', + fontFamily: 'OpenSans-Italic', }, strong: { - fontWeight: 'bold', + fontFamily: 'OpenSans-Semibold', }, del: { textDecorationLine: 'line-through', }, link: { color: theme.linkColor, + fontFamily: 'OpenSans', }, heading1: { - fontSize: 22, - fontWeight: '700', + fontFamily: 'OpenSans-Bold', + fontSize: 24, lineHeight: 25, }, heading1Text: { paddingBottom: 8, }, heading2: { - fontSize: 20, - fontWeight: '700', + fontFamily: 'OpenSans-Bold', + fontSize: 22, lineHeight: 25, }, heading2Text: { paddingBottom: 8, }, heading3: { - fontSize: 19, - fontWeight: '700', + fontFamily: 'OpenSans-Bold', + fontSize: 21, lineHeight: 25, }, heading3Text: { paddingBottom: 8, }, heading4: { - fontSize: 18, - fontWeight: '700', + fontFamily: 'OpenSans-Bold', + fontSize: 20, lineHeight: 25, }, heading4Text: { paddingBottom: 8, }, heading5: { - fontSize: 17, - fontWeight: '700', + fontFamily: 'OpenSans-Bold', + fontSize: 19, lineHeight: 25, }, heading5Text: { paddingBottom: 8, }, heading6: { - fontSize: 16, - fontWeight: '700', + fontFamily: 'OpenSans-Bold', + fontSize: 18, lineHeight: 25, }, heading6Text: { @@ -82,15 +83,18 @@ export const getMarkdownTextStyles = makeStyleSheetFromTheme((theme: Theme) => { fontFamily: codeFont, }, mention: { + fontFamily: 'OpenSans', color: theme.linkColor, }, error: { + fontFamily: 'OpenSans', color: theme.errorTextColor, }, table_header_row: { - fontWeight: '700', + fontFamily: 'OpenSans-Bold', }, mention_highlight: { + fontFamily: 'OpenSans', backgroundColor: theme.mentionHighlightBg, color: theme.mentionHighlightLink, }, diff --git a/assets/fonts/Metropolis-Light.ttf b/assets/fonts/Metropolis-Light.ttf new file mode 100644 index 0000000000..64a0c83a42 Binary files /dev/null and b/assets/fonts/Metropolis-Light.ttf differ diff --git a/assets/fonts/Metropolis-Regular.ttf b/assets/fonts/Metropolis-Regular.ttf new file mode 100644 index 0000000000..012acd813f Binary files /dev/null and b/assets/fonts/Metropolis-Regular.ttf differ diff --git a/assets/fonts/Metropolis-Semibold.ttf b/assets/fonts/Metropolis-Semibold.ttf new file mode 100644 index 0000000000..2f7522d57c Binary files /dev/null and b/assets/fonts/Metropolis-Semibold.ttf differ diff --git a/ios/Mattermost.xcodeproj/project.pbxproj b/ios/Mattermost.xcodeproj/project.pbxproj index 2ba215847f..639a674e02 100644 --- a/ios/Mattermost.xcodeproj/project.pbxproj +++ b/ios/Mattermost.xcodeproj/project.pbxproj @@ -31,6 +31,9 @@ 7F240A23220D3A2300637665 /* MattermostShare.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 7F240A19220D3A2300637665 /* MattermostShare.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; 7F240ADB220E089300637665 /* Item.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F240ADA220E089300637665 /* Item.swift */; }; 7F240ADD220E094A00637665 /* TeamsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F240ADC220E094A00637665 /* TeamsViewController.swift */; }; + 7F25B62D270F717F00F32373 /* Metropolis-Light.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 7F25B626270F666D00F32373 /* Metropolis-Light.ttf */; }; + 7F25B62E270F718300F32373 /* Metropolis-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 7F25B628270F666D00F32373 /* Metropolis-Regular.ttf */; }; + 7F25B632270F825700F32373 /* Metropolis-Semibold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 7F25B631270F824E00F32373 /* Metropolis-Semibold.ttf */; }; 7F292A711E8AB73400A450A3 /* SplashScreenResource in Resources */ = {isa = PBXBuildFile; fileRef = 7F292A701E8AB73400A450A3 /* SplashScreenResource */; }; 7F581D35221ED5C60099E66B /* NotificationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F581D34221ED5C60099E66B /* NotificationService.swift */; }; 7F581D39221ED5C60099E66B /* NotificationService.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 7F581D32221ED5C60099E66B /* NotificationService.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; @@ -124,10 +127,7 @@ /* Begin PBXFileReference section */ 00E356F11AD99517003FC87E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 00E356F21AD99517003FC87E /* MattermostTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MattermostTests.m; sourceTree = ""; }; - 031EF04FB2D14EEFAACBAA1A /* Roboto-Italic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Roboto-Italic.ttf"; path = "../assets/fonts/Roboto-Italic.ttf"; sourceTree = ""; }; - 09FA716C56874BDDA30FE8C4 /* Roboto-Medium.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Roboto-Medium.ttf"; path = "../assets/fonts/Roboto-Medium.ttf"; sourceTree = ""; }; 0E617BF0F36D4E738F51D169 /* OpenSans-SemiboldItalic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "OpenSans-SemiboldItalic.ttf"; path = "../assets/fonts/OpenSans-SemiboldItalic.ttf"; sourceTree = ""; }; - 12D0B0E475FD46E29907305E /* Roboto-ThinItalic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Roboto-ThinItalic.ttf"; path = "../assets/fonts/Roboto-ThinItalic.ttf"; sourceTree = ""; }; 13B07F961A680F5B00A75B9A /* Mattermost.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Mattermost.app; sourceTree = BUILT_PRODUCTS_DIR; }; 13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = Mattermost/AppDelegate.h; sourceTree = ""; }; 13B07FB01A68108700A75B9A /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = Mattermost/AppDelegate.m; sourceTree = ""; }; @@ -138,7 +138,6 @@ 25BF2BACE89201DE6E585B7E /* Pods-Mattermost.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Mattermost.release.xcconfig"; path = "Target Support Files/Pods-Mattermost/Pods-Mattermost.release.xcconfig"; sourceTree = ""; }; 297AAFCCF0BD99FC109DA2BC /* Pods-MattermostTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MattermostTests.release.xcconfig"; path = "Target Support Files/Pods-MattermostTests/Pods-MattermostTests.release.xcconfig"; sourceTree = ""; }; 32AC3D4EA79E44738A6E9766 /* OpenSans-BoldItalic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "OpenSans-BoldItalic.ttf"; path = "../assets/fonts/OpenSans-BoldItalic.ttf"; sourceTree = ""; }; - 34B20A903038487E8D7DEA1E /* Roboto-Light.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Roboto-Light.ttf"; path = "../assets/fonts/Roboto-Light.ttf"; sourceTree = ""; }; 3647DF63D6764CF093375861 /* OpenSans-ExtraBold.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "OpenSans-ExtraBold.ttf"; path = "../assets/fonts/OpenSans-ExtraBold.ttf"; sourceTree = ""; }; 41F3AFE83AAF4B74878AB78A /* OpenSans-Italic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "OpenSans-Italic.ttf"; path = "../assets/fonts/OpenSans-Italic.ttf"; sourceTree = ""; }; 4953BF5F2368AE8600593328 /* SwimeProxy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = SwimeProxy.swift; path = Mattermost/SwimeProxy.swift; sourceTree = ""; }; @@ -154,8 +153,6 @@ 57CB4735B7E57B50D0B50E16 /* Pods-MattermostTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MattermostTests.debug.xcconfig"; path = "Target Support Files/Pods-MattermostTests/Pods-MattermostTests.debug.xcconfig"; sourceTree = ""; }; 6561AEAC21CC40B8A72ABB93 /* OpenSans-Light.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "OpenSans-Light.ttf"; path = "../assets/fonts/OpenSans-Light.ttf"; sourceTree = ""; }; 6BAF8296411D4657B5A0E8F8 /* libRNReactNativeDocViewer.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNReactNativeDocViewer.a; sourceTree = ""; }; - 6EFF13DD24CE4E26953E598A /* Roboto-Black.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Roboto-Black.ttf"; path = "../assets/fonts/Roboto-Black.ttf"; sourceTree = ""; }; - 71E626D4980A4560B26F0E1C /* Roboto-Bold.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Roboto-Bold.ttf"; path = "../assets/fonts/Roboto-Bold.ttf"; sourceTree = ""; }; 7F0F4B0924BA173900E14C60 /* LaunchScreen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = SplashScreenResource/LaunchScreen.storyboard; sourceTree = ""; }; 7F151D3D221B062700FAD8F3 /* RuntimeUtils.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = RuntimeUtils.swift; path = Mattermost/RuntimeUtils.swift; sourceTree = ""; }; 7F151D42221B07F700FAD8F3 /* MattermostShare-Bridging-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "MattermostShare-Bridging-Header.h"; sourceTree = ""; }; @@ -167,10 +164,12 @@ 7F240A27220D3A7E00637665 /* MattermostShare.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = MattermostShare.entitlements; sourceTree = ""; }; 7F240ADA220E089300637665 /* Item.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Item.swift; sourceTree = ""; }; 7F240ADC220E094A00637665 /* TeamsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TeamsViewController.swift; sourceTree = ""; }; + 7F25B626270F666D00F32373 /* Metropolis-Light.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Metropolis-Light.ttf"; path = "../assets/fonts/Metropolis-Light.ttf"; sourceTree = ""; }; + 7F25B628270F666D00F32373 /* Metropolis-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Metropolis-Regular.ttf"; path = "../assets/fonts/Metropolis-Regular.ttf"; sourceTree = ""; }; + 7F25B631270F824E00F32373 /* Metropolis-Semibold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Metropolis-Semibold.ttf"; path = "../assets/fonts/Metropolis-Semibold.ttf"; sourceTree = ""; }; 7F292A701E8AB73400A450A3 /* SplashScreenResource */ = {isa = PBXFileReference; lastKnownFileType = folder; path = SplashScreenResource; sourceTree = ""; }; 7F325D6DAAF1047EB948EFF7 /* Pods-Mattermost-MattermostTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Mattermost-MattermostTests.debug.xcconfig"; path = "Target Support Files/Pods-Mattermost-MattermostTests/Pods-Mattermost-MattermostTests.debug.xcconfig"; sourceTree = ""; }; 7F43D6051F6BF9EB001FC614 /* libPods-Mattermost.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libPods-Mattermost.a"; path = "../../../../../../../Library/Developer/Xcode/DerivedData/Mattermost-czlinsdviifujheezzjvmisotjrm/Build/Products/Debug-iphonesimulator/libPods-Mattermost.a"; sourceTree = ""; }; - 7F54ABFAE6CE4A6DB11D1ED7 /* Roboto-BlackItalic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Roboto-BlackItalic.ttf"; path = "../assets/fonts/Roboto-BlackItalic.ttf"; sourceTree = ""; }; 7F581D32221ED5C60099E66B /* NotificationService.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = NotificationService.appex; sourceTree = BUILT_PRODUCTS_DIR; }; 7F581D34221ED5C60099E66B /* NotificationService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationService.swift; sourceTree = ""; }; 7F581D36221ED5C60099E66B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; @@ -200,14 +199,9 @@ 81061F4CBB31484A94D5A8EE /* libz.tbd */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; }; 84E325FF229834C30055068A /* Config.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Config.swift; sourceTree = ""; }; 8DEEFB3ED6175724A2653247 /* libPods-Mattermost.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Mattermost.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - 8F0B22D2C9924FAFA7FB681C /* Roboto-LightItalic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Roboto-LightItalic.ttf"; path = "../assets/fonts/Roboto-LightItalic.ttf"; sourceTree = ""; }; - A734E00E7E184582A877F2B3 /* Roboto-Thin.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Roboto-Thin.ttf"; path = "../assets/fonts/Roboto-Thin.ttf"; sourceTree = ""; }; BC977883E2624E05975CA65B /* OpenSans-Regular.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "OpenSans-Regular.ttf"; path = "../assets/fonts/OpenSans-Regular.ttf"; sourceTree = ""; }; BE17F630DB5D41FD93F32D22 /* OpenSans-LightItalic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "OpenSans-LightItalic.ttf"; path = "../assets/fonts/OpenSans-LightItalic.ttf"; sourceTree = ""; }; - C46342B0E5FD4D878AF3A129 /* Roboto-BoldItalic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Roboto-BoldItalic.ttf"; path = "../assets/fonts/Roboto-BoldItalic.ttf"; sourceTree = ""; }; - C5BD64DE829E455A997DCAD5 /* Roboto-Regular.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Roboto-Regular.ttf"; path = "../assets/fonts/Roboto-Regular.ttf"; sourceTree = ""; }; C78A387124874496AD2C1466 /* OpenSans-Semibold.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "OpenSans-Semibold.ttf"; path = "../assets/fonts/OpenSans-Semibold.ttf"; sourceTree = ""; }; - D08F54E10DF14AE4BBF4E2B4 /* Roboto-MediumItalic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Roboto-MediumItalic.ttf"; path = "../assets/fonts/Roboto-MediumItalic.ttf"; sourceTree = ""; }; D4B1B363C2414DA19C1AC521 /* OpenSans-Bold.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "OpenSans-Bold.ttf"; path = "../assets/fonts/OpenSans-Bold.ttf"; sourceTree = ""; }; EB4F0DF36537B0B21BE962FB /* Pods-Mattermost.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Mattermost.debug.xcconfig"; path = "Target Support Files/Pods-Mattermost/Pods-Mattermost.debug.xcconfig"; sourceTree = ""; }; F41672974C2907F74BB59B16 /* libPods-Mattermost-MattermostTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Mattermost-MattermostTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -266,6 +260,9 @@ 0156F464626F49C2977D7982 /* Resources */ = { isa = PBXGroup; children = ( + 7F25B626270F666D00F32373 /* Metropolis-Light.ttf */, + 7F25B628270F666D00F32373 /* Metropolis-Regular.ttf */, + 7F25B631270F824E00F32373 /* Metropolis-Semibold.ttf */, D4B1B363C2414DA19C1AC521 /* OpenSans-Bold.ttf */, 32AC3D4EA79E44738A6E9766 /* OpenSans-BoldItalic.ttf */, 3647DF63D6764CF093375861 /* OpenSans-ExtraBold.ttf */, @@ -277,18 +274,6 @@ C78A387124874496AD2C1466 /* OpenSans-Semibold.ttf */, 0E617BF0F36D4E738F51D169 /* OpenSans-SemiboldItalic.ttf */, 531BEBC52513E93C00BC05B1 /* compass-icons.ttf */, - 6EFF13DD24CE4E26953E598A /* Roboto-Black.ttf */, - 7F54ABFAE6CE4A6DB11D1ED7 /* Roboto-BlackItalic.ttf */, - 71E626D4980A4560B26F0E1C /* Roboto-Bold.ttf */, - C46342B0E5FD4D878AF3A129 /* Roboto-BoldItalic.ttf */, - 031EF04FB2D14EEFAACBAA1A /* Roboto-Italic.ttf */, - 34B20A903038487E8D7DEA1E /* Roboto-Light.ttf */, - 8F0B22D2C9924FAFA7FB681C /* Roboto-LightItalic.ttf */, - 09FA716C56874BDDA30FE8C4 /* Roboto-Medium.ttf */, - D08F54E10DF14AE4BBF4E2B4 /* Roboto-MediumItalic.ttf */, - C5BD64DE829E455A997DCAD5 /* Roboto-Regular.ttf */, - A734E00E7E184582A877F2B3 /* Roboto-Thin.ttf */, - 12D0B0E475FD46E29907305E /* Roboto-ThinItalic.ttf */, ); name = Resources; sourceTree = ""; @@ -622,6 +607,9 @@ 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */, 7F0F4B0A24BA173900E14C60 /* LaunchScreen.storyboard in Resources */, 7F292A711E8AB73400A450A3 /* SplashScreenResource in Resources */, + 7F25B62D270F717F00F32373 /* Metropolis-Light.ttf in Resources */, + 7F25B62E270F718300F32373 /* Metropolis-Regular.ttf in Resources */, + 7F25B632270F825700F32373 /* Metropolis-Semibold.ttf in Resources */, 9358B95F95184EE0A4DCE629 /* OpenSans-Bold.ttf in Resources */, 55C6561DDBBA45929D88B6D1 /* OpenSans-BoldItalic.ttf in Resources */, D719A67137964F08BE47A5FC /* OpenSans-ExtraBold.ttf in Resources */, diff --git a/ios/Mattermost/Info.plist b/ios/Mattermost/Info.plist index b429db41b1..bda636f611 100644 --- a/ios/Mattermost/Info.plist +++ b/ios/Mattermost/Info.plist @@ -95,20 +95,10 @@ OpenSans-Regular.ttf OpenSans-Semibold.ttf OpenSans-SemiboldItalic.ttf - Roboto-Black.ttf - Roboto-BlackItalic.ttf - Roboto-Bold.ttf - Roboto-BoldItalic.ttf - Roboto-Italic.ttf - Roboto-Light.ttf - Roboto-LightItalic.ttf - Roboto-Medium.ttf - Roboto-MediumItalic.ttf - Roboto-Regular.ttf - Roboto-Thin.ttf - Roboto-ThinItalic.ttf + Metropolis-Regular.ttf + Metropolis-Semibold.ttf + Metropolis-Light.ttf compass-icons.ttf - Mattermost-Regular.otf UIBackgroundModes diff --git a/share_extension/index.tsx b/share_extension/index.tsx index 47cd573f63..a3e110825d 100644 --- a/share_extension/index.tsx +++ b/share_extension/index.tsx @@ -86,7 +86,7 @@ const styles = StyleSheet.create({ }, sectionTitle: { fontSize: 24, - fontWeight: '600', + fontFamily: 'OpenSans-Semibold', color: Colors.black, }, sectionDescription: { @@ -96,7 +96,7 @@ const styles = StyleSheet.create({ color: Colors.dark, }, highlight: { - fontWeight: '700', + fontFamily: 'OpenSans-Bold', }, footer: { color: Colors.dark,