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

Merge pull request #2368 from matrix-org/bwindels/fixloginfield

Browse source 
Redesign:  Fix login field looking inline
This commit is contained in:
Bruno Windels 2018-12-18 16:19:52 +00:00 committed by GitHub
commit 6653236543
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
res/themes/dharma/css/_dharma.scss
View file

@ -192,9 +192,11 @@ $progressbar-color: #000;
// it has the appearance of a text box so the controls // it has the appearance of a text box so the controls
// appear to be part of the input // appear to be part of the input
:not(.mx_textinput) > input[type=text], .mx_MatrixChat {
:not(.mx_textinput) > input[type=search],
.mx_textinput { :not(.mx_textinput) > input[type=text],
:not(.mx_textinput) > input[type=search],
.mx_textinput {
display: block; display: block;
margin: 9px; margin: 9px;
box-sizing: border-box; box-sizing: border-box;
@ -202,22 +204,25 @@ $progressbar-color: #000;
color: $input-darker-fg-color; color: $input-darker-fg-color;
border-radius: 4px; border-radius: 4px;
border: 1px solid #c1c1c1; border: 1px solid #c1c1c1;
} flex: 0 0 auto;
}
.mx_textinput { .mx_textinput {
display: flex; display: flex;
align-items: center; align-items: center;
}
.mx_textinput > input[type=text], > input[type=text],
.mx_textinput > input[type=search] { > input[type=search] {
border: none; border: none;
flex: 1; flex: 1;
color: inherit; //from .mx_textinput color: inherit; //from .mx_textinput
}
}
} }
input[type=text], input[type=text],
input[type=search] { input[type=search],
input[type=password] {
padding: 9px; padding: 9px;
font-family: $font-family; font-family: $font-family;
font-size: 14px; font-size: 14px;