Merge branch 'master' into fix-height

iantrich · Jan 12, 2025 · 690f249 · 690f249
2 parents c1e1988 + cc56761
commit 690f249
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -25,7 +25,7 @@ jobs:
         run: npm ci
       - name: Build
         run: npm run build
-      - uses: actions/upload-artifact@v1
+      - uses: actions/upload-artifact@v4
         with:
           name: restriction-card.js
           path: dist/restriction-card.js
diff --git a/src/restriction-card.ts b/src/restriction-card.ts
@@ -145,7 +145,7 @@ class RestrictionCard extends LitElement implements LovelaceCard {
       element.hass = this._hass;
 
       return html`
-        <div id="card">
+        <div id="card" class=${classMap({ 'card-row': this._config.row === true })}>
           ${element}
         </div>
       `;
@@ -299,6 +299,9 @@ class RestrictionCard extends LitElement implements LovelaceCard {
       #card {
         height: 100%;
       }
+      #overlay:not(:has(.hidden)) + #card.card-row {
+        overflow-y: clip;
+      }
       .blocked {
         color: var(--blocked-lock-color) !important;
       }