Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/cs_verification_decoration

Conflicts: src/components/views/right_panel/VerificationPanel.js
2020-01-27 15:46:38 +00:00
parent b67256c7c2 0eb49c4c72
commit ddb0f06005
42 changed files with 1083 additions and 110 deletions
@@ -109,7 +109,7 @@ limitations under the License.
        justify-content: center;

        // override the calculated sizes so that the letter isn't HUGE
-        font-size: 26px !important;
+        font-size: 56px !important;
        width: 100% !important;
    }