Merge branch 'main' into table-break-word-modified

nhsuk · Nov 29, 2024 · efabf25 · efabf25
2 parents e6c9d8d + 4a5ce91
commit efabf25
Show file tree

Hide file tree

Showing 10 changed files with 129 additions and 13,852 deletions.
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -7,7 +7,7 @@ jobs:
     name: Sonar analysis
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - uses: actions/setup-node@v4
       with:
         node-version: 20

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           persist-credentials: false
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # NHS.UK frontend Changelog
 
+## Unreleased
+
+:wrench: **Fixes**
+
+- Fix appearance of disabled warning buttons ([Issue 1034]([https://github.com/nhsuk/nhsuk-service-manual-community-backlog/issues/1034]))
+- Fix reverse button text colour ([PR 1080]([https://github.com/nhsuk/nhsuk-frontend/pull/1080]))
+
 ## 9.1.0 - 4 November 2024
 
 :new: **New features**

diff --git a/app/components/button/disabled.njk b/app/components/button/disabled.njk
@@ -7,14 +7,34 @@
 
   <div class="nhsuk-width-container">
     <main class="nhsuk-main-wrapper" id="maincontent">
-
       <div class="nhsuk-grid-row">
-        <div class="nhsuk-grid-column-two-thirds">
+        <div class="nhsuk-grid-column-full">
           {{ button({
             "text": "Disabled button",
             "disabled": true
           }) }}
         </div>
+        <div class="nhsuk-grid-column-full">
+          {{ button({
+            "text": "Disabled secondary button",
+            "classes": "nhsuk-button--secondary",
+            "disabled": true
+          }) }}
+        </div>
+        <div class="nhsuk-grid-column-full">
+          {{ button({
+            "text": "Disabled reversed button",
+            "classes": "nhsuk-button--reverse",
+            "disabled": true
+          }) }}
+        </div>
+        <div class="nhsuk-grid-column-full">
+          {{ button({
+            "text": "Disabled warning button",
+            "classes": "nhsuk-button--warning",
+            "disabled": true
+          }) }}
+        </div>
       </div>
     </main>
   </div>