Merge branch 'develop' into improve-image-view

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

res/css/views/elements/_MiniAvatarUploader.scss

@@ -18,6 +18,16 @@ limitations under the License.
     position: relative;
     width: min-content;
 
+    // this isn't a floating tooltip so override some things to not need to bother with z-index and floating
+    .mx_Tooltip {
+        display: inline-block;
+        position: absolute;
+        z-index: unset;
+        width: max-content;
+        left: 72px;
+        top: 0;
+    }
+
     &::before, &::after {
         content: '';
         position: absolute;

res/css/views/elements/_SSOButtons.scss

@@ -16,8 +16,15 @@ limitations under the License.
 
 .mx_SSOButtons {
     display: flex;
+    flex-wrap: wrap;
     justify-content: center;
 
+    .mx_SSOButtons_row {
+        & + .mx_SSOButtons_row {
+            margin-top: 16px;
+        }
+    }
+
     .mx_SSOButton {
         position: relative;
         width: 100%;
@@ -36,6 +43,8 @@ limitations under the License.
         box-sizing: border-box;
         width: 50px; // 48px + 1px border on all sides
         height: 50px; // 48px + 1px border on all sides
+        min-width: 50px; // prevent crushing by the flexbox
+        padding: 12px;
 
         > img {
             left: 12px;
@@ -43,7 +52,7 @@ limitations under the License.
         }
 
         & + .mx_SSOButton_mini {
-            margin-left: 24px;
+            margin-left: 16px;
         }
     }
 }