Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add class nhsuk-card-group to card component design examples #1938

Merged
merged 11 commits into from
Mar 26, 2024
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# NHS digital service manual Changelog

## 6.2.0 - 25 March 2024
## 6.2.0 - 26 March 2024

:new: **New features**

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% from 'card/macro.njk' import card %}

<ul class="nhsuk-grid-row">
<ul class="nhsuk-grid-row nhsuk-card-group">
<li class="nhsuk-grid-column-two-thirds nhsuk-card-group__item">
{{ card({
"href": "#",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% from 'card/macro.njk' import card %}

<ul class="nhsuk-grid-row">
<ul class="nhsuk-grid-row nhsuk-card-group">
<li class="nhsuk-grid-column-two-thirds nhsuk-card-group__item">
{{ card({
"href": "#",
Expand Down
2 changes: 1 addition & 1 deletion app/views/design-system/components/card/top-task/index.njk
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% from 'card/macro.njk' import card %}

<ul class="nhsuk-grid-row">
<ul class="nhsuk-grid-row nhsuk-card-group">
<li class="nhsuk-grid-column-one-third nhsuk-card-group__item">
{{ card({
"href": "#",
Expand Down
1 change: 0 additions & 1 deletion app/views/includes/_side-nav.njk
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,6 @@
</ul>
{% endif %}


{%- if subSection == "Inclusive content" %}
<h2 class="app-side-nav__heading">Inclusive content <span class="nhsuk-u-visually-hidden">navigation</span></h2>
<ul class="nhsuk-list app-side-nav__list">
Expand Down
40 changes: 0 additions & 40 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,46 +41,6 @@ steps:
- script: npm run test
displayName: 'Test'

- script: |
pat=$(AZURE_DEVOPS_PERSONAL_PAT)
azBuildId=$(curl -s -u :$pat \
-H "Content-Type: application/json" \
"https://dev.azure.com/nhsuk/nhsuk.utilities/_apis/build/latest/1395?branchName=main&resultFilter=succeeded&statusFilter=completed&api-version=7.1-preview.1" | jq '.id')

echo "azBuildId" $azBuildId
echo $pat | az devops login --organization https://dev.azure.com/nhsuk/

az pipelines runs artifact download \
--artifact-name owasp \
--path $(Pipeline.Workspace)/owasp \
--run-id $azBuildId \
--org "https://dev.azure.com/nhsuk/" \
--project nhsuk.utilities

find $(Pipeline.Workspace)/owasp -type f -iname "*.sh" -exec chmod +x {} \;
displayName: 'Install & Login Azure DevOps Extension'

- task: Bash@3
inputs:
filePath: '$(Pipeline.Workspace)/owasp/run_owasp_scanner.sh'
arguments: '--scan "$(System.DefaultWorkingDirectory)" --failOnCVSS "7" --project "service-manual" --out "$(System.DefaultWorkingDirectory)/dependency-scan-results" --exclude $(Build.SourcesDirectory)/node_modules --format HTML --format JUNIT --format JSON --suppression $(System.DefaultWorkingDirectory)/owasp-suppressions.xml --nodePackageSkipDevDependencies --nodeAuditSkipDevDependencies'
displayName: Run OWASP Dependency Check

- task: PublishTestResults@2
displayName: "Publish OWASP dependency check results"
condition: succeededOrFailed()
inputs:
testRunner: JUnit
testResultsFiles: $(System.DefaultWorkingDirectory)/dependency-scan-results/dependency-check-junit.xml
testRunTitle: "OWASP Dependency check"

- task: PublishBuildArtifacts@1
displayName: 'OWASP Scan Results'
condition: succeededOrFailed()
inputs:
PathtoPublish: '$(System.DefaultWorkingDirectory)/dependency-scan-results'
ArtifactName: 'owasp'

- task: SonarCloudAnalyze@1
displayName: 'Run SonarCloud Code Analysis'

Expand Down
Loading