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

Merge pull request #3732 from vector-im/luke/css-improve-country-dd 

Modify CSS for matrix-org/matrix-react-sdk#833
This commit is contained in:
David Baker 2017-04-26 10:28:07 +01:00 committed by GitHub
parent bf88620581 78cabed0bf
commit c070e86c1f
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/skins/vector/css/matrix-react-sdk/structures/_UserSettings.scss
View File

@ -176,6 +176,15 @@ limitations under the License.
cursor: pointer; cursor: pointer;
} }
.mx_UserSettings_phoneSection {
display:table;
}
.mx_UserSettings_phoneCountry {
width: 70px;
display: table-cell;
}
input.mx_UserSettings_phoneNumberField { input.mx_UserSettings_phoneNumberField {
margin-left: 3px; margin-left: 3px;
width: 172px; width: 172px;

22
src/skins/vector/css/matrix-react-sdk/structures/login/_Login.scss
View File

@ -179,11 +179,11 @@ limitations under the License.
align-self: flex-end; align-self: flex-end;
} }
.mx_Login_username_group { .mx_Login_field_group {
display: flex; display: flex;
} }
.mx_Login_username_prefix { .mx_Login_field_prefix {
height: 33px; height: 33px;
padding: 0px 5px; padding: 0px 5px;
line-height: 33px; line-height: 33px;
@ -196,7 +196,7 @@ limitations under the License.
text-align: center; text-align: center;
} }
.mx_Login_username_suffix { .mx_Login_field_suffix {
height: 33px; height: 33px;
padding: 0px 5px; padding: 0px 5px;
line-height: 33px; line-height: 33px;
@ -214,7 +214,9 @@ limitations under the License.
flex-shrink: 1; flex-shrink: 1;
min-width: 0px; min-width: 0px;
border-radius: 3px; border-radius: 3px;
/* The "@" is always prefixed, so no rounded corners */ }
.mx_Login_field_has_prefix {
border-top-left-radius: 0px; border-top-left-radius: 0px;
border-bottom-left-radius: 0px; border-bottom-left-radius: 0px;
} }
@ -224,13 +226,8 @@ limitations under the License.
border-bottom-right-radius: 0px; border-bottom-right-radius: 0px;
} }
.mx_Login_phoneSection {
display: table;
}
.mx_Login_phoneCountry { .mx_Login_phoneCountry {
display: table-cell; margin-bottom: 14px;
width: 70px;
} }
.mx_Login_phoneCountry .mx_Dropdown_option { .mx_Login_phoneCountry .mx_Dropdown_option {
@ -246,8 +243,3 @@ limitations under the License.
margin: 4px; margin: 4px;
vertical-align: top; vertical-align: top;
} }
.mx_Login_phoneNumberField {
width: 210px;
margin-left: 3px;
}