Skip to content

Commit

Permalink
Merge pull request #30 from LandRegistry/govuk-frontend-5
Browse files Browse the repository at this point in the history
GOV.UK Frontend v5.x.x
  • Loading branch information
matthew-shaw authored Jun 5, 2024
2 parents 8b5a5ca + 6cff66c commit 2272c4a
Show file tree
Hide file tree
Showing 9 changed files with 1,505 additions and 1,305 deletions.
123 changes: 118 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Created by https://www.toptal.com/developers/gitignore/api/node,storybookjs,macos,linux,git,visualstudiocode
# Edit at https://www.toptal.com/developers/gitignore?templates=node,storybookjs,macos,linux,git,visualstudiocode
# Created by https://www.toptal.com/developers/gitignore/api/git,node,linux,macos,storybookjs,visualstudiocode,windows,jetbrains+all
# Edit at https://www.toptal.com/developers/gitignore?templates=git,node,linux,macos,storybookjs,visualstudiocode,windows,jetbrains+all

package

Expand All @@ -18,6 +18,94 @@ package
*_LOCAL_*.txt
*_REMOTE_*.txt

### JetBrains+all ###
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839

# User-specific stuff
.idea/**/workspace.xml
.idea/**/tasks.xml
.idea/**/usage.statistics.xml
.idea/**/dictionaries
.idea/**/shelf

# AWS User-specific
.idea/**/aws.xml

# Generated files
.idea/**/contentModel.xml

# Sensitive or high-churn files
.idea/**/dataSources/
.idea/**/dataSources.ids
.idea/**/dataSources.local.xml
.idea/**/sqlDataSources.xml
.idea/**/dynamic.xml
.idea/**/uiDesigner.xml
.idea/**/dbnavigator.xml

# Gradle
.idea/**/gradle.xml
.idea/**/libraries

# Gradle and Maven with auto-import
# When using Gradle or Maven with auto-import, you should exclude module files,
# since they will be recreated, and may cause churn. Uncomment if using
# auto-import.
# .idea/artifacts
# .idea/compiler.xml
# .idea/jarRepositories.xml
# .idea/modules.xml
# .idea/*.iml
# .idea/modules
# *.iml
# *.ipr

# CMake
cmake-build-*/

# Mongo Explorer plugin
.idea/**/mongoSettings.xml

# File-based project format
*.iws

# IntelliJ
out/

# mpeltonen/sbt-idea plugin
.idea_modules/

# JIRA plugin
atlassian-ide-plugin.xml

# Cursive Clojure plugin
.idea/replstate.xml

# SonarLint plugin
.idea/sonarlint/

# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties
fabric.properties

# Editor-based Rest Client
.idea/httpRequests

# Android studio 3.1+ serialized cache file
.idea/caches/build_file_checksums.ser

### JetBrains+all Patch ###
# Ignore everything but code style settings and run configurations
# that are supposed to be shared within teams.

.idea/*

!.idea/codeStyles
!.idea/runConfigurations

### Linux ###
*~

Expand Down Expand Up @@ -210,8 +298,7 @@ dist
# gitignore template for the Storybook, UI guide for front apps
# website: https://storybook.js.org/

storybook
storybook-static/
storybook/

### VisualStudioCode ###
.vscode/*
Expand All @@ -232,4 +319,30 @@ storybook-static/
.history
.ionide

# End of https://www.toptal.com/developers/gitignore/api/node,storybookjs,macos,linux,git,visualstudiocode
### Windows ###
# Windows thumbnail cache files
Thumbs.db
Thumbs.db:encryptable
ehthumbs.db
ehthumbs_vista.db

# Dump file
*.stackdump

# Folder config file
[Dd]esktop.ini

# Recycle Bin used on file shares
$RECYCLE.BIN/

# Windows Installer files
*.cab
*.msi
*.msix
*.msm
*.msp

# Windows shortcuts
*.lnk

# End of https://www.toptal.com/developers/gitignore/api/git,node,linux,macos,storybookjs,visualstudiocode,windows,jetbrains+all
2 changes: 1 addition & 1 deletion .storybook/storybook.scss
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
$govuk-assets-path: "/node_modules/govuk-frontend/govuk/assets/";
$govuk-assets-path: "/node_modules/govuk-frontend/dist/govuk/assets/";
$hmlr-assets-path: "/src/hmlr/assets/";
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

## [Unreleased] - yyyy-mm-dd

## [2.0.0-rc.1] - 2024-06-05

### Changed

- Updated `govuk-frontend` to `5.4.0`
- Updated js/css/assets import paths

Thanks to [Ben Lambert](https://github.com/BenLambertNcl)

## [1.4.0] - 2024-02-21

### Fixed
Expand Down
Loading

0 comments on commit 2272c4a

Please sign in to comment.