From 06814885a050c9a0cae92c73c48e334272d30281 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Sat, 8 Jul 2017 04:27:38 +0500 Subject: UI changes (#6876) * PLT-7011 - Long channel name truncation * PLT-7013 - Fixing channel header mobile * PLT-7012 - Updating quick switch modal on mobile * PLT-7008 - Channel preferences mobile fix * PLT-7014 - Increasing tap area for channel desc --- webapp/utils/utils.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'webapp/utils') diff --git a/webapp/utils/utils.jsx b/webapp/utils/utils.jsx index 6778bb026..e9a73ff03 100644 --- a/webapp/utils/utils.jsx +++ b/webapp/utils/utils.jsx @@ -540,11 +540,11 @@ export function applyTheme(theme) { if (theme.sidebarHeaderTextColor) { changeCss('.app__body .status-wrapper .status_dropdown__toggle .status-edit, .multi-teams .team-sidebar .team-wrapper .team-container .team-btn, .sidebar--left .team__header .header__info, .app__body .sidebar--menu .team__header .header__info, .app__body .post-list__timestamp > div', 'color:' + theme.sidebarHeaderTextColor); - changeCss('.app__body .sidebar--left .status-wrapper .status_dropdown__toggle .offline--icon, .app__body .sidebar-header-dropdown__icon svg', 'fill:' + theme.sidebarHeaderTextColor); + changeCss('.app__body .icon--sidebarHeaderTextColor svg, .app__body .sidebar--left .status-wrapper .status_dropdown__toggle .offline--icon, .app__body .sidebar-header-dropdown__icon svg', 'fill:' + theme.sidebarHeaderTextColor); changeCss('.sidebar--left .team__header .user__name, .app__body .sidebar--menu .team__header .user__name', 'color:' + changeOpacity(theme.sidebarHeaderTextColor, 0.8)); changeCss('.sidebar--left .team__header:hover .user__name, .app__body .sidebar--menu .team__header:hover .user__name', 'color:' + theme.sidebarHeaderTextColor); 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); - changeCss('.app__body #navbar .navbar-default .navbar-brand .heading', 'color:' + theme.sidebarHeaderTextColor); + changeCss('.app__body #navbar .navbar-default .navbar-brand .dropdown-toggle', 'color:' + theme.sidebarHeaderTextColor); changeCss('.app__body #navbar .navbar-default .navbar-toggle .icon-bar', 'background:' + theme.sidebarHeaderTextColor); changeCss('.app__body .post-list__timestamp > div', 'border-color:' + changeOpacity(theme.sidebarHeaderTextColor, 0.5)); changeCss('@media(max-width: 768px){.app__body .search-bar__container', 'color:' + theme.sidebarHeaderTextColor); -- cgit v1.2.3-1-g7c22 From 87e62e8823e0894afab93326b0e1db2e12c53848 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Mon, 10 Jul 2017 23:48:45 +0500 Subject: Minor UI fixes for 4.0 (#6899) * PLT-7056 - Fixing profile popover position * PLT-7082 - Removing extra space below header * PLT-7074 - Channel header fix * PLT-7054 - Fixing scroll inside members popover * Updating mention highlight color for default theme --- webapp/utils/constants.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'webapp/utils') diff --git a/webapp/utils/constants.jsx b/webapp/utils/constants.jsx index b2693ecf5..abe891e28 100644 --- a/webapp/utils/constants.jsx +++ b/webapp/utils/constants.jsx @@ -493,7 +493,7 @@ export const Constants = { buttonBg: '#166de0', buttonColor: '#ffffff', errorTextColor: '#fd5960', - mentionHighlightBg: '#fff2bb', + mentionHighlightBg: '#ffe577', mentionHighlightLink: '#166de0', codeTheme: 'github', image: mattermostThemeImage -- cgit v1.2.3-1-g7c22 From e975b84a12b8e3f547f4d811155d076a5a4fdcf9 Mon Sep 17 00:00:00 2001 From: Saturnino Abril Date: Wed, 12 Jul 2017 22:12:53 +0900 Subject: [PLT-7021] Add missing borders of emoji picker (#6897) * add missing borders of emoji picker * set input class `emoji-picker__search` border-width to zero --- webapp/utils/utils.jsx | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'webapp/utils') diff --git a/webapp/utils/utils.jsx b/webapp/utils/utils.jsx index e9a73ff03..529ea5666 100644 --- a/webapp/utils/utils.jsx +++ b/webapp/utils/utils.jsx @@ -677,13 +677,10 @@ export function applyTheme(theme) { changeCss('.app__body .post-reaction:not(.post-reaction--current-user)', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.25)); changeCss('.app__body .post-reaction:not(.post-reaction--current-user)', 'color:' + changeOpacity(theme.centerChannelColor, 0.7)); changeCss('.app__body .emoji-picker', 'color:' + theme.centerChannelColor); - changeCss('.app__body .emoji-picker, .app__body .emoji-picker__search-container .emoji-picker__search', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.2)); - changeCss('.app__body .emoji-picker, .app__body .emoji-picker__items .emoji-picker__search-container .emoji-picker__search', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.2)); + changeCss('.app__body .emoji-picker', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.2)); + changeCss('.app__body .emoji-picker__preview, .app__body .emoji-picker__items, .app__body .emoji-picker__search-container', 'border-top-color:' + changeOpacity(theme.centerChannelColor, 0.2)); changeCss('.app__body .emoji-picker__items', 'background-color:' + changeOpacity(theme.centerChannelColor, 0.05)); - changeCss('.app__body .emoji-picker__categories', 'border-bottom-color:' + changeOpacity(theme.centerChannelColor, 0.2)); changeCss('.emoji-picker__category .fa:hover', 'color:' + changeOpacity(theme.centerChannelColor, 0.8)); - - changeCss('.app__body .emoji-picker__preview', 'border-top-color:' + changeOpacity(theme.centerChannelColor, 0.2)); changeCss('.app__body .emoji-picker__category, .app__body .emoji-picker__category:focus, .app__body .emoji-picker__category:hover', 'color:' + changeOpacity(theme.centerChannelColor, 0.3)); changeCss('.app__body .emoji-picker__category--selected, .app__body .emoji-picker__category--selected:focus, .app__body .emoji-picker__category--selected:hover', 'color:' + theme.centerChannelColor); changeCss('.app__body .emoji-picker__item-wrapper:hover', 'background-color:' + changeOpacity(theme.centerChannelColor, 0.8)); -- cgit v1.2.3-1-g7c22 From 2bf64b54c236945727a2d93afb57b1665d1daa7a Mon Sep 17 00:00:00 2001 From: George Goldberg Date: Wed, 12 Jul 2017 14:13:25 +0100 Subject: PLT-7025: Fix Slack Import API. (#6905) --- webapp/utils/utils.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'webapp/utils') diff --git a/webapp/utils/utils.jsx b/webapp/utils/utils.jsx index 529ea5666..83e538605 100644 --- a/webapp/utils/utils.jsx +++ b/webapp/utils/utils.jsx @@ -1107,7 +1107,7 @@ export function isDirectChannelForUser(otherUserId, channel) { } export function importSlack(file, success, error) { - Client4.importTeam(file, 'slack').then(success).catch(error); + Client4.importTeam(TeamStore.getCurrent().id, file, 'slack').then(success).catch(error); } export function windowWidth() { -- cgit v1.2.3-1-g7c22