Merge branch 'master' into develop

# Conflicts: # res/css/views/avatars/_BaseAvatar.pcss
2023-09-12 16:59:39 +01:00 · 2023-09-12 16:59:39 +01:00 · 6a4915ac98
commit 6a4915ac98
parent b1f455eb2d fc01716588
4 changed files with 49 additions and 7 deletions
--- a/res/css/views/right_panel/_UserInfo.pcss
+++ b/res/css/views/right_panel/_UserInfo.pcss
@ -99,6 +99,11 @@ limitations under the License.
            margin: 0 auto;
            transition: 0.5s;

+            .mx_BaseAvatar {
+                /* Override the calculated font-size so that the letter isn't tiny */
+                font-size: 4rem;
+            }
+
            .mx_BaseAvatar,
            .mx_BaseAvatar img {
                width: 100%;
@ -250,6 +255,11 @@ limitations under the License.
                max-width: 72px;
                margin: 0 auto;
            }
+
+            .mx_BaseAvatar {
+                /* Override the calculated font-size so that the letter isn't tiny */
+                font-size: 2rem;
+            }
        }
    }
 }