diff options
| author | Harrison Healey <harrisonmhealey@gmail.com> | 2016-09-29 10:58:30 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-29 10:58:30 -0400 |
| commit | 53ba8ec9c2bbaee510c2b1c9b5b59f9fdf44f365 (patch) | |
| tree | ad171bacc5ad7c8c9629ccb512d6787a8e79f5ec /webapp/utils | |
| parent | ac6ae23c8e72b0b79998c32b0e91873ed2bb0e59 (diff) | |
| download | chat-53ba8ec9c2bbaee510c2b1c9b5b59f9fdf44f365.tar.gz chat-53ba8ec9c2bbaee510c2b1c9b5b59f9fdf44f365.tar.bz2 chat-53ba8ec9c2bbaee510c2b1c9b5b59f9fdf44f365.zip | |
Renamed NavbarDropdown to SidebarHeaderDropdown and switched it to react-bootstrap (#4109)
Diffstat (limited to 'webapp/utils')
| -rw-r--r-- | webapp/utils/constants.jsx | 14 | ||||
| -rw-r--r-- | webapp/utils/utils.jsx | 2 |
2 files changed, 9 insertions, 7 deletions
diff --git a/webapp/utils/constants.jsx b/webapp/utils/constants.jsx index 9e3eac5c0..039d48aaa 100644 --- a/webapp/utils/constants.jsx +++ b/webapp/utils/constants.jsx @@ -197,12 +197,20 @@ export const SocketEvents = { WEBRTC: 'webrtc' }; +export const TutorialSteps = { + INTRO_SCREENS: 0, + POST_POPOVER: 1, + CHANNEL_POPOVER: 2, + MENU_POPOVER: 3 +}; + export const Constants = { Preferences, SocketEvents, ActionTypes, WebrtcActionTypes, UserStatuses, + TutorialSteps, PayloadSources: keyMirror({ SERVER_ACTION: null, @@ -614,12 +622,6 @@ export const Constants = { Ubuntu: 'font--ubuntu' }, DEFAULT_FONT: 'Open Sans', - TutorialSteps: { - INTRO_SCREENS: 0, - POST_POPOVER: 1, - CHANNEL_POPOVER: 2, - MENU_POPOVER: 3 - }, KeyCodes: { BACKSPACE: 8, TAB: 9, diff --git a/webapp/utils/utils.jsx b/webapp/utils/utils.jsx index d59687606..ffc676e63 100644 --- a/webapp/utils/utils.jsx +++ b/webapp/utils/utils.jsx @@ -522,7 +522,7 @@ export function applyTheme(theme) { if (theme.sidebarHeaderTextColor) { changeCss('.app__body .sidebar--left .team__header .header__info, .app__body .sidebar--menu .team__header .header__info, .app__body .post-list__timestamp > div', 'color:' + theme.sidebarHeaderTextColor, 1); - changeCss('.app__body .sidebar--left .team__header .navbar-right .dropdown__icon, .app__body .sidebar--menu .team__header .navbar-right .dropdown__icon', 'fill:' + theme.sidebarHeaderTextColor, 1); + changeCss('.app__body .sidebar-header-dropdown__icon', 'fill:' + theme.sidebarHeaderTextColor, 1); changeCss('.app__body .sidebar--left .team__header .user__name, .app__body .sidebar--menu .team__header .user__name', 'color:' + changeOpacity(theme.sidebarHeaderTextColor, 0.8), 1); changeCss('.app__body .sidebar--left .team__header:hover .user__name, .app__body .sidebar--menu .team__header:hover .user__name', 'color:' + theme.sidebarHeaderTextColor, 1); changeCss('.app__body .modal .modal-header .modal-title, .app__body .modal .modal-header .modal-title .name, .app__body .modal .modal-header button.close', 'color:' + theme.sidebarHeaderTextColor, 1); |