Merge branch 'develop' into bwindels/selfverifux

This commit is contained in:
Bruno Windels 2020-04-03 17:53:07 +02:00
commit adead76882
101 changed files with 509 additions and 341 deletions

View file

@ -20,7 +20,7 @@ limitations under the License.
flex-direction: column;
flex: 1;
overflow-y: auto;
font-size: 12px;
font-size: $font-12px;
.mx_UserInfo_cancel {
cursor: pointer;
@ -43,7 +43,7 @@ limitations under the License.
}
h2 {
font-size: 18px;
font-size: $font-18px;
font-weight: 600;
margin: 18px 0 0 0;
}
@ -122,7 +122,7 @@ limitations under the License.
text-transform: uppercase;
color: $notice-secondary-color;
font-weight: bold;
font-size: 12px;
font-size: $font-12px;
margin: 4px 0;
}
@ -134,8 +134,8 @@ limitations under the License.
text-align: center;
h2 {
font-size: 18px;
line-height: 25px;
font-size: $font-18px;
line-height: $font-25px;
flex: 1;
justify-content: center;
align-items: center;
@ -197,7 +197,7 @@ limitations under the License.
.mx_UserInfo_field {
cursor: pointer;
color: $accent-color;
line-height: 16px;
line-height: $font-16px;
margin: 8px 0;
&.mx_UserInfo_destructive {
@ -206,7 +206,7 @@ limitations under the License.
}
.mx_UserInfo_statusMessage {
font-size: 11px;
font-size: $font-11px;
opacity: 0.5;
overflow: hidden;
white-space: nowrap;

View file

@ -114,7 +114,7 @@ limitations under the License.
}
.mx_VerificationPanel_QRPhase_helpText {
font-size: 14px;
font-size: $font-14px;
margin: 30px 0;
text-align: center;
}