Skip to content

Commit

Permalink
Merge branch 'dev' into issue/118-input-error-identification
Browse files Browse the repository at this point in the history
  • Loading branch information
DanielCouzens committed Aug 14, 2024
2 parents fb026f2 + 5f906b6 commit 03db7ed
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 4 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

## 1.5.3 - 2024-08

- (Dan) Adds underline text to laning page of standard reports and to help link[114](https://github.com/epimorphics/standard-reports-ui/issues/114)
- (Dan) Styled the help button to match PPD [117](https://github.com/epimorphics/standard-reports-ui/issues/117)
- (Dan) Adds more descriptive text to action buttons on the report page [115](https://github.com/epimorphics/standard-reports-ui/issues/115)

Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -80,5 +80,5 @@ end
# TODO: In production you want to set this to the gem from the epimorphics package repo
source 'https://rubygems.pkg.github.com/epimorphics' do
gem 'json_rails_logger', '~> 1.0.0'
gem 'lr_common_styles', '~> 1.9.3'
gem 'lr_common_styles', '~> 1.9', '>= 1.9.4'
end
4 changes: 4 additions & 0 deletions app/assets/stylesheets/application.scss
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,7 @@
"lr_common_styles/lr-common",
"leaflet",
"standard-reports";

.text-link {
text-decoration: underline;
}
5 changes: 3 additions & 2 deletions app/views/landing/index.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,12 @@
%p
Note: standard reports contain aggregated prices by geographical area. If you are looking for details
of individual property sales, please use the
%a{ href: "/app/ppd" }
%a{ href: "/app/ppd", class: "text-link" }
PPD report builder
instead.
%p
You can read more information
= succeed "." do
= link_to "about this service", "https://www.gov.uk/guidance/price-paid-data-standard-reports#guidance-on-searching-the-data"
= link_to "about this service", "https://www.gov.uk/guidance/price-paid-data-standard-reports#guidance-on-searching-the-data", class: "text-link"

1 change: 0 additions & 1 deletion app/views/report_design/_help.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,3 @@
= link_to "https://www.gov.uk/guidance/price-paid-data-standard-reports#guidance-on-searching-the-data", class: "button button--secondary", alt: "Help and tips", title: "Help and tips" do
%i.fa.fa-question-circle
help

0 comments on commit 03db7ed

Please sign in to comment.