Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backups

res/css/views/dialogs/_EncryptedEventDialog.scss

@@ -24,4 +24,8 @@ limitations under the License.
     @mixin mx_DialogButton;
     background-color: $primary-bg-color;
     color: $accent-color;
-}
+}
+
+.mx_EncryptedEventDialog button {
+    margin-top: 0px;
+}

res/css/views/login/_InteractiveAuthEntryComponents.scss

@@ -35,8 +35,24 @@ limitations under the License.
     margin-bottom: 5px;
 }
 
+.mx_InteractiveAuthEntryComponents_termsSubmit {
+    margin-top: 20px;
+    margin-bottom: 5px;
+    display: block;
+    width: 100%;
+}
+
 // XXX: This should be a common button class
 .mx_InteractiveAuthEntryComponents_msisdnSubmit:disabled {
     background-color: $light-fg-color;
     cursor: default;
 }
+
+.mx_InteractiveAuthEntryComponents_termsSubmit:disabled {
+    background-color: $accent-color-50pct;
+    cursor: default;
+}
+
+.mx_InteractiveAuthEntryComponents_termsPolicy {
+    display: block;
+}

res/css/views/messages/_MImageBody.scss

@@ -46,3 +46,14 @@ limitations under the License.
 .mx_MImageBody_thumbnail_spinner > * {
     transform: translate(-50%, -50%);
 }
+
+.mx_MImageBody_gifLabel {
+    position: absolute;
+    display: block;
+    top: 0px;
+    left: 14px;
+    padding: 5px;
+    border-radius: 5px;
+    background: $imagebody-giflabel;
+    border: 2px solid $imagebody-giflabel-border;
+}

res/css/views/rooms/_MemberDeviceInfo.scss

@@ -19,7 +19,6 @@ limitations under the License.
 }
 
 .mx_MemberDeviceInfo.mx_DeviceVerifyButtons {
-    padding: 6px 0;
     display: flex;
     flex-wrap: wrap;
     justify-content: space-between;