summaryrefslogtreecommitdiffstats
path: root/webapp/components/login/login_controller.jsx
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2017-06-05 12:49:38 -0400
committerGitHub <noreply@github.com>2017-06-05 12:49:38 -0400
commitabd0466a42d6b9897ba9e3bcb373b41974e9c46f (patch)
treeaee90a2041d243ed4094b7180db0642f73b57e82 /webapp/components/login/login_controller.jsx
parent0f3bd85b8dddc6805e260a9d19cadcc603a12e17 (diff)
downloadchat-abd0466a42d6b9897ba9e3bcb373b41974e9c46f.tar.gz
chat-abd0466a42d6b9897ba9e3bcb373b41974e9c46f.tar.bz2
chat-abd0466a42d6b9897ba9e3bcb373b41974e9c46f.zip
PLT-3466 E10: Add announcement bar feature (#6509)
* E10 - Add announcement bar feature * Updates per feedback * Add component tests and snapshots * Update snapshots * Updating color picker UI (#6543) * Add class to body tag when banner is not dismissable and clean up localstorage items when banner changes * Fixing links (#6544) * Updating UI for fixed error bar (#6552) * Truncating text on fixed banner (#6561) * Plt 3466 - Error bar link states (#6577) * Updating error bar hover state * Updating error bar link states
Diffstat (limited to 'webapp/components/login/login_controller.jsx')
-rw-r--r--webapp/components/login/login_controller.jsx4
1 files changed, 2 insertions, 2 deletions
diff --git a/webapp/components/login/login_controller.jsx b/webapp/components/login/login_controller.jsx
index cef7fe435..212a09bf2 100644
--- a/webapp/components/login/login_controller.jsx
+++ b/webapp/components/login/login_controller.jsx
@@ -2,7 +2,7 @@
// See License.txt for license information.
import LoginMfa from './components/login_mfa.jsx';
-import ErrorBar from 'components/error_bar.jsx';
+import AnnouncementBar from 'components/announcement_bar';
import FormError from 'components/form_error.jsx';
import * as GlobalActions from 'actions/global_actions.jsx';
@@ -621,7 +621,7 @@ export default class LoginController extends React.Component {
return (
<div>
- <ErrorBar/>
+ <AnnouncementBar/>
<div className='col-sm-12'>
<div className={'signup-team__container ' + customClass}>
<div className='signup__markdown'>