PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

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

Browse source 
Move LanguageSelector to views
This commit is contained in:
J. Ryan Stinnett 2019-01-23 18:09:29 -06:00 committed by GitHub
commit 74a5dd4291
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
res/css/_components.scss
View file

@ -23,7 +23,6 @@
@import "./structures/_UploadBar.scss"; @import "./structures/_UploadBar.scss";
@import "./structures/_UserSettings.scss"; @import "./structures/_UserSettings.scss";
@import "./structures/_ViewSource.scss"; @import "./structures/_ViewSource.scss";
@import "./structures/auth/_LanguageSelector.scss";
@import "./structures/auth/_Login.scss"; @import "./structures/auth/_Login.scss";
@import "./views/auth/_AuthBody.scss"; @import "./views/auth/_AuthBody.scss";
@import "./views/auth/_AuthButtons.scss"; @import "./views/auth/_AuthButtons.scss";
@ -32,6 +31,7 @@
@import "./views/auth/_AuthHeaderLogo.scss"; @import "./views/auth/_AuthHeaderLogo.scss";
@import "./views/auth/_AuthPage.scss"; @import "./views/auth/_AuthPage.scss";
@import "./views/auth/_InteractiveAuthEntryComponents.scss"; @import "./views/auth/_InteractiveAuthEntryComponents.scss";
@import "./views/auth/_LanguageSelector.scss";
@import "./views/auth/_ServerConfig.scss"; @import "./views/auth/_ServerConfig.scss";
@import "./views/avatars/_BaseAvatar.scss"; @import "./views/avatars/_BaseAvatar.scss";
@import "./views/avatars/_MemberStatusMessageAvatar.scss"; @import "./views/avatars/_MemberStatusMessageAvatar.scss";

0
res/css/structures/auth/_LanguageSelector.scss → res/css/views/auth/_LanguageSelector.scss
View file

2
src/components/views/auth/AuthHeader.js
View file

@ -25,7 +25,7 @@ module.exports = React.createClass({
render: function() { render: function() {
const AuthHeaderLogo = sdk.getComponent('auth.AuthHeaderLogo'); const AuthHeaderLogo = sdk.getComponent('auth.AuthHeaderLogo');
const LanguageSelector = sdk.getComponent('structures.auth.LanguageSelector'); const LanguageSelector = sdk.getComponent('views.auth.LanguageSelector');
return ( return (
<div className="mx_AuthHeader"> <div className="mx_AuthHeader">

0
src/components/structures/auth/LanguageSelector.js → src/components/views/auth/LanguageSelector.js
View file