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

Stop using GDS Transport and the crown logo #388

Merged
merged 1 commit into from
Sep 24, 2022
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
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ guide/tmp
guide/output
guide/*.log
guide/node_modules
guide/content/assets/fonts
guide/content/assets/images
guide/content/javascripts/*.js

Expand Down
Binary file added guide/content/assets/fonts/heavy.woff
Binary file not shown.
Binary file added guide/content/assets/fonts/heavy.woff2
Binary file not shown.
Binary file added guide/content/assets/fonts/light.woff
Binary file not shown.
Binary file added guide/content/assets/fonts/light.woff2
Binary file not shown.
4 changes: 2 additions & 2 deletions guide/content/assets/homepage-illustration.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions guide/content/stylesheets/application.scss
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
// GOV.UK Frontend options
$govuk-global-styles: true;
$govuk-assets-path: "/assets/";
$govuk-new-link-styles: true;
$govuk-font-family: "TransportNew", sans-serif;
$x-govuk-brand-colour: #28a;

// Import GOV.UK Frontend
@import "govuk/all";

// Application components
@import "components/fonts";
@import "components/button";
@import "components/example";
@import "components/header";
Expand Down
2 changes: 1 addition & 1 deletion guide/content/stylesheets/components/_button.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
$app-button-shadow-size: $govuk-border-width-form-element;
$app-button-inverse-background-colour: govuk-colour("white");
$app-button-inverse-foreground-colour: $govuk-brand-colour;
$app-button-inverse-foreground-colour: $x-govuk-brand-colour;
$app-button-inverse-shadow-colour: govuk-shade($app-button-inverse-foreground-colour, 30%);
$app-button-inverse-hover-background-colour: govuk-tint($app-button-inverse-foreground-colour, 90%);

Expand Down
13 changes: 13 additions & 0 deletions guide/content/stylesheets/components/_fonts.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
@font-face {
font-family: "TransportNew";
src: url("/assets/fonts/heavy.woff2") format("woff2"), url("/assets/fonts/heavy.woff") format("woff");
font-weight: bold;
size-adjust: 93.5%;
}

@font-face {
font-family: "TransportNew";
src: url("/assets/fonts/light.woff2") format("woff2"), url("/assets/fonts/light.woff") format("woff");
font-weight: normal;
size-adjust: 91%;
}
4 changes: 4 additions & 0 deletions guide/content/stylesheets/components/_header.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,8 @@
.govuk-header__logo {
width: auto;
}

.govuk-header__container {
border-bottom: 10px solid $x-govuk-brand-colour;
}
}
2 changes: 1 addition & 1 deletion guide/content/stylesheets/components/_masthead.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
@include govuk-responsive-padding(6, "top");
@include govuk-responsive-padding(6, "bottom");
color: govuk-colour("white");
background-color: $govuk-brand-colour;
background-color: $x-govuk-brand-colour;
margin-top: govuk-spacing(-2);

.app-button--inverse {
Expand Down
5 changes: 1 addition & 4 deletions guide/layouts/partials/header.slim
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,8 @@ header.govuk-header.app-header role="banner" data-module="govuk-header"
a.govuk-header__link.govuk-header__link--homepage href="/"

span.govuk-header__logotype
svg.govuk-header__logotype-crown aria-hidden="true" focusable="false" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 132 97" height="30" width="36"
path fill="currentColor" fill-rule="evenodd" d="M25 30.2c3.5 1.5 7.7-.2 9.1-3.7 1.5-3.6-.2-7.8-3.9-9.2-3.6-1.4-7.6.3-9.1 3.9-1.4 3.5.3 7.5 3.9 9zM9 39.5c3.6 1.5 7.8-.2 9.2-3.7 1.5-3.6-.2-7.8-3.9-9.1-3.6-1.5-7.6.2-9.1 3.8-1.4 3.5.3 7.5 3.8 9zM4.4 57.2c3.5 1.5 7.7-.2 9.1-3.8 1.5-3.6-.2-7.7-3.9-9.1-3.5-1.5-7.6.3-9.1 3.8-1.4 3.5.3 7.6 3.9 9.1zm38.3-21.4c3.5 1.5 7.7-.2 9.1-3.8 1.5-3.6-.2-7.7-3.9-9.1-3.6-1.5-7.6.3-9.1 3.8-1.3 3.6.4 7.7 3.9 9.1zm64.4-5.6c-3.6 1.5-7.8-.2-9.1-3.7-1.5-3.6.2-7.8 3.8-9.2 3.6-1.4 7.7.3 9.2 3.9 1.3 3.5-.4 7.5-3.9 9zm15.9 9.3c-3.6 1.5-7.7-.2-9.1-3.7-1.5-3.6.2-7.8 3.7-9.1 3.6-1.5 7.7.2 9.2 3.8 1.5 3.5-.3 7.5-3.8 9zm4.7 17.7c-3.6 1.5-7.8-.2-9.2-3.8-1.5-3.6.2-7.7 3.9-9.1 3.6-1.5 7.7.3 9.2 3.8 1.3 3.5-.4 7.6-3.9 9.1zM89.3 35.8c-3.6 1.5-7.8-.2-9.2-3.8-1.4-3.6.2-7.7 3.9-9.1 3.6-1.5 7.7.3 9.2 3.8 1.4 3.6-.3 7.7-3.9 9.1zM69.7 17.7l8.9 4.7V9.3l-8.9 2.8c-.2-.3-.5-.6-.9-.9L72.4 0H59.6l3.5 11.2c-.3.3-.6.5-.9.9l-8.8-2.8v13.1l8.8-4.7c.3.3.6.7.9.9l-5 15.4v.1c-.2.8-.4 1.6-.4 2.4 0 4.1 3.1 7.5 7 8.1h.2c.3 0 .7.1 1 .1.4 0 .7 0 1-.1h.2c4-.6 7.1-4.1 7.1-8.1 0-.8-.1-1.7-.4-2.4V34l-5.1-15.4c.4-.2.7-.6 1-.9zM66 92.8c16.9 0 32.8 1.1 47.1 3.2 4-16.9 8.9-26.7 14-33.5l-9.6-3.4c1 4.9 1.1 7.2 0 10.2-1.5-1.4-3-4.3-4.2-8.7L108.6 76c2.8-2 5-3.2 7.5-3.3-4.4 9.4-10 11.9-13.6 11.2-4.3-.8-6.3-4.6-5.6-7.9 1-4.7 5.7-5.9 8-.5 4.3-8.7-3-11.4-7.6-8.8 7.1-7.2 7.9-13.5 2.1-21.1-8 6.1-8.1 12.3-4.5 20.8-4.7-5.4-12.1-2.5-9.5 6.2 3.4-5.2 7.9-2 7.2 3.1-.6 4.3-6.4 7.8-13.5 7.2-10.3-.9-10.9-8-11.2-13.8 2.5-.5 7.1 1.8 11 7.3L80.2 60c-4.1 4.4-8 5.3-12.3 5.4 1.4-4.4 8-11.6 8-11.6H55.5s6.4 7.2 7.9 11.6c-4.2-.1-8-1-12.3-5.4l1.4 16.4c3.9-5.5 8.5-7.7 10.9-7.3-.3 5.8-.9 12.8-11.1 13.8-7.2.6-12.9-2.9-13.5-7.2-.7-5 3.8-8.3 7.1-3.1 2.7-8.7-4.6-11.6-9.4-6.2 3.7-8.5 3.6-14.7-4.6-20.8-5.8 7.6-5 13.9 2.2 21.1-4.7-2.6-11.9.1-7.7 8.8 2.3-5.5 7.1-4.2 8.1.5.7 3.3-1.3 7.1-5.7 7.9-3.5.7-9-1.8-13.5-11.2 2.5.1 4.7 1.3 7.5 3.3l-4.7-15.4c-1.2 4.4-2.7 7.2-4.3 8.7-1.1-3-.9-5.3 0-10.2l-9.5 3.4c5 6.9 9.9 16.7 14 33.5 14.8-2.1 30.8-3.2 47.7-3.2z"

span.govuk-header__logotype-text
| GOV.UK

span.govuk-header__product-name<
| Form Builder
| Ruby on Rails form builder
2 changes: 1 addition & 1 deletion guide/layouts/partials/masthead.slim
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
.govuk-width-container
.govuk-grid-row
.govuk-grid-column-two-thirds-from-desktop
h1.app-masthead__title Build your service using GOV.UK form components
h1.app-masthead__title Build your GOV.UK service using the Ruby on Rails form builder

p.app-masthead__description
| This library provides a form builder for the GOV.UK Design System. It makes creating forms easy and familiar for Ruby on Rails developers.
Expand Down
2 changes: 1 addition & 1 deletion guide/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"lib": "lib"
},
"scripts": {
"postinstall": "cp -R node_modules/govuk-frontend/govuk/assets/* content/assets && cp node_modules/govuk-frontend/govuk/all.js content/javascripts/govuk-frontend.js",
"postinstall": "cp -R node_modules/govuk-frontend/govuk/assets/images/ content/assets && cp node_modules/govuk-frontend/govuk/all.js content/javascripts/govuk-frontend.js",
"test": "echo \"Error: no test specified\" && exit 1"
},
"author": "",
Expand Down