Merge remote-tracking branch 'origin/main' into staging

CHANGES.md

@@ -59,6 +59,7 @@
 
 ### :bug: Bugs fixed
 
+- Fix social buttons in register form [Taiga #4320](https://tree.taiga.io/project/penpot/issue/4320)
 - Remove gitter information from feedback page [Taiga #4157](https://tree.taiga.io/project/penpot/issue/4157)
 - Fix overlay remains open on frame change [Taiga #4066](https://tree.taiga.io/project/penpot/issue/4066)
 - Fix toggle overlay position [Taiga #4091](https://tree.taiga.io/project/penpot/issue/4091)

frontend/resources/styles/main/layouts/login.scss

@@ -54,22 +54,19 @@
   justify-content: center;
   position: relative;
 
-  .login-form {
+  .form-container {
+    width: 412px;
+    flex-direction: column;
     margin-bottom: 30px;
+    .auth-buttons {
+      margin: $size-6 0 $size-4 0;
+      display: flex;
+      justify-content: center;
+      column-gap: 17px;
+    }
 
-    .form-container {
-      width: 412px;
-      flex-direction: column;
-      .auth-buttons {
-        margin: $size-6 0 $size-4 0;
-        display: flex;
-        justify-content: center;
-        column-gap: 17px;
-      }
-
-      form {
-        margin: 2rem 0 0.5rem 0;
-      }
+    form {
+      margin: 2rem 0 0.5rem 0;
     }
   }
 

frontend/resources/styles/main/partials/modal.scss

@@ -1904,6 +1904,9 @@
     .terms-login {
       position: relative;
       bottom: 0;
+      span {
+        margin: 0 $size-2;
+      }
     }
   }