fix(cleanup): upping action versions. Cleaning up variables"

digitalspace · Jun 14, 2024 · b14a6c9 · b14a6c9
1 parent 098e97d
commit b14a6c9
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 34 deletions.
diff --git a/.github/workflows/on-push.yaml b/.github/workflows/on-push.yaml
@@ -14,12 +14,12 @@ jobs:
     steps:
       # Setup and build
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: "**/node_modules"
           key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}

diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
@@ -21,7 +21,7 @@ jobs:
 
       # Create GH Release
       - name: Create Release
-        uses: "actions/github-script@v6"
+        uses: "actions/github-script@v7"
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
           script: |
@@ -47,20 +47,20 @@ jobs:
       matrix:
         node-version: [18]
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
           registry-url: 'https://registry.npmjs.org'
           scope: "@digitalspace"
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: "**/node_modules"
           key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
       - name: Install dependencies
         run: yarn install --silent --frozen-lockfile
       - name: Cache Dist
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: "**/dist"
           key: ${{ github.event.inputs.releaseTag }}-dist
@@ -75,20 +75,20 @@ jobs:
       matrix:
         node-version: [18]
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
           registry-url: 'https://npm.pkg.github.com'
           scope: "@digitalspace"
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: "**/node_modules"
           key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
       - name: Install dependencies
         run: yarn install --silent --frozen-lockfile
       - name: Cache Dist
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: "**/dist"
           key: ${{ github.event.inputs.releaseTag }}-dist
@@ -108,14 +108,14 @@ jobs:
       name: github-pages
       url: ${{steps.deployment.outputs.page_url}}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Cache Dist
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: "**/dist"
           key: ${{ github.event.inputs.releaseTag }}-dist
       - run: yarn pack --filename github-pages.tgz
-      - uses: actions/configure-pages@v3
+      - uses: actions/configure-pages@v4
       - uses: actions/upload-pages-artifact@v3
         with:
           path: .

diff --git a/index.html b/index.html
@@ -1645,7 +1645,7 @@ <h4 class="my-0">Default</h4>
                     <div class="col-lg-4">
                         <div class="card border-primary">
                             <div class="card-header border-primary text-white bg-primary">
-                                <h4 class="my-0">Primary</h4>
+                                <h5 class="my-0">Primary</h5>
                             </div>
                             <div class="card-body">
                                 <p class="card-text">This is a primary color panel.</p>
@@ -1655,7 +1655,7 @@ <h4 class="my-0">Primary</h4>
                     <div class="col-lg-4">
                         <div class="card border-secondary">
                             <div class="card-header border-secondary text-white bg-secondary">
-                                <h4 class="my-0">Secondary</h4>
+                                <h5 class="my-0">Secondary</h5>
                             </div>
                             <div class="card-body">
                                 <p class="card-text">This is a secondary color panel.</p>
@@ -1665,7 +1665,7 @@ <h4 class="my-0">Secondary</h4>
                     <div class="col-lg-4">
                         <div class="card border-info">
                             <div class="card-header border-info text-dark bg-info">
-                                <h4 class="my-0">Info</h4>
+                                <h5 class="my-0">Info</h5>
                             </div>
                             <div class="card-body">
                                 <p class="card-text">This is an info color panel.</p>
@@ -1678,7 +1678,7 @@ <h4 class="my-0">Info</h4>
                     <div class="col-lg-4">
                         <div class="card border-success">
                             <div class="card-header border-success text-white bg-success">
-                                <h4 class="my-0">Success</h4>
+                                <h5 class="my-0">Success</h5>
                             </div>
                             <div class="card-body">
                                 <p class="card-text">This is a classic success message.</p>
@@ -1688,7 +1688,7 @@ <h4 class="my-0">Success</h4>
                     <div class="col-lg-4">
                         <div class="card border-warning">
                             <div class="card-header border-warning text-dark bg-warning">
-                                <h4 class="my-0">Warning</h4>
+                                <h5 class="my-0">Warning</h5>
                             </div>
                             <div class="card-body">
                                 <p class="card-text">This is a classic warning message.</p>
@@ -1698,7 +1698,7 @@ <h4 class="my-0">Warning</h4>
                     <div class="col-lg-4">
                         <div class="card border-danger">
                             <div class="card-header border-danger text-white bg-danger">
-                                <h4 class="my-0">Danger</h4>
+                                <h5 class="my-0">Danger</h5>
                             </div>
                             <div class="card-body">
                                 <p class="card-text">This is a classic danger message.</p>

diff --git a/scss/_variables.scss b/scss/_variables.scss
@@ -60,7 +60,7 @@ $yellow: #EBC436;
 
 $border-color: #D8D8D8;
 $custom-control-indicator-checked-disabled-bg: #EDEBE9;
-$btn-link-disabled-color: #9F9D9C;
+$btn-link-disabled-color: $gray-700;
 $input-disabled-bg: $gray-300;
 $input-border-color: #D8D8D8;
 $input-placeholder-color: $gray-700;
@@ -72,25 +72,17 @@ $blockquote-small-color: #474543;
 $input-color: #2D2D2D;
 $body-color: #2D2D2D;
 $nav-tabs-link-active-color: #2D2D2D;
-$nav-link-disabled-color: #9F9D9C;
+$nav-link-disabled-color: $gray-700;
 $breadcrumb-active-color: $secondary;
-$custom-control-label-disabled-color: #9F9D9C;
+$custom-control-label-disabled-color: $gray-700;
 
 // Add our font as default
 $bcgov-font-path: "../fonts" !default;
 $font-family-sans-serif: BCSans, "Noto Sans", Verdana, Arial, sans serif !default;
 $font-family-base: $font-family-sans-serif !default;
 
 // Headings
-$headings-font-weight: 700 !default;
-$headings-line-height: 1.1 !default;
-$headings-margin-bottom: 1.25rem !default;
-$h1-font-size: 2.074rem !default;
-$h2-font-size: 1.54912rem !default;
-$h3-font-size: 1.33882rem !default;
-$h4-font-size: 1rem !default;
-$h5-font-size: 0.86425rem !default;
-$h6-font-size: 0.80345rem !default;
+$headings-font-weight: bold !default;
 
 // Links
 $link-decoration: underline !default;

diff --git a/scss/bootstrap-theme.scss b/scss/bootstrap-theme.scss
@@ -1,5 +1,5 @@
-@import "bootstrap/scss/functions";
 @import "variables";
+
 // Now bring in the rest of bootstrap!
 @import "bootstrap/scss/bootstrap";