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.

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

FMFR-1392 - Migrate to CCS Frontend Helpers - Summary list #4059

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ gem 'asset_sync'
gem 'fog-aws', '>= 3.14.0'

# Use CCS Frontend Helpers
gem 'ccs-frontend_helpers', '~> 0.1.1'
gem 'ccs-frontend_helpers', '~> 0.1.2'

group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ GEM
caxlsx_rails (0.6.3)
actionpack (>= 3.1)
caxlsx (>= 3.0)
ccs-frontend_helpers (0.1.1)
ccs-frontend_helpers (0.1.2)
rails (>= 6.0)
clamby (1.6.8)
cliver (0.3.2)
Expand Down Expand Up @@ -649,7 +649,7 @@ DEPENDENCIES
caracal-rails (>= 1.0.2)
caxlsx (>= 3.2.0)
caxlsx_rails (>= 0.6.3)
ccs-frontend_helpers (~> 0.1.1)
ccs-frontend_helpers (~> 0.1.2)
cucumber-rails (>= 2.6.1)
database_cleaner (>= 2.0.1)
date_validator (>= 0.12.0)
Expand Down
Binary file removed app/assets/fonts/bold-affa96571d-v2.woff
Binary file not shown.
Binary file removed app/assets/fonts/bold-b542beb274-v2.woff2
Binary file not shown.
Binary file removed app/assets/fonts/light-94a07e06a1-v2.woff2
Binary file not shown.
Binary file removed app/assets/fonts/light-f591b13f7d-v2.woff
Binary file not shown.
Empty file removed app/assets/images/.keep
Empty file.
Binary file added app/assets/images/ccs-opengraph-image.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
58 changes: 0 additions & 58 deletions app/assets/stylesheets/_settings.scss

This file was deleted.

2 changes: 0 additions & 2 deletions app/assets/stylesheets/ccs/_all.scss

This file was deleted.

59 changes: 59 additions & 0 deletions app/assets/stylesheets/ccs/_ccs.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
.error-box {
display: flex;
flex-direction: column;
height: 100vh;
}

.error-content {
flex: 1 0 auto;
}

.button_as_link {
font-size: 1em;
border: 0;
text-decoration: underline;
color: $govuk-link-colour;
background-color: inherit;
padding: 0;
margin: 0;

&:link {
color: $govuk-link-colour;
}

&:visited {
color: $govuk-link-visited-colour;
}

&:hover:not(:focus),
&:active:not(:focus) {
color: $govuk-link-hover-colour;
}

&:hover {
cursor: pointer;
}
}

.supplier-rates-td {
border: none !important;
}

.govuk-brand-light-grey-benchmark {
color: #6f777b !important;
}

%govuk-section-break--s {
@include govuk-responsive-margin(2, "top");
@include govuk-responsive-margin(2, "bottom");
}

.govuk-section-break--s {
@extend %govuk-section-break--s;
}

.ccs-no-underline,
.govuk-warning-text abbr,
abbr {
text-decoration: none;
}
92 changes: 0 additions & 92 deletions app/assets/stylesheets/ccs/_govuk-frontend-overrides.scss

This file was deleted.

9 changes: 0 additions & 9 deletions app/assets/stylesheets/ccs/facilities-management/_all.scss

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

24 changes: 12 additions & 12 deletions app/assets/stylesheets/components/_all.scss
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
/* Import from Govuk frontend, refer to govuk-frontend/govuk/components/_all.scss */
@import "govuk-frontend/govuk/components/all";

/* Override with my own components */
// /* Override GOV.UK/add our CCS components */
@import "basket/basket";
@import "checkbox-accordion/checkbox-accordion";
@import "dashboard-section/dashboard-section";
@import "header/header";
@import "footer/footer";
@import "details/details";
@import "documents/documents";
@import "inset-text/inset-text";
@import "label/label";
@import "info-panel/info-panel";
@import "logo/logo";
@import "notification-banner/notification-banner";
@import "panel/panel";
@import "password-rules/password-rules";
@import "progress-bar/progress-bar";
@import "service-specification/service-specification";
@import "step-by-step-nav/step-by-step-nav";
@import "summary-box/summary-box";
@import "supplier-lot-data/supplier-lot-data";
@import "supplier-record/supplier-record";
@import "typography/typography";
/* CCS override and bespoke styles; re-used globally across all modules */
@import "ccs-global/ccs-global";
@import "step-by-step-nav/all";
Loading