verdnatura-mirror/Rocket.Chat.ReactNative
verdnatura-mirror
/
Rocket.Chat.ReactNative
mirror of https://github.com/RocketChat/Rocket.Chat.ReactNative
2
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Correct others color

This commit is contained in:
Diego Mello 2023-05-29 18:44:16 -03:00
parent d420e83536
commit 806149447b
6 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
__tests__/containers/markdown/__snapshots__/Markdown.stories.storyshot
View File

File diff suppressed because one or more lines are too long

6
__tests__/containers/markdown/new/__snapshots__/NewMarkdown.stories.storyshot
View File

File diff suppressed because one or more lines are too long

4
app/containers/markdown/AtMention.tsx
View File

@ -50,8 +50,8 @@ const AtMention = React.memo(({ mention, mentions, username, navToRoomInfo, styl
}; };
} else { } else {
mentionStyle = { mentionStyle = {
color: themes[theme].pureWhite, color: themes[theme].mentionOthersColor,
backgroundColor: themes[theme].mentionGroupColor backgroundColor: themes[theme].mentionOthersBackground
}; };
} }

4
app/containers/markdown/Hashtag.tsx
View File

@ -46,8 +46,8 @@ const Hashtag = React.memo(({ hashtag, channels, navToRoomInfo, style = [] }: IH
style={[ style={[
styles.mention, styles.mention,
{ {
color: themes[theme].mentionRoomColor, color: themes[theme].mentionOthersColor,
backgroundColor: themes[theme].mentionRoomBackground backgroundColor: themes[theme].mentionOthersBackground
}, },
...style ...style
]} ]}

2
app/containers/markdown/styles.ts
View File

@ -57,7 +57,7 @@ export default StyleSheet.create({
height: 30 height: 30
}, },
temp: { opacity: 0.3 }, temp: { opacity: 0.3 },
mentionView: { marginBottom: -2 }, mentionView: { marginBottom: -4 },
mention: { mention: {
fontSize: 16, fontSize: 16,
...sharedStyles.textMedium, ...sharedStyles.textMedium,

12
app/lib/constants/colors.ts
View File

@ -89,8 +89,8 @@ export const colors = {
pureWhite: '#ffffff', pureWhite: '#ffffff',
mentionMeColor: '#F5455C', mentionMeColor: '#F5455C',
mentionGroupColor: '#F38C39', mentionGroupColor: '#F38C39',
mentionRoomBackground: '#E4E7EA', mentionOthersBackground: '#E4E7EA',
mentionRoomColor: '#095AD2', mentionOthersColor: '#095AD2',
...mentions ...mentions
}, },
dark: { dark: {
@ -164,8 +164,8 @@ export const colors = {
pureWhite: '#ffffff', pureWhite: '#ffffff',
mentionMeColor: '#B43C4C', mentionMeColor: '#B43C4C',
mentionGroupColor: '#955828', mentionGroupColor: '#955828',
mentionRoomBackground: '#2F343D', mentionOthersBackground: '#2F343D',
mentionRoomColor: '#739EDE', mentionOthersColor: '#739EDE',
...mentions ...mentions
}, },
black: { black: {
@ -239,8 +239,8 @@ export const colors = {
pureWhite: '#ffffff', pureWhite: '#ffffff',
mentionMeColor: '#B43C4C', mentionMeColor: '#B43C4C',
mentionGroupColor: '#955828', mentionGroupColor: '#955828',
mentionRoomBackground: '#2F343D', mentionOthersBackground: '#2F343D',
mentionRoomColor: '#739EDE', mentionOthersColor: '#739EDE',
...mentions ...mentions
} }
}; };