Skip to content

Commit 704dcf5

Browse files
TetrinoTetrino
authored
Merge pull request #30 from alphagov/fcm-layout-cleanup
[MAIN-7105] Further refinement of comparison layout
2 parents 11879fd + 2164747 commit 704dcf5

File tree

6 files changed

+32
-41
lines changed

6 files changed

+32
-41
lines changed

‎app/assets/stylesheets/application.scss‎

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -3,45 +3,17 @@ $govuk-page-width: 1140px;
33
// GOVUK Design System
44
@import 'govuk_publishing_components/govuk_frontend_support';
55
@import 'govuk_publishing_components/component_support';
6-
@import 'govuk_publishing_components/components/accordion';
7-
@import 'govuk_publishing_components/components/add-another';
86
@import 'govuk_publishing_components/components/back-link';
97
@import 'govuk_publishing_components/components/button';
10-
@import 'govuk_publishing_components/components/checkboxes';
11-
@import 'govuk_publishing_components/components/date-input';
12-
@import 'govuk_publishing_components/components/details';
13-
@import 'govuk_publishing_components/components/document-list';
14-
@import 'govuk_publishing_components/components/emergency-banner';
15-
@import 'govuk_publishing_components/components/error-alert';
16-
@import 'govuk_publishing_components/components/error-message';
178
@import 'govuk_publishing_components/components/error-summary';
18-
@import 'govuk_publishing_components/components/fieldset';
199
@import 'govuk_publishing_components/components/govspeak';
2010
@import 'govuk_publishing_components/components/heading';
21-
@import 'govuk_publishing_components/components/hint';
22-
@import 'govuk_publishing_components/components/input';
2311
@import 'govuk_publishing_components/components/inset-text';
24-
@import 'govuk_publishing_components/components/label';
2512
@import 'govuk_publishing_components/components/layout-footer';
2613
@import 'govuk_publishing_components/components/layout-for-admin';
2714
@import 'govuk_publishing_components/components/layout-header';
28-
@import 'govuk_publishing_components/components/lead-paragraph';
29-
@import 'govuk_publishing_components/components/notice';
30-
@import 'govuk_publishing_components/components/radio';
31-
@import 'govuk_publishing_components/components/reorderable-list';
32-
@import 'govuk_publishing_components/components/search';
33-
@import 'govuk_publishing_components/components/secondary-navigation';
34-
@import 'govuk_publishing_components/components/select';
35-
@import 'govuk_publishing_components/components/select-with-search';
36-
@import 'govuk_publishing_components/components/service-navigation';
3715
@import 'govuk_publishing_components/components/skip-link';
38-
@import 'govuk_publishing_components/components/success-alert';
39-
@import 'govuk_publishing_components/components/summary-card';
40-
@import 'govuk_publishing_components/components/summary-list';
41-
@import 'govuk_publishing_components/components/table';
42-
@import 'govuk_publishing_components/components/tabs';
4316
@import 'govuk_publishing_components/components/tag';
44-
@import 'govuk_publishing_components/components/textarea';
45-
@import 'govuk_publishing_components/components/warning-text';
4617
@import "nokodiff";
4718
@import "options_sidebar";
19+
@import "compare-editions";

‎app/assets/stylesheets/compare-editions.scss‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
.compare-editions {
2+
& > div {
3+
@extend .govuk-body; // stylelint-disable-line scss/at-extend-no-missing-placeholder
4+
}
5+
}

‎app/views/application/fact_check_comparison.html.erb‎

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,18 @@
44
<div class="govuk-grid-row">
55
<div class="govuk-grid-column-two-thirds">
66
<%= render "govuk_publishing_components/components/inset_text", {} do %>
7-
<p class="govuk-body"><%= t "fact_check_comparison.respond_by" %> <span class="govuk-body govuk-!-font-weight-bold"><%= @date %></span></p>
7+
<%= t "fact_check_comparison.respond_by" %> <span class="govuk-!-font-weight-bold"><%= @date %></span>
88
<% end %>
99
<%= render "govuk_publishing_components/components/button", {
1010
text: t("fact_check_comparison.respond_to_button"),
1111
href: "/",
12+
margin_bottom: 6,
1213
} %>
1314
</div>
1415
</div>
1516
<div class="govuk-grid-row">
1617
<div class="govuk-grid-column-two-thirds">
17-
<div class="govuk-body compare-editions">
18+
<div class="compare-editions">
1819
<%= @differ %>
1920
</div>
2021
</div>
@@ -26,7 +27,7 @@
2627
font_size: "s",
2728
padding: true,
2829
} %>
29-
<p class="govuk-body"><a href=<%= @draft_url %>class="govuk-link--no-visited-state" rel="noreferrer noopener" target="_blank"><%= t "fact_check_comparison.preview_link" %></a></p>
30+
<p class="govuk-body"><%= link_to t("fact_check_comparison.preview_link"), @draft_url, class: "govuk-link--no-visited-state govuk-link" %></p>
3031
</div>
3132
<hr class="govuk-section-break govuk-section-break govuk-section-break--visible govuk-!-margin-top-6 govuk-!-margin-bottom-3">
3233
<%= render "govuk_publishing_components/components/heading", {
@@ -35,10 +36,18 @@
3536
font_size: "s",
3637
padding: true,
3738
} %>
38-
<ul class="govuk-list govuk-list--bullet">
39-
<li><%= t("fact_check_comparison.guidance_deleted") %></li>
40-
<li><%= t("fact_check_comparison.guidance_added") %></li>
41-
</ul>
42-
<p class="govuk-body"><a href="https://www.gov.uk/government/publications/how-content-requests-from-government-get-published/fact-checking-content-on-govuk" class="govuk-link--no-visited-state" rel="noreferrer noopener" target="_blank"><%= t("fact_check_comparison.guidance_link") %></a></p>
39+
<%= render "govuk_publishing_components/components/list", {
40+
visible_counters: true,
41+
items: [
42+
t("fact_check_comparison.guidance_deleted"),
43+
t("fact_check_comparison.guidance_added"),
44+
],
45+
} %>
46+
<p class="govuk-body">
47+
<%= link_to t("fact_check_comparison.guidance_link"),
48+
"https://gov.uk/government/publications/how-content-requests-from-government-get-published/fact-checking-content-on-govuk",
49+
class: "govuk-link--no-visited-state govuk-link", target: :_blank, rel: :noopener
50+
%>
51+
</p>
4352
</div>
4453
</div>

‎app/views/layouts/design_system.html.erb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<% sanitized_title = sanitize((yield(:page_title).presence || yield(:title))) %>
1919

2020
<%= render "govuk_publishing_components/components/layout_for_admin", {
21-
product_title: "Publisher",
21+
product_title: "Fact Check Manager",
2222
browser_title: yield(:page_title),
2323
environment: environment,
2424
head: yield(:head),
@@ -34,7 +34,7 @@
3434
<%= render "govuk_publishing_components/components/skip_link" %>
3535

3636
<%= render "govuk_publishing_components/components/layout_header", {
37-
product_name: "Publisher",
37+
product_name: "Fact Check Manager",
3838
environment: environment,
3939
navigation_items: [],
4040
data_attributes: {

‎config/environments/development.rb‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,4 +75,9 @@
7575

7676
# Apply autocorrection by RuboCop to files generated by `bin/rails generate`.
7777
# config.generators.apply_rubocop_autocorrect_after_generate!
78+
79+
# Asset digests allow you to set far-future HTTP expiration dates on all assets,
80+
# yet still be able to expire them through the digest params.
81+
# Set to false to see the latest stylesheet changes if running Sass in watch mode
82+
config.assets.digest = false
7883
end

‎config/locales/en.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ en:
77
preview_heading: "Preview"
88
preview_link: "Preview the draft page (opens in new tab)"
99
guidance_heading: "Guidance"
10-
guidance_deleted: "red highlights and a minus sign (–) show content that’s been deleted"
11-
guidance_added: "green highlights and a plus sign (+) show content that’s been added"
10+
guidance_deleted: "Red highlights and a minus sign (–) show content that’s been deleted"
11+
guidance_added: "Green highlights and a plus sign (+) show content that’s been added"
1212
guidance_link: "Fact checking guidance (opens in new tab)"

0 commit comments

Comments
 (0)