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

This commit is contained in:
RiotTranslate 2017-06-02 02:40:47 +00:00
commit cd78be2a0a
6 changed files with 126 additions and 6 deletions

View file

@ -231,7 +231,8 @@ input.mx_UserSettings_phoneNumberField {
display: none;
}
.mx_UserSettings_advanced_spoiler {
.mx_UserSettings_advanced_spoiler,
.mx_UserSettings_link {
cursor: pointer;
color: $accent-color;
word-break: break-all;

View file

@ -176,7 +176,7 @@ limitations under the License.
.mx_Login_type_dropdown {
display: inline-block;
min-width: 125px;
min-width: 170px;
align-self: flex-end;
}

View file

@ -28,4 +28,9 @@ limitations under the License.
font-size: 13px;
font-weight: 300;
color: $primary-fg-color;
}
.mx_ServerConfig_selector {
text-align: center;
width: 302px; // for fr i18n
}