IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

[MM-55974] Theme is not used in notification selector box in user notification settings (#25689)

Browse Source
This commit is contained in:
Zubair Imtiaz
2023-12-26 14:24:33 +05:00
committed by GitHub
parent 8f0d2b05ea
commit 287cbad2d5
1 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
webapp/channels/src/components/user_settings/notifications/user_settings_notifications.tsx
View File

@@ -872,7 +872,7 @@ class NotificationsTab extends React.PureComponent<Props, State> {
autoFocus={true}
isClearable={false}
isMulti={true}
styles={customKeywordsWithNotificationStyles}
styles={customKeywordsSelectorStyles}
className='multiInput'
placeholder=''
components={{
@@ -965,7 +965,7 @@ class NotificationsTab extends React.PureComponent<Props, State> {
autoFocus={true}
isClearable={false}
isMulti={true}
styles={customKeywordsWithNotificationStyles}
styles={customKeywordsSelectorStyles}
className='multiInput'
placeholder=''
components={{
@@ -1395,7 +1395,27 @@ class NotificationsTab extends React.PureComponent<Props, State> {
}
}
const customKeywordsWithNotificationStyles: ReactSelectStyles = {
const customKeywordsSelectorStyles: ReactSelectStyles = {
control: ((baseStyles) => ({
...baseStyles,
backgroundColor: 'var(--center-channel-bg)',
border: '1px solid rgba(var(--center-channel-color-rgb), 0.16);',
':hover': {
borderColor: 'rgba(var(--center-channel-color-rgb), 0.48);',
},
})),
multiValue: ((baseStyles) => ({
...baseStyles,
background: 'rgba(var(--center-channel-color-rgb), 0.08)',
})),
multiValueLabel: ((baseStyles) => ({
...baseStyles,
color: 'var(--center-channel-color);',
})),
input: ((baseStyles) => ({
...baseStyles,
color: 'var(--center-channel-color)',
})),
indicatorSeparator: ((indicatorSeperatorStyles) => ({
...indicatorSeperatorStyles,
display: 'none',
@@ -1403,8 +1423,10 @@ const customKeywordsWithNotificationStyles: ReactSelectStyles = {
multiValueRemove: ((multiValueRemoveStyles) => ({
...multiValueRemoveStyles,
cursor: 'pointer',
color: 'rgba(var(--center-channel-color-rgb),0.32);',
':hover': {
backgroundColor: 'rgba(var(--center-channel-color-rgb), 0.16)',
color: 'rgba(var(--center-channel-color-rgb), 0.56);',
},
})),
};