gaja-group
/
element-web
forked from matrix/element-web
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-08-31 08:51:11 +00:00
parent a3e830127d da9dcc8f50
commit 4702697e9e
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -84,7 +84,7 @@ module.exports = React.createClass({
var self = this; var self = this;
return ( return (
<div className="mx_SearchBox"> <div className="mx_SearchBox mx_LoginBox">
{ loginButton } { loginButton }
{ toggleCollapse } { toggleCollapse }
</div> </div>

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

@ -14,6 +14,13 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
.mx_LoginBox {
min-height: 24px;
height: unset !important;
padding-top: 13px !important;
padding-bottom: 14px !important;
}
.mx_LoginBox_loginButton_wrapper { .mx_LoginBox_loginButton_wrapper {
text-align: center; text-align: center;
width: 100%; width: 100%;
@ -21,13 +28,13 @@ limitations under the License.
.mx_LoginBox_loginButton, .mx_LoginBox_loginButton,
.mx_LoginBox_registerButton { .mx_LoginBox_registerButton {
margin-top: -8px; margin-top: 3px;
height: 40px; height: 40px;
border: 0px; border: 0px;
border-radius: 40px; border-radius: 40px;
margin-left: 4px; margin-left: 4px;
margin-right: 4px; margin-right: 4px;
width: 80px; min-width: 80px;
background-color: $accent-color; background-color: $accent-color;
color: $primary-bg-color; color: $primary-bg-color;
@ -35,4 +42,6 @@ limitations under the License.
cursor: pointer; cursor: pointer;
font-size: 15px; font-size: 15px;
padding: 0 11px;
word-break: break-word;
} }