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.

Sign up for GitHub

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

Issue/117 consistent help #123

Merged
merged 3 commits into from
Aug 13, 2024
Merged

Issue/117 consistent help #123

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f8c417f
styles the help button to match PPD
DanielCouzens Aug 13, 2024
228331c
updates changelog and version cadence
DanielCouzens Aug 13, 2024
bad1e00
Merge branch 'dev' into issue/117-consistent-help
DanielCouzens Aug 13, 2024
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Standard Reports UI: change log

## 1.5.3 - 2024-08

- (Dan) Styled the help button to match PPD [117](https://github.com/epimorphics/standard-reports-ui/issues/117)

## 1.5.2 - 2023-11-27

- (Jon) Updated the `lr_common_styles` gem to the latest 1.9.3 patch release.
Expand Down
3 changes: 2 additions & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ RUN apk add --update \
nodejs \
tzdata \
&& rm -rf /var/cache/apk/* \
&& gem update --system \
&& gem install rubygems-update -v 3.4.22 \
&& update_rubygems \
&& gem install bundler:$BUNDLER_VERSION \
&& bundle config --global frozen 1

Expand Down
2 changes: 1 addition & 1 deletion app/lib/version.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
module Version
MAJOR = 1
MINOR = 5
PATCH = 2
PATCH = 3
SUFFIX = nil
VERSION = "#{MAJOR}.#{MINOR}.#{PATCH}#{SUFFIX && ".#{SUFFIX}"}"
end
5 changes: 4 additions & 1 deletion app/views/report_design/_help.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
.o-help-link
= link_to( "help", "https://www.gov.uk/guidance/price-paid-data-standard-reports#guidance-on-searching-the-data" )
= 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