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

Fix toolkit font stack overrides #270

Merged
merged 4 commits into from
Oct 13, 2016
Merged

Fix toolkit font stack overrides #270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
84ea689
Remove the unbranded partial
gemmaleigh Oct 11, 2016
e18c832
Generate a new stylesheet from the unbranded partial
gemmaleigh Oct 11, 2016
9cadd5f
Use the unbranded stylesheet
gemmaleigh Oct 11, 2016
23853f8
Add missing path to assets for the unbranded stylesheet
gemmaleigh Oct 13, 2016
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
3 changes: 1 addition & 2 deletions app/assets/sass/application.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ $path: "/public/images/";

// Take a look at in app/assets/sass/patterns/ to see which files are imported.
@import 'patterns/check-your-answers';
@import 'patterns/unbranded';

// Related items
// (These styles will be moved to GOV.UK elements, duplicating here for now.)
Expand All @@ -19,7 +18,7 @@ $path: "/public/images/";

.heading-medium {
margin-top: 0.3em;
margin-bottom: 0.5em
margin-bottom: 0.5em;
}

li {
Expand Down
9 changes: 9 additions & 0 deletions app/assets/sass/patterns/_unbranded.scss → app/assets/sass/unbranded.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
// Path to assets for use with the file-url function
// in the govuk frontend toolkit's url-helpers partial
$path: "/public/images/";

// Import GOV.UK elements from /govuk-modules/, this will import the frontend toolkit and some base styles.
// Take a look in /govuk-modules/_govuk-elements.scss to see which files are imported.
@import 'govuk-elements';

// If you need to create a page as part of your journey, but without GOV.UK branding
// See localhost:3000/examples/unbranded/

Expand All @@ -10,6 +18,7 @@ $toolkit-font-stack: $Helvetica-Regular;

// Use the universal selector and !important to *ALWAYS OVERRIDE* GDS Transport
* {

font-family: $toolkit-font-stack !important;
}

Expand Down
2 changes: 1 addition & 1 deletion app/views/layout_unbranded.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% extends "govuk_template_unbranded.html" %}

{% block head %}
{% include "includes/head.html" %}
<link href="/public/stylesheets/unbranded.css" media="screen" rel="stylesheet" type="text/css">
{% endblock %}

{% block body_end %}
Expand Down