From 9d8e799f463815adfd653f5cf338584fdf47db92 Mon Sep 17 00:00:00 2001 From: Mikael Arvola Date: Fri, 13 Sep 2024 13:52:58 -0500 Subject: [PATCH] Fix issue with ::slotted always having less specificity than global styles. --- .github/workflows/sample.yml | 38 ------------------- builder/ilw-card.json | 2 +- ...alpha2.json => ilw-card.1.0.0-alpha3.json} | 6 +-- package.json | 2 +- src/ilw-card.styles.css | 4 +- 5 files changed, 7 insertions(+), 45 deletions(-) delete mode 100644 .github/workflows/sample.yml rename builder/versions/{ilw-card.1.0.0-alpha2.json => ilw-card.1.0.0-alpha3.json} (99%) diff --git a/.github/workflows/sample.yml b/.github/workflows/sample.yml deleted file mode 100644 index 3773313..0000000 --- a/.github/workflows/sample.yml +++ /dev/null @@ -1,38 +0,0 @@ -name: Build sample page - -on: - push: - branches: [ "main" ] -permissions: - contents: read - pages: write - id-token: write - -jobs: - build: - if: ${{ github.repository == 'marvel-uiuc/ilw-card' }} - environment: - name: github-pages - url: ${{ steps.deployment.outputs.page_url }} - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - name: Node.js - uses: actions/setup-node@v4 - with: - node-version: 22 - - name: Build - run: | - npm install - npm run build - cp samples/index.html dist/index.html - sed -i 's|||' dist/index.html - - name: Setup Pages - uses: actions/configure-pages@v5 - - name: Upload artifact - uses: actions/upload-pages-artifact@v3 - with: - path: 'dist' - - name: Deploy to GitHub Pages - id: deployment - uses: actions/deploy-pages@v4 \ No newline at end of file diff --git a/builder/ilw-card.json b/builder/ilw-card.json index af636bd..cf9528c 100644 --- a/builder/ilw-card.json +++ b/builder/ilw-card.json @@ -7,5 +7,5 @@ "description": "A card component that can be used as a container for grouping information.", "toolkit-version": "", "production-version": "", - "development-version": "1.0.0-alpha2" + "development-version": "1.0.0-alpha3" } diff --git a/builder/versions/ilw-card.1.0.0-alpha2.json b/builder/versions/ilw-card.1.0.0-alpha3.json similarity index 99% rename from builder/versions/ilw-card.1.0.0-alpha2.json rename to builder/versions/ilw-card.1.0.0-alpha3.json index b235974..aa081a6 100644 --- a/builder/versions/ilw-card.1.0.0-alpha2.json +++ b/builder/versions/ilw-card.1.0.0-alpha3.json @@ -5,10 +5,10 @@ "type": "web component", "element-name": "ilw-card", "description": "A card component that can be used as a container for grouping information.", - "version": "1.0.0-alpha2", + "version": "1.0.0-alpha3", "date": "08/02/2024", - "css": "https://dev.toolkit.illinois.edu/ilw-card/1.0.0-alpha2/ilw-card.css", - "js": "https://dev.toolkit.illinois.edu/ilw-card/1.0.0-alpha2/ilw-card.js", + "css": "https://dev.toolkit.illinois.edu/ilw-card/1.0.0-alpha3/ilw-card.css", + "js": "https://dev.toolkit.illinois.edu/ilw-card/1.0.0-alpha3/ilw-card.js", "production": false, "notes": "", "parent-style": "margin: 0 auto; max-width: 400px; padding: 15px;", diff --git a/package.json b/package.json index 74cee2c..d0a20bd 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "description": "Illinois Toolkit: A card component that can be used as a container for grouping information, reminiscent of a physical note or playing card.", "repository": "github:web-illinois/ilw-card", "private": false, - "version": "1.0.0-alpha2", + "version": "1.0.0-alpha3", "type": "module", "files": [ "src/**", diff --git a/src/ilw-card.styles.css b/src/ilw-card.styles.css index d5509a4..9ea9077 100644 --- a/src/ilw-card.styles.css +++ b/src/ilw-card.styles.css @@ -286,13 +286,13 @@ article { ::slotted([slot="image"]) { aspect-ratio: var(--ilw-card--aspect-ratio); - width: 100%; + width: 100% !important; /* use important here because this should never be anything else */ object-fit: cover; } } .card-image ::slotted(*) { - width: 100%; + width: 100% !important; /* use important here because this should never be anything else */ } .card-content {