Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
a56b530
refactor: Removes sass-rails gem
jonrandahl Dec 31, 2025
4c45b57
chore: replaces bootstrap-sass with bootstrap gem
jonrandahl Dec 31, 2025
5b020b3
feat(assets): Enables source maps for Autoprefixer
jonrandahl Dec 31, 2025
2acf2ea
feat(dev): Enables SASS source maps
jonrandahl Dec 31, 2025
47d424b
feat(config): Improves asset compression
jonrandahl Dec 31, 2025
41798b0
style(ppd): Improves PPD stylesheet formatting
jonrandahl Dec 31, 2025
d224b84
chore(style): Modernise application stylesheets
jonrandahl Dec 31, 2025
2d8a51e
style(ppd): Updates styles post Sass migration
jonrandahl Dec 31, 2025
d49f01d
refactor(ppd): Updates modal dismissals
jonrandahl Dec 31, 2025
079098d
refactor(ppd): Wraps email address in a span
jonrandahl Dec 31, 2025
9639080
refactor(ppd): Improves form group structure
jonrandahl Dec 31, 2025
9fafdd8
docs: Updated CHANGELOG
jonrandahl Dec 31, 2025
04e9db4
refactor: Removes duplicated styling
jonrandahl Dec 31, 2025
64b0f91
feat(deps): Adds Popper.js for Bootstrap
jonrandahl Dec 31, 2025
323427e
style: Improve action buttons layout
jonrandahl Dec 31, 2025
62f5c1b
refactor(ppd): Modernise styling with Sass modules
jonrandahl Dec 31, 2025
157f3ab
refactor(assets): Reorganise Gemfile
jonrandahl Dec 31, 2025
ea0e54f
chore(sass): Suppress SASS deprecation warnings
jonrandahl Dec 31, 2025
6c03fd7
style(ppd): Improves page layout and spacing
jonrandahl Jan 5, 2026
89aa632
style(cookie): Adds cookie banner styling
jonrandahl Jan 5, 2026
32ff934
refactor: Improves startup log message
jonrandahl Jan 14, 2026
7ecce77
chore(sass): Configures SASS deprecation silencing
jonrandahl Jan 14, 2026
5d58b32
chore(deps): Removes sass-rails gem
jonrandahl Jan 14, 2026
c335a86
feat: Adds `update` task to Makefile
jonrandahl Jan 14, 2026
a738137
chore(build): updates makefile for streamlined processes
jonrandahl Jan 14, 2026
c5543c7
feat(error): Improves error page display
jonrandahl Jan 14, 2026
644b299
chore: Ignore local TODO files
jonrandahl Jan 14, 2026
dacbbcf
feat(sass): Migrates to Dart Sass and updates Bootstrap
jonrandahl Jan 14, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -74,3 +74,6 @@ tags
.env
.env*.local
!.env.development

# Ignore local TODO files
TODO.md
30 changes: 30 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,36 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [2.3.0] - 2026-01

### Added

- Enabled Sass source maps for front-end debugging in development
- Added Autoprefixer initialiser for Bootstrap gem compatibility
- Added Popper.js dependency for Bootstrap functionality
- Added `update` Makefile target to check outdated dependencies
- Added cookie banner styling using Bootstrap conventions

### Changed

- Replaced `bootstrap-sass` with `bootstrap` gem for Dart Sass compatibility
[#309](https://github.com/epimorphics/ppd-explorer/issues/309)
- Modernised stylesheets after Sass migration
- Improved asset compression for smaller bundles
- Updated modals and forms to Bootstrap 5 notation
- Enhanced error page layout and status messages
- Converted form groups to semantic fieldsets for accessibility
- Replaced deprecated `lighten` with `color.adjust` Sass module
- Improved page layout padding and form spacing
- Enhanced action buttons responsiveness
- Streamlined Makefile with inline help
- Cleaned up startup log output

### Removed

- Removed `sass-rails` gem and deprecated dependencies
- Removed duplicated search form partial

## [2.2.3] - 2025-11

### Changed
Expand Down
31 changes: 11 additions & 20 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,18 @@ gem 'rails'
# Use Puma as the app server
gem 'puma'

# See https://github.com/sstephenson/execjs#readme for more supported runtimes
# See https://github.com/rails/execjs#readme for more supported runtimes
gem 'execjs'
# gem 'therubyracer', platforms: :ruby
gem 'libv8-node'

# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
gem 'jbuilder'
gem 'jquery-rails'

gem 'bootstrap-sass'
gem 'autoprefixer-rails'
gem 'dartsass-sprockets', '~> 3.2'

gem 'haml-rails'

gem 'rubocop'
Expand All @@ -39,18 +42,6 @@ gem 'yajl-ruby', require: 'yajl'
gem 'stackprof'
gem 'sentry-rails' # rubocop:disable Bundler/OrderedGems

# Assets group is temporarily disabled due to versioning issues with Rails
# group :assets do
# Use SCSS for stylesheets
gem 'sass-rails'
# ! Webpacker removes the need for Uglifier so we can safely remove it.
# ! If you want to use Uglifier, uncomment the line below
# ! and ensure you have the 'uglifier' gem in your Gemfile.
# ! See https://www.mintbit.com/blog/rails-5-6-upgrade-es6-uglifier-bug/
# Use Uglifier as compressor for JavaScript assets
# gem 'uglifier', require: false
# end

group :doc do
gem 'sdoc', require: false
end
Expand Down Expand Up @@ -84,6 +75,12 @@ group :development do

gem 'flamegraph'
gem 'memory_profiler'

# TODO: While running the rails app locally for testing you can set gems to your local path
# ! These 'local' paths do not work with a docker image - use the repo instead
# gem 'data_services_api', path: '~/Epimorphics/shared/data_services_api'
# gem 'json_rails_logger', path: '~/Epimorphics/shared/json-rails-logger'
# gem 'lr_common_styles', path: '~/Epimorphics/clients/land-registry/projects/lr_common_styles'
end

# TODO: In production you want to set this to the gem from the epimorphics package repo
Expand All @@ -92,9 +89,3 @@ source 'https://rubygems.pkg.github.com/epimorphics' do
gem 'json_rails_logger'
gem 'lr_common_styles'
end

# TODO: While running the rails app locally for testing you can set gems to your local path
# ! These 'local' paths do not work with a docker image - use the repo instead
# gem 'data_services_api', path: '~/Epimorphics/shared/data_services_api'
# gem 'json_rails_logger', path: '~/Epimorphics/shared/json-rails-logger'
# gem 'lr_common_styles', path: '~/Epimorphics/clients/land-registry/projects/lr_common_styles'
70 changes: 52 additions & 18 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,8 @@ GEM
base64 (0.3.0)
benchmark (0.5.0)
bigdecimal (3.3.1)
bootstrap-sass (3.4.1)
autoprefixer-rails (>= 5.2.1)
sassc (>= 2.0.0)
bootstrap (5.3.5)
popper_js (>= 2.11.8, < 3)
builder (3.3.0)
byebug (12.0.0)
capybara (3.40.0)
Expand All @@ -115,6 +114,12 @@ GEM
rexml
crass (1.0.6)
csv (3.3.5)
dartsass-sprockets (3.2.1)
railties (>= 4.0.0)
sassc-embedded (~> 1.80.1)
sprockets (> 3.0)
sprockets-rails
tilt
date (3.5.0)
diff-lcs (1.6.2)
docile (1.4.1)
Expand Down Expand Up @@ -151,6 +156,27 @@ GEM
ffi (~> 1.0)
globalid (1.3.0)
activesupport (>= 6.1)
google-protobuf (4.33.2)
bigdecimal
rake (>= 13)
google-protobuf (4.33.2-aarch64-linux-gnu)
bigdecimal
rake (>= 13)
google-protobuf (4.33.2-aarch64-linux-musl)
bigdecimal
rake (>= 13)
google-protobuf (4.33.2-arm64-darwin)
bigdecimal
rake (>= 13)
google-protobuf (4.33.2-x86_64-darwin)
bigdecimal
rake (>= 13)
google-protobuf (4.33.2-x86_64-linux-gnu)
bigdecimal
rake (>= 13)
google-protobuf (4.33.2-x86_64-linux-musl)
bigdecimal
rake (>= 13)
govuk_elements_rails (3.0.2)
govuk_frontend_toolkit (>= 5.2.0)
rails (>= 4.1.0)
Expand Down Expand Up @@ -273,6 +299,7 @@ GEM
parser (3.3.10.0)
ast (~> 2.4.1)
racc
popper_js (2.11.8)
pp (0.6.3)
prettyprint
prettyprint (0.2.0)
Expand Down Expand Up @@ -378,19 +405,27 @@ GEM
rubyzip (3.2.2)
sass (3.7.4)
sass-listen (~> 4.0.0)
sass-embedded (1.97.1-aarch64-linux-gnu)
google-protobuf (~> 4.31)
sass-embedded (1.97.1-aarch64-linux-musl)
google-protobuf (~> 4.31)
sass-embedded (1.97.1-arm-linux-gnueabihf)
google-protobuf (~> 4.31)
sass-embedded (1.97.1-arm-linux-musleabihf)
google-protobuf (~> 4.31)
sass-embedded (1.97.1-arm64-darwin)
google-protobuf (~> 4.31)
sass-embedded (1.97.1-x86_64-darwin)
google-protobuf (~> 4.31)
sass-embedded (1.97.1-x86_64-linux-gnu)
google-protobuf (~> 4.31)
sass-embedded (1.97.1-x86_64-linux-musl)
google-protobuf (~> 4.31)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
sass-rails (6.0.0)
sassc-rails (~> 2.1, >= 2.1.1)
sassc (2.4.0)
ffi (~> 1.9)
sassc-rails (2.1.2)
railties (>= 4.0.0)
sassc (>= 2.0)
sprockets (> 3.0)
sprockets-rails
tilt
sassc-embedded (1.80.8)
sass-embedded (~> 1.80)
sdoc (2.6.5)
rdoc (>= 5.0)
securerandom (0.4.1)
Expand Down Expand Up @@ -490,8 +525,8 @@ GEM
json
lograge
railties
lr_common_styles (2.3.1)
bootstrap-sass (~> 3.4.1)
lr_common_styles (3.0.0)
bootstrap (~> 5.3.2)
font-awesome-rails (~> 4.7.0)
govuk_elements_rails (= 3.0.2)
govuk_frontend_toolkit (~> 9.0)
Expand All @@ -502,7 +537,6 @@ GEM
modernizr-rails (~> 2.7)
modulejs-rails (~> 2.2.0)
rails (~> 8.0)
sass-rails (~> 6.0)

PLATFORMS
aarch64-linux
Expand All @@ -517,10 +551,11 @@ PLATFORMS
x86_64-linux-musl

DEPENDENCIES
bootstrap-sass
autoprefixer-rails
byebug
capybara
csv
dartsass-sprockets (~> 3.2)
data_services_api!
dotenv
execjs
Expand Down Expand Up @@ -555,7 +590,6 @@ DEPENDENCIES
rubocop
rubocop-rails
ruby-lsp
sass-rails
sdoc
selenium-webdriver
sentry-rails
Expand Down
Loading