Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/font-scaling-slider

2020-05-20 13:46:17 +01:00
parent 55e72dd5bf b96c1ada8a
commit 6d9d4ee547
473 changed files with 5407 additions and 1434 deletions
@@ -64,9 +64,6 @@ limitations under the License.

 .mx_ShareDialog_qrcode_container {
    float: left;
-    background-color: #ffffff;
-    padding: 5px; // makes qr code more readable in dark theme
-    border-radius: 5px;
    height: 256px;
    width: 256px;
    margin-right: 64px;
@@ -35,17 +35,6 @@ limitations under the License.
    align-items: flex-start;
 }

-.mx_CreateKeyBackupDialog_passPhraseHelp {
-    flex: 1;
-    height: 85px;
-    margin-left: 20px;
-    font-size: 80%;
-}
-
-.mx_CreateKeyBackupDialog_passPhraseHelp progress {
-    width: 100%;
-}
-
 .mx_CreateKeyBackupDialog_passPhraseInput {
    flex: none;
    width: 250px;
@@ -68,17 +68,6 @@ limitations under the License.
    margin-top: 0px;
 }

-.mx_CreateSecretStorageDialog_passPhraseHelp {
-    flex: 1;
-    height: 64px;
-    margin-left: 20px;
-    font-size: 80%;
-}
-
-.mx_CreateSecretStorageDialog_passPhraseHelp progress {
-    width: 100%;
-}
-
 .mx_CreateSecretStorageDialog_passPhraseMatch {
    width: 200px;
    margin-left: 20px;