toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Manual cherry pick of #3372 (#3400)

Browse source 
* Fixing mention text color (#3372)

* Fixing mention text color

* Updating snapshots

* Update package-lock.json

* Adding highlight link color to other highlight types

* Fix snapshot test
This commit is contained in:
Miguel Alatzar 2019-10-09 13:14:56 -07:00 committed by Dean Whillier
parent 0fa96be8ee
commit 01eb3ce8b6
5 changed files with 1868 additions and 4426 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
app/screens/channel_info/__snapshots__/channel_info_header.test.js.snap
View file

@ -209,10 +209,11 @@ exports[`channel_info_header should match snapshot 1`] = `
"color": "#2389d7",
},
"mention": Object {
"color": "#2389d7",
"color": "#166de0",
},
"mention_highlight": Object {
"backgroundColor": "#ffe577",
"color": "#166de0",
},
"strong": Object {
"fontWeight": "bold",
@ -356,10 +357,11 @@ exports[`channel_info_header should match snapshot 1`] = `
"color": "#2389d7",
},
"mention": Object {
"color": "#2389d7",
"color": "#166de0",
},
"mention_highlight": Object {
"backgroundColor": "#ffe577",
"color": "#166de0",
},
"strong": Object {
"fontWeight": "bold",
@ -645,10 +647,11 @@ exports[`channel_info_header should match snapshot when DM and hasGuests and is
"color": "#2389d7",
},
"mention": Object {
"color": "#2389d7",
"color": "#166de0",
},
"mention_highlight": Object {
"backgroundColor": "#ffe577",
"color": "#166de0",
},
"strong": Object {
"fontWeight": "bold",
@ -792,10 +795,11 @@ exports[`channel_info_header should match snapshot when DM and hasGuests and is
"color": "#2389d7",
},
"mention": Object {
"color": "#2389d7",
"color": "#166de0",
},
"mention_highlight": Object {
"backgroundColor": "#ffe577",
"color": "#166de0",
},
"strong": Object {
"fontWeight": "bold",
@ -1053,10 +1057,11 @@ exports[`channel_info_header should match snapshot when DM and hasGuests but its
"color": "#2389d7",
},
"mention": Object {
"color": "#2389d7",
"color": "#166de0",
},
"mention_highlight": Object {
"backgroundColor": "#ffe577",
"color": "#166de0",
},
"strong": Object {
"fontWeight": "bold",
@ -1200,10 +1205,11 @@ exports[`channel_info_header should match snapshot when DM and hasGuests but its
"color": "#2389d7",
},
"mention": Object {
"color": "#2389d7",
"color": "#166de0",
},
"mention_highlight": Object {
"backgroundColor": "#ffe577",
"color": "#166de0",
},
"strong": Object {
"fontWeight": "bold",
@ -1489,10 +1495,11 @@ exports[`channel_info_header should match snapshot when GM and hasGuests 1`] = `
"color": "#2389d7",
},
"mention": Object {
"color": "#2389d7",
"color": "#166de0",
},
"mention_highlight": Object {
"backgroundColor": "#ffe577",
"color": "#166de0",
},
"strong": Object {
"fontWeight": "bold",
@ -1636,10 +1643,11 @@ exports[`channel_info_header should match snapshot when GM and hasGuests 1`] = `
"color": "#2389d7",
},
"mention": Object {
"color": "#2389d7",
"color": "#166de0",
},
"mention_highlight": Object {
"backgroundColor": "#ffe577",
"color": "#166de0",
},
"strong": Object {
"fontWeight": "bold",
@ -1897,10 +1905,11 @@ exports[`channel_info_header should match snapshot when is group constrained 1`]
"color": "#2389d7",
},
"mention": Object {
"color": "#2389d7",
"color": "#166de0",
},
"mention_highlight": Object {
"backgroundColor": "#ffe577",
"color": "#166de0",
},
"strong": Object {
"fontWeight": "bold",
@ -2044,10 +2053,11 @@ exports[`channel_info_header should match snapshot when is group constrained 1`]
"color": "#2389d7",
},
"mention": Object {
"color": "#2389d7",
"color": "#166de0",
},
"mention_highlight": Object {
"backgroundColor": "#ffe577",
"color": "#166de0",
},
"strong": Object {
"fontWeight": "bold",
@ -2354,10 +2364,11 @@ exports[`channel_info_header should match snapshot when public channel and hasGu
"color": "#2389d7",
},
"mention": Object {
"color": "#2389d7",
"color": "#166de0",
},
"mention_highlight": Object {
"backgroundColor": "#ffe577",
"color": "#166de0",
},
"strong": Object {
"fontWeight": "bold",
@ -2501,10 +2512,11 @@ exports[`channel_info_header should match snapshot when public channel and hasGu
"color": "#2389d7",
},
"mention": Object {
"color": "#2389d7",
"color": "#166de0",
},
"mention_highlight": Object {
"backgroundColor": "#ffe577",
"color": "#166de0",
},
"strong": Object {
"fontWeight": "bold",

3
app/screens/interactive_dialog/__snapshots__/dialog_introduction_text.test.js.snap
View file

@ -109,10 +109,11 @@ exports[`DialogIntroductionText should render the introduction text correctly 1`
"color": "#2389d7",
},
"mention": Object {
"color": "#2389d7",
"color": "#166de0",
},
"mention_highlight": Object {
"backgroundColor": "#ffe577",
"color": "#166de0",
},
"strong": Object {
"fontWeight": "bold",

9
app/screens/terms_of_service/__snapshots__/terms_of_service.test.js.snap
View file

@ -115,10 +115,11 @@ exports[`TermsOfService should enable/disable navigator buttons on setNavigatorB
"color": "#2389d7",
},
"mention": Object {
"color": "#2389d7",
"color": "#166de0",
},
"mention_highlight": Object {
"backgroundColor": "#ffe577",
"color": "#166de0",
},
"strong": Object {
"fontWeight": "bold",
@ -249,10 +250,11 @@ exports[`TermsOfService should enable/disable navigator buttons on setNavigatorB
"color": "#2389d7",
},
"mention": Object {
"color": "#2389d7",
"color": "#166de0",
},
"mention_highlight": Object {
"backgroundColor": "#ffe577",
"color": "#166de0",
},
"strong": Object {
"fontWeight": "bold",
@ -447,10 +449,11 @@ exports[`TermsOfService should match snapshot on enableNavigatorLogout 1`] = `
"color": "#2389d7",
},
"mention": Object {
"color": "#2389d7",
"color": "#166de0",
},
"mention_highlight": Object {
"backgroundColor": "#ffe577",
"color": "#166de0",
},
"strong": Object {
"fontWeight": "bold",

3
app/utils/markdown.js
View file

@ -81,7 +81,7 @@ export const getMarkdownTextStyles = makeStyleSheetFromTheme((theme) => {
fontFamily: codeFont,
},
mention: {
color: theme.linkColor,
color: theme.mentionHighlightLink,
},
error: {
color: theme.errorTextColor,
@ -91,6 +91,7 @@ export const getMarkdownTextStyles = makeStyleSheetFromTheme((theme) => {
},
mention_highlight: {
backgroundColor: theme.mentionHighlightBg,
color: theme.mentionHighlightLink,
},
};
});

6243
package-lock.json generated
View file

File diff suppressed because it is too large Load diff