gaja-group
/
matrix-bot
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Weblate 2017-06-18 23:54:13 +00:00
parent b7368fa933 1c82b7b0c3
commit 7cbfa228ee
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/components/structures/LoginBox.js
View File

@ -47,6 +47,10 @@ module.exports = React.createClass({
dis.dispatch({ action: 'start_login' }); dis.dispatch({ action: 'start_login' });
}, },
onRegisterClick: function() {
dis.dispatch({ action: 'start_registration' });
},
render: function() { render: function() {
var TintableSvg = sdk.getComponent('elements.TintableSvg'); var TintableSvg = sdk.getComponent('elements.TintableSvg');
@ -71,6 +75,9 @@ module.exports = React.createClass({
<AccessibleButton className="mx_LoginBox_loginButton" element="button" onClick={this.onLoginClick}> <AccessibleButton className="mx_LoginBox_loginButton" element="button" onClick={this.onLoginClick}>
{ _t("Login") } { _t("Login") }
</AccessibleButton> </AccessibleButton>
<AccessibleButton className="mx_LoginBox_registerButton" element="button" onClick={this.onRegisterClick}>
{ _t("Register") }
</AccessibleButton>
</div> </div>
); );
} }

8
src/skins/vector/css/matrix-react-sdk/structures/_LoginBox.scss
View File

@ -19,13 +19,15 @@ limitations under the License.
width: 100%; width: 100%;
} }
.mx_LoginBox_loginButton { .mx_LoginBox_loginButton,
.mx_LoginBox_registerButton {
margin-top: -8px; margin-top: -8px;
height: 40px; height: 40px;
border: 0px; border: 0px;
border-radius: 40px; border-radius: 40px;
padding-left: 1em; margin-left: 4px;
padding-right: 1em; margin-right: 4px;
width: 80px;
background-color: $accent-color; background-color: $accent-color;
color: $primary-bg-color; color: $primary-bg-color;