From bbb8a4f148cf4da365c2d37a887c9d0540cb838c Mon Sep 17 00:00:00 2001 From: Mattermost Build Date: Thu, 31 Oct 2019 16:30:53 +0100 Subject: [PATCH] Reverted mention color to user linkColor (#3502) --- .../channel_info_header.test.js.snap | 24 +++++++++---------- .../dialog_introduction_text.test.js.snap | 2 +- .../terms_of_service.test.js.snap | 6 ++--- app/utils/markdown.js | 2 +- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/app/screens/channel_info/__snapshots__/channel_info_header.test.js.snap b/app/screens/channel_info/__snapshots__/channel_info_header.test.js.snap index 0122d3937..fb15b08cf 100644 --- a/app/screens/channel_info/__snapshots__/channel_info_header.test.js.snap +++ b/app/screens/channel_info/__snapshots__/channel_info_header.test.js.snap @@ -212,7 +212,7 @@ exports[`channel_info_header should match snapshot 1`] = ` "color": "#2389d7", }, "mention": Object { - "color": "#166de0", + "color": "#2389d7", }, "mention_highlight": Object { "backgroundColor": "#ffe577", @@ -363,7 +363,7 @@ exports[`channel_info_header should match snapshot 1`] = ` "color": "#2389d7", }, "mention": Object { - "color": "#166de0", + "color": "#2389d7", }, "mention_highlight": Object { "backgroundColor": "#ffe577", @@ -656,7 +656,7 @@ exports[`channel_info_header should match snapshot when DM and hasGuests and is "color": "#2389d7", }, "mention": Object { - "color": "#166de0", + "color": "#2389d7", }, "mention_highlight": Object { "backgroundColor": "#ffe577", @@ -807,7 +807,7 @@ exports[`channel_info_header should match snapshot when DM and hasGuests and is "color": "#2389d7", }, "mention": Object { - "color": "#166de0", + "color": "#2389d7", }, "mention_highlight": Object { "backgroundColor": "#ffe577", @@ -1072,7 +1072,7 @@ exports[`channel_info_header should match snapshot when DM and hasGuests but its "color": "#2389d7", }, "mention": Object { - "color": "#166de0", + "color": "#2389d7", }, "mention_highlight": Object { "backgroundColor": "#ffe577", @@ -1223,7 +1223,7 @@ exports[`channel_info_header should match snapshot when DM and hasGuests but its "color": "#2389d7", }, "mention": Object { - "color": "#166de0", + "color": "#2389d7", }, "mention_highlight": Object { "backgroundColor": "#ffe577", @@ -1516,7 +1516,7 @@ exports[`channel_info_header should match snapshot when GM and hasGuests 1`] = ` "color": "#2389d7", }, "mention": Object { - "color": "#166de0", + "color": "#2389d7", }, "mention_highlight": Object { "backgroundColor": "#ffe577", @@ -1667,7 +1667,7 @@ exports[`channel_info_header should match snapshot when GM and hasGuests 1`] = ` "color": "#2389d7", }, "mention": Object { - "color": "#166de0", + "color": "#2389d7", }, "mention_highlight": Object { "backgroundColor": "#ffe577", @@ -1932,7 +1932,7 @@ exports[`channel_info_header should match snapshot when is group constrained 1`] "color": "#2389d7", }, "mention": Object { - "color": "#166de0", + "color": "#2389d7", }, "mention_highlight": Object { "backgroundColor": "#ffe577", @@ -2083,7 +2083,7 @@ exports[`channel_info_header should match snapshot when is group constrained 1`] "color": "#2389d7", }, "mention": Object { - "color": "#166de0", + "color": "#2389d7", }, "mention_highlight": Object { "backgroundColor": "#ffe577", @@ -2398,7 +2398,7 @@ exports[`channel_info_header should match snapshot when public channel and hasGu "color": "#2389d7", }, "mention": Object { - "color": "#166de0", + "color": "#2389d7", }, "mention_highlight": Object { "backgroundColor": "#ffe577", @@ -2549,7 +2549,7 @@ exports[`channel_info_header should match snapshot when public channel and hasGu "color": "#2389d7", }, "mention": Object { - "color": "#166de0", + "color": "#2389d7", }, "mention_highlight": Object { "backgroundColor": "#ffe577", diff --git a/app/screens/interactive_dialog/__snapshots__/dialog_introduction_text.test.js.snap b/app/screens/interactive_dialog/__snapshots__/dialog_introduction_text.test.js.snap index fba0ce2bd..66c8f5a60 100644 --- a/app/screens/interactive_dialog/__snapshots__/dialog_introduction_text.test.js.snap +++ b/app/screens/interactive_dialog/__snapshots__/dialog_introduction_text.test.js.snap @@ -109,7 +109,7 @@ exports[`DialogIntroductionText should render the introduction text correctly 1` "color": "#2389d7", }, "mention": Object { - "color": "#166de0", + "color": "#2389d7", }, "mention_highlight": Object { "backgroundColor": "#ffe577", diff --git a/app/screens/terms_of_service/__snapshots__/terms_of_service.test.js.snap b/app/screens/terms_of_service/__snapshots__/terms_of_service.test.js.snap index 324248811..76d4d9c08 100644 --- a/app/screens/terms_of_service/__snapshots__/terms_of_service.test.js.snap +++ b/app/screens/terms_of_service/__snapshots__/terms_of_service.test.js.snap @@ -115,7 +115,7 @@ exports[`TermsOfService should enable/disable navigator buttons on setNavigatorB "color": "#2389d7", }, "mention": Object { - "color": "#166de0", + "color": "#2389d7", }, "mention_highlight": Object { "backgroundColor": "#ffe577", @@ -250,7 +250,7 @@ exports[`TermsOfService should enable/disable navigator buttons on setNavigatorB "color": "#2389d7", }, "mention": Object { - "color": "#166de0", + "color": "#2389d7", }, "mention_highlight": Object { "backgroundColor": "#ffe577", @@ -449,7 +449,7 @@ exports[`TermsOfService should match snapshot on enableNavigatorLogout 1`] = ` "color": "#2389d7", }, "mention": Object { - "color": "#166de0", + "color": "#2389d7", }, "mention_highlight": Object { "backgroundColor": "#ffe577", diff --git a/app/utils/markdown.js b/app/utils/markdown.js index 50f002aeb..3a0110dc6 100644 --- a/app/utils/markdown.js +++ b/app/utils/markdown.js @@ -81,7 +81,7 @@ export const getMarkdownTextStyles = makeStyleSheetFromTheme((theme) => { fontFamily: codeFont, }, mention: { - color: theme.mentionHighlightLink, + color: theme.linkColor, }, error: { color: theme.errorTextColor,