From 1d007a5aaf882b24e9ec9dca7538d2e9db447ebf Mon Sep 17 00:00:00 2001
From: Paul Bottein <paul.bottein@gmail.com>
Date: Thu, 5 Sep 2024 15:52:59 +0200
Subject: [PATCH] After rebase clean

---
 src/data/lovelace.ts                             | 1 -
 src/panels/lovelace/sections/hui-grid-section.ts | 9 +--------
 src/panels/lovelace/sections/hui-section.ts      | 6 ------
 src/panels/lovelace/views/hui-sections-view.ts   | 3 +--
 4 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/src/data/lovelace.ts b/src/data/lovelace.ts
index d43747f06a..1b4f47aa38 100644
--- a/src/data/lovelace.ts
+++ b/src/data/lovelace.ts
@@ -33,7 +33,6 @@ export interface LovelaceSectionElement extends HTMLElement {
   lovelace?: Lovelace;
   preview?: boolean;
   viewIndex?: number;
-  columnSpan?: number;
   index?: number;
   cards?: HuiCard[];
   isStrategy: boolean;
diff --git a/src/panels/lovelace/sections/hui-grid-section.ts b/src/panels/lovelace/sections/hui-grid-section.ts
index dc5012724c..8378b3e173 100644
--- a/src/panels/lovelace/sections/hui-grid-section.ts
+++ b/src/panels/lovelace/sections/hui-grid-section.ts
@@ -35,8 +35,6 @@ export class GridSection extends LitElement implements LovelaceSectionElement {
 
   @property({ type: Boolean }) public isStrategy = false;
 
-  @property({ type: Number, attribute: "column_span" }) public columnSpan = 1;
-
   @property({ attribute: false }) public cards: HuiCard[] = [];
 
   @state() _config?: LovelaceSectionConfig;
@@ -79,12 +77,7 @@ export class GridSection extends LitElement implements LovelaceSectionElement {
         .options=${CARD_SORTABLE_OPTIONS}
         invert-swap
       >
-        <div
-          class="container ${classMap({ "edit-mode": editMode })}"
-          style=${styleMap({
-            "--column-span": this.columnSpan,
-          })}
-        >
+        <div class="container ${classMap({ "edit-mode": editMode })}">
           ${repeat(
             cardsConfig,
             (cardConfig) => this._getKey(cardConfig),
diff --git a/src/panels/lovelace/sections/hui-section.ts b/src/panels/lovelace/sections/hui-section.ts
index c6cc4a4638..07dc7a78f8 100644
--- a/src/panels/lovelace/sections/hui-section.ts
+++ b/src/panels/lovelace/sections/hui-section.ts
@@ -47,8 +47,6 @@ export class HuiSection extends ReactiveElement {
 
   @property({ type: Number }) public viewIndex!: number;
 
-  @property({ type: Number }) public columnSpan!: number;
-
   @state() private _cards: HuiCard[] = [];
 
   private _layoutElementType?: string;
@@ -133,9 +131,6 @@ export class HuiSection extends ReactiveElement {
       if (changedProperties.has("_cards")) {
         this._layoutElement.cards = this._cards;
       }
-      if (changedProperties.has("columnSpan")) {
-        this._layoutElement.columnSpan = this.columnSpan;
-      }
       if (changedProperties.has("hass") || changedProperties.has("preview")) {
         this._updateElement();
       }
@@ -200,7 +195,6 @@ export class HuiSection extends ReactiveElement {
     this._layoutElement!.lovelace = this.lovelace;
     this._layoutElement!.index = this.index;
     this._layoutElement!.viewIndex = this.viewIndex;
-    this._layoutElement!.columnSpan = this.columnSpan;
     this._layoutElement!.cards = this._cards;
 
     if (addLayoutElement) {
diff --git a/src/panels/lovelace/views/hui-sections-view.ts b/src/panels/lovelace/views/hui-sections-view.ts
index 11c2d8c647..4be7ab3935 100644
--- a/src/panels/lovelace/views/hui-sections-view.ts
+++ b/src/panels/lovelace/views/hui-sections-view.ts
@@ -225,10 +225,10 @@ export class SectionsView extends LitElement implements LovelaceViewElement {
                 sectionConfig?.column_span || 1,
                 maxColumnCount
               );
+
               const rowSpan = sectionConfig?.row_span || 1;
 
               (section as any).itemPath = [idx];
-              (section as any).columnSpan = columnSpan;
 
               return html`
                 <div
@@ -384,7 +384,6 @@ export class SectionsView extends LitElement implements LovelaceViewElement {
         --column-gap: var(--ha-view-sections-column-gap, 24px);
         --column-min-width: var(--ha-view-sections-column-min-width, 320px);
         --column-max-width: var(--ha-view-sections-column-max-width, 500px);
-        --column-min-width: var(--ha-view-sections-column-min-width, 320px);
         display: block;
       }