diff options
Diffstat (limited to 'webapp')
| -rw-r--r-- | webapp/components/announcement_bar/announcement_bar.jsx | 4 | ||||
| -rw-r--r-- | webapp/images/themes/mattermost.png | bin | 93862 -> 82860 bytes | |||
| -rw-r--r-- | webapp/sass/components/_error-bar.scss | 52 | ||||
| -rw-r--r-- | webapp/utils/constants.jsx | 52 |
4 files changed, 28 insertions, 80 deletions
diff --git a/webapp/components/announcement_bar/announcement_bar.jsx b/webapp/components/announcement_bar/announcement_bar.jsx index 0e731fd7c..84061ec05 100644 --- a/webapp/components/announcement_bar/announcement_bar.jsx +++ b/webapp/components/announcement_bar/announcement_bar.jsx @@ -196,9 +196,9 @@ export default class AnnouncementBar extends React.PureComponent { barStyle.color = this.state.textColor; linkStyle.color = this.state.textColor; } else if (this.state.type === BAR_DEVELOPER_TYPE) { - errClass = 'error-bar-developer'; + errClass = 'error-bar error-bar-developer'; } else if (this.state.type === BAR_CRITICAL_TYPE) { - errClass = 'error-bar-critical'; + errClass = 'error-bar error-bar-critical'; } let closeButton; diff --git a/webapp/images/themes/mattermost.png b/webapp/images/themes/mattermost.png Binary files differindex 8dea37ff6..6b5c4eced 100644 --- a/webapp/images/themes/mattermost.png +++ b/webapp/images/themes/mattermost.png diff --git a/webapp/sass/components/_error-bar.scss b/webapp/sass/components/_error-bar.scss index 06a35df40..b08b6d95b 100644 --- a/webapp/sass/components/_error-bar.scss +++ b/webapp/sass/components/_error-bar.scss @@ -48,60 +48,8 @@ .error-bar-critical { background-color: #B0171F; - color: white; - padding: 5px 30px; - position: absolute; - text-align: center; - top: 0; - width: 100%; - z-index: 9999; - - a { - &.error-bar__close { - color: $white; - font-family: 'Open Sans', sans-serif; - font-size: 20px; - font-weight: 600; - padding: 0 10px; - position: absolute; - right: 0; - text-decoration: none; - top: 0; - - &:hover { - color: $white; - text-decoration: none; - } - } - } } .error-bar-developer { background-color: purple; - color: white; - padding: 5px 30px; - position: absolute; - text-align: center; - top: 0; - width: 100%; - z-index: 9999; - - a { - &.error-bar__close { - color: $white; - font-family: 'Open Sans', sans-serif; - font-size: 20px; - font-weight: 600; - padding: 0 10px; - position: absolute; - right: 0; - text-decoration: none; - top: 0; - - &:hover { - color: $white; - text-decoration: none; - } - } - } } diff --git a/webapp/utils/constants.jsx b/webapp/utils/constants.jsx index f1b72dbf6..6b77be789 100644 --- a/webapp/utils/constants.jsx +++ b/webapp/utils/constants.jsx @@ -464,6 +464,32 @@ export const Constants = { LEAVE_TEAM_SVG: "<svg width='100%' height='100%' viewBox='0 0 164 164' version='1.1' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' xml:space='preserve' style='fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round; stroke-miterlimit:1.41421;'> <path d='M26.023,164L26.023,7.035L26.022,0.32L137.658,0.32L137.658,164L124.228,164L124.228, 13.749L39.452,13.749L39.452,164L26.023, 164ZM118.876,164L118.876,18.619L58.137,32.918L58.137,149.701L118.876,164Z'/></svg>", THEMES: { default: { + type: 'Mattermost', + sidebarBg: '#145dbf', + sidebarText: '#ffffff', + sidebarUnreadText: '#ffffff', + sidebarTextHoverBg: '#4578bf', + sidebarTextActiveBorder: '#579eff', + sidebarTextActiveColor: '#ffffff', + sidebarHeaderBg: '#1153ab', + sidebarHeaderTextColor: '#ffffff', + onlineIndicator: '#06d6a0', + awayIndicator: '#ffbc42', + mentionBj: '#ffffff', + mentionColor: '#145dbf', + centerChannelBg: '#ffffff', + centerChannelColor: '#3d3c40', + newMessageSeparator: '#ff8800', + linkColor: '#2389d7', + buttonBg: '#166de0', + buttonColor: '#ffffff', + errorTextColor: '#fd5960', + mentionHighlightBg: '#fff2bb', + mentionHighlightLink: '#166de0', + codeTheme: 'github', + image: mattermostThemeImage + }, + organization: { type: 'Organization', sidebarBg: '#2071a7', sidebarText: '#ffffff', @@ -489,32 +515,6 @@ export const Constants = { codeTheme: 'github', image: defaultThemeImage }, - mattermost: { - type: 'Mattermost', - sidebarBg: '#fafafa', - sidebarText: '#333333', - sidebarUnreadText: '#333333', - sidebarTextHoverBg: '#e6f2fa', - sidebarTextActiveBorder: '#378fd2', - sidebarTextActiveColor: '#111111', - sidebarHeaderBg: '#3481b9', - sidebarHeaderTextColor: '#ffffff', - onlineIndicator: '#7dbe00', - awayIndicator: '#dcbd4e', - mentionBj: '#2389d7', - mentionColor: '#ffffff', - centerChannelBg: '#ffffff', - centerChannelColor: '#333333', - newMessageSeparator: '#ff8800', - linkColor: '#2389d7', - buttonBg: '#23a2ff', - buttonColor: '#ffffff', - errorTextColor: '#a94442', - mentionHighlightBg: '#f3e197', - mentionHighlightLink: '#2f81b7', - codeTheme: 'github', - image: mattermostThemeImage - }, mattermostDark: { type: 'Mattermost Dark', sidebarBg: '#1b2c3e', |
