From a1ad7035dbef6f06d5cc51b4f469870ea5607ec9 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Wed, 27 Nov 2024 10:24:11 +0100
Subject: [PATCH] Fix home padding

Signed-off-by: Chocobozzz <me@florianbigard.com>
---
 client/src/app/+home/home.component.scss               |  8 --------
 .../shared-custom-markup/custom-markup.service.ts      | 10 +---------
 .../instance-banner-markup.component.html              |  2 +-
 .../instance-banner-markup.component.ts                |  6 ++----
 client/src/sass/application.scss                       |  4 ----
 client/src/sass/class-helpers/_images.scss             |  4 ----
 .../src/custom-markup/custom-markup-data.model.ts      |  4 ----
 7 files changed, 4 insertions(+), 34 deletions(-)

diff --git a/client/src/app/+home/home.component.scss b/client/src/app/+home/home.component.scss
index 67f73d70e..40083bed3 100644
--- a/client/src/app/+home/home.component.scss
+++ b/client/src/app/+home/home.component.scss
@@ -1,10 +1,2 @@
 @use '_variables' as *;
 @use '_mixins' as *;
-
-.margin-content {
-  padding-top: 2rem;
-
-  ::ng-deep .revert-home-padding-top {
-    margin-top: -2rem;
-  }
-}
diff --git a/client/src/app/shared/shared-custom-markup/custom-markup.service.ts b/client/src/app/shared/shared-custom-markup/custom-markup.service.ts
index cbbc3a173..ae05f8f5e 100644
--- a/client/src/app/shared/shared-custom-markup/custom-markup.service.ts
+++ b/client/src/app/shared/shared-custom-markup/custom-markup.service.ts
@@ -1,17 +1,16 @@
 import { ComponentRef, Injectable } from '@angular/core'
 import { MarkdownService } from '@app/core'
-import { logger } from '@root-helpers/logger'
 import {
   ButtonMarkupData,
   ChannelMiniatureMarkupData,
   ContainerMarkupData,
   EmbedMarkupData,
   InstanceAvatarMarkupData,
-  InstanceBannerMarkupData,
   PlaylistMiniatureMarkupData,
   VideoMiniatureMarkupData,
   VideosListMarkupData
 } from '@peertube/peertube-models'
+import { logger } from '@root-helpers/logger'
 import { DynamicElementService } from './dynamic-element.service'
 import {
   ButtonMarkupComponent,
@@ -162,15 +161,8 @@ export class CustomMarkupService {
   }
 
   private instanceBannerBuilder (el: HTMLElement) {
-    const data = el.dataset as InstanceBannerMarkupData
     const { component, loadedPromise } = this.dynamicElementService.createElement(InstanceBannerMarkupComponent)
 
-    const model = {
-      revertHomePaddingTop: this.buildBoolean(data.revertHomePaddingTop) ?? true
-    }
-
-    this.dynamicElementService.setModel(component, model)
-
     return { component, loadedPromise }
   }
 
diff --git a/client/src/app/shared/shared-custom-markup/peertube-custom-tags/instance-banner-markup.component.html b/client/src/app/shared/shared-custom-markup/peertube-custom-tags/instance-banner-markup.component.html
index cf9a40123..0a9f28995 100644
--- a/client/src/app/shared/shared-custom-markup/peertube-custom-tags/instance-banner-markup.component.html
+++ b/client/src/app/shared/shared-custom-markup/peertube-custom-tags/instance-banner-markup.component.html
@@ -1,3 +1,3 @@
-<div class="banner revert-margin-content" [ngClass]="{ 'revert-home-padding-top': revertHomePaddingTop }" *ngIf="instanceBannerUrl">
+<div class="banner" *ngIf="instanceBannerUrl">
   <img [src]="instanceBannerUrl" alt="Instance banner">
 </div>
diff --git a/client/src/app/shared/shared-custom-markup/peertube-custom-tags/instance-banner-markup.component.ts b/client/src/app/shared/shared-custom-markup/peertube-custom-tags/instance-banner-markup.component.ts
index 9b48e3b42..ec60f8e1c 100644
--- a/client/src/app/shared/shared-custom-markup/peertube-custom-tags/instance-banner-markup.component.ts
+++ b/client/src/app/shared/shared-custom-markup/peertube-custom-tags/instance-banner-markup.component.ts
@@ -1,4 +1,4 @@
-import { NgClass, NgIf } from '@angular/common'
+import { NgIf } from '@angular/common'
 import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnInit } from '@angular/core'
 import { ServerService } from '@app/core'
 import { maxBy } from '@peertube/peertube-core-utils'
@@ -13,11 +13,9 @@ import { CustomMarkupComponent } from './shared'
   templateUrl: 'instance-banner-markup.component.html',
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
-  imports: [ NgIf, NgClass ]
+  imports: [ NgIf ]
 })
 export class InstanceBannerMarkupComponent implements OnInit, CustomMarkupComponent {
-  @Input() revertHomePaddingTop: boolean
-
   instanceBannerUrl: string
   loaded: undefined
 
diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss
index c224bf931..26b174307 100644
--- a/client/src/sass/application.scss
+++ b/client/src/sass/application.scss
@@ -238,10 +238,6 @@ a {
     flex-grow: 1;
   }
 
-  .revert-margin-content {
-    margin: 0 calc(#{pvar(--x-margin-content)} * -1);
-  }
-
   .skip-to-content-sub-menu {
     display: block;
     z-index: z(modal);
diff --git a/client/src/sass/class-helpers/_images.scss b/client/src/sass/class-helpers/_images.scss
index b70ca3f74..c504c57f4 100644
--- a/client/src/sass/class-helpers/_images.scss
+++ b/client/src/sass/class-helpers/_images.scss
@@ -9,10 +9,6 @@
   }
 }
 
-.revert-margin-content.banner {
-  width: calc(100% + 2 * #{pvar(--x-margin-content)});
-}
-
 .pt-icon {
   @include icon(24px);
 }
diff --git a/packages/models/src/custom-markup/custom-markup-data.model.ts b/packages/models/src/custom-markup/custom-markup-data.model.ts
index ba2924dcc..6f2037e23 100644
--- a/packages/models/src/custom-markup/custom-markup-data.model.ts
+++ b/packages/models/src/custom-markup/custom-markup-data.model.ts
@@ -59,10 +59,6 @@ export type ContainerMarkupData = {
   justifyContent?: 'space-between' | 'normal' // default to 'space-between'
 }
 
-export type InstanceBannerMarkupData = {
-  revertHomePaddingTop?: StringBoolean // default to 'true'
-}
-
 export type InstanceAvatarMarkupData = {
   size: string // size in pixels
 }