summaryrefslogtreecommitdiffstats
path: root/web/react/components
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2015-10-07 08:00:51 -0400
committerJoram Wilander <jwawilander@gmail.com>2015-10-07 08:00:51 -0400
commit3ce40d6a9483c8df41fae256f71fc82d366a1a34 (patch)
tree4d4726d4c43b04bb8909b0b86b19790fb85bc6c5 /web/react/components
parentfe802fb9c4afdf27a2fb56eb472f48eb921b4de0 (diff)
parentd99aea15023b7a6ae7dbebffd0eb4d2ae0f9765d (diff)
downloadchat-3ce40d6a9483c8df41fae256f71fc82d366a1a34.tar.gz
chat-3ce40d6a9483c8df41fae256f71fc82d366a1a34.tar.bz2
chat-3ce40d6a9483c8df41fae256f71fc82d366a1a34.zip
Merge pull request #946 from asaadmahmoodspin/ui-improvements
PLT-451 - Adding visual effect for logout active sessions button
Diffstat (limited to 'web/react/components')
-rw-r--r--web/react/components/activity_log_modal.jsx5
-rw-r--r--web/react/components/user_settings/import_theme_modal.jsx1
2 files changed, 5 insertions, 1 deletions
diff --git a/web/react/components/activity_log_modal.jsx b/web/react/components/activity_log_modal.jsx
index aee2541b5..ff370c32e 100644
--- a/web/react/components/activity_log_modal.jsx
+++ b/web/react/components/activity_log_modal.jsx
@@ -31,6 +31,11 @@ export default class ActivityLogModal extends React.Component {
}
submitRevoke(altId, e) {
e.preventDefault();
+ var modalContent = $(e.target).closest('.modal-content');
+ modalContent.addClass('animation--highlight');
+ setTimeout(() => {
+ modalContent.removeClass('animation--highlight');
+ }, 1500);
Client.revokeSession(altId,
function handleRevokeSuccess() {
AsyncClient.getSessions();
diff --git a/web/react/components/user_settings/import_theme_modal.jsx b/web/react/components/user_settings/import_theme_modal.jsx
index 4e8ee03fa..3301c6596 100644
--- a/web/react/components/user_settings/import_theme_modal.jsx
+++ b/web/react/components/user_settings/import_theme_modal.jsx
@@ -49,7 +49,6 @@ export default class ImportThemeModal extends React.Component {
theme.sidebarText = colors[5];
theme.sidebarUnreadText = colors[5];
theme.sidebarTextHoverBg = colors[4];
- theme.sidebarTextHoverColor = colors[5];
theme.sidebarTextActiveBg = colors[2];
theme.sidebarTextActiveColor = colors[3];
theme.sidebarHeaderBg = colors[1];