Merge branch 'master' into typescript/tab-controller-move-to-typescript

M-i-k-e-l · M-i-k-e-l · commit 7e37a8c68666 · 2020-12-21T17:56:30.000+02:00
* master: Fix/avatars label alignment (#1082)
diff --git a/generatedTypes/components/avatar/index.d.ts b/generatedTypes/components/avatar/index.d.ts
@@ -153,6 +153,7 @@ declare function createStyles(props: AvatarProps): {
     initials: {
         color: string | undefined;
         backgroundColor: string;
+        lineHeight: undefined;
     };
     ribbon: {
         backgroundColor: string;
diff --git a/src/components/avatar/index.tsx b/src/components/avatar/index.tsx
@@ -368,7 +368,8 @@ function createStyles(props: AvatarProps) {
     },
     initials: {
       color: labelColor,
-      backgroundColor: 'transparent'
+      backgroundColor: 'transparent',
+      lineHeight: undefined
     },
     ribbon: {
       backgroundColor: Colors.blue30,
