Merge branch 'develop' into searchbox-fix-width

res/css/structures/_HomePage.scss

@@ -26,9 +26,10 @@ limitations under the License.
 
 .mx_HomePage_default {
     text-align: center;
+    display: flex;
 
     .mx_HomePage_default_wrapper {
-        padding: 25vh 0 12px;
+        margin: auto;
     }
 
     img {
@@ -50,46 +51,12 @@ limitations under the License.
         color: $muted-fg-color;
     }
 
-    .mx_HomePage_userAvatar {
-        position: relative;
-        width: min-content;
+    .mx_MiniAvatarUploader {
         margin: 0 auto;
-
-        &::before, &::after {
-            content: '';
-            position: absolute;
-
-            height: 26px;
-            width: 26px;
-
-            right: -6px;
-            bottom: -6px;
-        }
-
-        &::before {
-            background-color: $primary-bg-color;
-            border-radius: 50%;
-            z-index: 1;
-        }
-
-        &::after {
-            background-color: $secondary-fg-color;
-            mask-position: center;
-            mask-repeat: no-repeat;
-            mask-image: url('$(res)/img/element-icons/camera.svg');
-            mask-size: 16px;
-            z-index: 2;
-        }
-
-        &.mx_HomePage_userAvatar_busy::after {
-            background: url("$(res)/img/spinner.gif") no-repeat center;
-            background-size: 80%;
-            mask: unset;
-        }
     }
 
     .mx_HomePage_default_buttons {
-        margin: 80px auto 0;
+        margin: 60px auto 0;
         width: fit-content;
 
         .mx_AccessibleButton {
@@ -97,7 +64,7 @@ limitations under the License.
 
             width: 160px;
             height: 132px;
-            margin: 0 20px;
+            margin: 20px;
             position: relative;
             display: inline-block;
             border-radius: 8px;

res/css/structures/_RoomStatusBar.scss

@@ -19,57 +19,6 @@ limitations under the License.
     min-height: 50px;
 }
 
-/* position the indicator in the same place horizontally as .mx_EventTile_avatar. */
-.mx_RoomStatusBar_indicator {
-    padding-left: 17px;
-    padding-right: 12px;
-    margin-left: -73px;
-    margin-top: 15px;
-    float: left;
-    width: 24px;
-    text-align: center;
-}
-
-.mx_RoomStatusBar_callBar {
-    height: 50px;
-    line-height: $font-50px;
-}
-
-.mx_RoomStatusBar_placeholderIndicator span {
-    color: $primary-fg-color;
-    opacity: 0.5;
-    position: relative;
-    top: -4px;
-    /*
-    animation-duration: 1s;
-    animation-name: bounce;
-    animation-direction: alternate;
-    animation-iteration-count: infinite;
-    */
-}
-
-.mx_RoomStatusBar_placeholderIndicator span:nth-child(1) {
-    animation-delay: 0.3s;
-}
-.mx_RoomStatusBar_placeholderIndicator span:nth-child(2) {
-    animation-delay: 0.6s;
-}
-.mx_RoomStatusBar_placeholderIndicator span:nth-child(3) {
-    animation-delay: 0.9s;
-}
-
-@keyframes bounce {
-    from {
-        opacity: 0.5;
-        top: 0;
-    }
-
-    to {
-        opacity: 0.2;
-        top: -3px;
-    }
-}
-
 .mx_RoomStatusBar_typingIndicatorAvatars {
     width: 52px;
     margin-top: -1px;
@@ -153,16 +102,6 @@ limitations under the License.
     display: block;
 }
 
-.mx_RoomStatusBar_isAlone {
-    height: 50px;
-    line-height: $font-50px;
-
-    color: $primary-fg-color;
-    opacity: 0.5;
-    overflow-y: hidden;
-    display: block;
-}
-
 .mx_MatrixChat_useCompactLayout {
     .mx_RoomStatusBar {
         min-height: 40px;
@@ -172,11 +111,6 @@ limitations under the License.
         margin-top: 10px;
     }
 
-    .mx_RoomStatusBar_callBar {
-        height: 40px;
-        line-height: $font-40px;
-    }
-
     .mx_RoomStatusBar_typingBar {
         height: 40px;
         line-height: $font-40px;

res/css/structures/_UserMenu.scss

@@ -231,9 +231,29 @@ limitations under the License.
             justify-content: center;
         }
 
+        &.mx_UserMenu_contextMenu_guestPrompts,
         &.mx_UserMenu_contextMenu_hostingLink {
             padding-top: 0;
         }
+
+        &.mx_UserMenu_contextMenu_guestPrompts {
+            display: inline-block;
+
+            > span {
+                font-weight: 600;
+                display: block;
+
+                & + span {
+                    margin-top: 8px;
+                }
+            }
+
+            .mx_AccessibleButton_kind_link {
+                font-weight: normal;
+                font-size: inherit;
+                padding: 0;
+            }
+        }
     }
 
     .mx_IconizedContextMenu_icon {

res/css/structures/auth/_Login.scss

@@ -18,7 +18,7 @@ limitations under the License.
 .mx_Login_submit {
     @mixin mx_DialogButton;
     width: 100%;
-    margin-top: 35px;
+    margin-top: 24px;
     margin-bottom: 24px;
     box-sizing: border-box;
     text-align: center;
@@ -33,12 +33,6 @@ limitations under the License.
     cursor: default;
 }
 
-.mx_AuthBody a.mx_Login_sso_link:link,
-.mx_AuthBody a.mx_Login_sso_link:hover,
-.mx_AuthBody a.mx_Login_sso_link:visited {
-    color: $button-primary-fg-color;
-}
-
 .mx_Login_loader {
     display: inline;
     position: relative;
@@ -91,6 +85,8 @@ limitations under the License.
 }
 
 div.mx_AccessibleButton_kind_link.mx_Login_forgot {
+    display: block;
+    margin: 0 auto;
     // style it as a link
     font-size: inherit;
     padding: 0;