Merge pull request #2490 from jryans/lang-selector-view

Move LanguageSelector to views
matrix-org · Jan 24, 2019 · 74a5dd4 · 74a5dd4
2 parents 3503562 + 9f5f552
commit 74a5dd4
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 2 deletions.
diff --git a/res/css/_components.scss b/res/css/_components.scss
@@ -23,7 +23,6 @@
 @import "./structures/_UploadBar.scss";
 @import "./structures/_UserSettings.scss";
 @import "./structures/_ViewSource.scss";
-@import "./structures/auth/_LanguageSelector.scss";
 @import "./structures/auth/_Login.scss";
 @import "./views/auth/_AuthBody.scss";
 @import "./views/auth/_AuthButtons.scss";
@@ -32,6 +31,7 @@
 @import "./views/auth/_AuthHeaderLogo.scss";
 @import "./views/auth/_AuthPage.scss";
 @import "./views/auth/_InteractiveAuthEntryComponents.scss";
+@import "./views/auth/_LanguageSelector.scss";
 @import "./views/auth/_ServerConfig.scss";
 @import "./views/avatars/_BaseAvatar.scss";
 @import "./views/avatars/_MemberStatusMessageAvatar.scss";

diff --git a/...ss/structures/auth/_LanguageSelector.scss → res/css/views/auth/_LanguageSelector.scss b/...ss/structures/auth/_LanguageSelector.scss → res/css/views/auth/_LanguageSelector.scss
diff --git a/src/components/views/auth/AuthHeader.js b/src/components/views/auth/AuthHeader.js
@@ -25,7 +25,7 @@ module.exports = React.createClass({
 
     render: function() {
         const AuthHeaderLogo = sdk.getComponent('auth.AuthHeaderLogo');
-        const LanguageSelector = sdk.getComponent('structures.auth.LanguageSelector');
+        const LanguageSelector = sdk.getComponent('views.auth.LanguageSelector');
 
         return (
             <div className="mx_AuthHeader">

diff --git a/...nents/structures/auth/LanguageSelector.js → ...components/views/auth/LanguageSelector.js b/...nents/structures/auth/LanguageSelector.js → ...components/views/auth/LanguageSelector.js