Rename mx_Login_box to mx_AuthPage_modal and fold into AuthPage

This commit is contained in:
J. Ryan Stinnett 2019-01-21 18:49:28 -06:00
parent 3bd765f63f
commit 1d01ac398c
7 changed files with 46 additions and 52 deletions

View file

@ -15,14 +15,6 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
.mx_Login_box {
width: 300px;
min-height: 450px;
padding-top: 50px;
padding-bottom: 50px;
margin: auto;
}
.mx_Login_support { .mx_Login_support {
text-align: center; text-align: center;
font-size: 13px; font-size: 13px;

View file

@ -30,3 +30,11 @@ limitations under the License.
margin-top: 32px; margin-top: 32px;
margin-bottom: 20px; margin-bottom: 20px;
} }
.mx_AuthPage_modal {
width: 300px;
min-height: 450px;
padding-top: 50px;
padding-bottom: 50px;
margin: auto;
}

View file

@ -281,10 +281,8 @@ module.exports = React.createClass({
return ( return (
<AuthPage> <AuthPage>
<div className="mx_Login_box">
<AuthHeader /> <AuthHeader />
{ resetPasswordJsx } { resetPasswordJsx }
</div>
</AuthPage> </AuthPage>
); );
}, },

View file

@ -559,7 +559,6 @@ module.exports = React.createClass({
return ( return (
<AuthPage> <AuthPage>
<div className="mx_Login_box">
<AuthHeader /> <AuthHeader />
<div> <div>
{ header } { header }
@ -573,7 +572,6 @@ module.exports = React.createClass({
<LanguageSelector /> <LanguageSelector />
<AuthFooter /> <AuthFooter />
</div> </div>
</div>
</AuthPage> </AuthPage>
); );
}, },

View file

@ -64,7 +64,6 @@ module.exports = React.createClass({
const AuthHeader = sdk.getComponent('auth.AuthHeader'); const AuthHeader = sdk.getComponent('auth.AuthHeader');
return ( return (
<AuthPage> <AuthPage>
<div className="mx_Login_box">
<AuthHeader /> <AuthHeader />
<div className="mx_Login_profile"> <div className="mx_Login_profile">
{ _t('Set a display name:') } { _t('Set a display name:') }
@ -75,7 +74,6 @@ module.exports = React.createClass({
<button onClick={this.props.onComplete}>{ _t('Continue') }</button> <button onClick={this.props.onComplete}>{ _t('Continue') }</button>
{ this.state.errorString } { this.state.errorString }
</div> </div>
</div>
</AuthPage> </AuthPage>
); );
}, },

View file

@ -475,7 +475,6 @@ module.exports = React.createClass({
return ( return (
<AuthPage> <AuthPage>
<div className="mx_Login_box">
<AuthHeader <AuthHeader
icon={this.state.teamSelected ? icon={this.state.teamSelected ?
this.props.teamServerConfig.teamServerURL + "/static/common/" + this.props.teamServerConfig.teamServerURL + "/static/common/" +
@ -488,7 +487,6 @@ module.exports = React.createClass({
{ errorText } { errorText }
<LanguageSelector /> <LanguageSelector />
<AuthFooter /> <AuthFooter />
</div>
</AuthPage> </AuthPage>
); );
}, },

View file

@ -25,8 +25,10 @@ module.exports = React.createClass({
render: function() { render: function() {
return ( return (
<div className="mx_AuthPage"> <div className="mx_AuthPage">
<div className="mx_AuthPage_modal">
{ this.props.children } { this.props.children }
</div> </div>
</div>
); );
}, },
}); });