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

Jump to bottom

Move breadcrumb outside the main element #478

Merged
merged 2 commits into from
Jun 13, 2017
Merged

Move breadcrumb outside the main element #478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc4e318
Move the breadcrumb outside the main element
gemmaleigh Jun 1, 2017
e8c625a
Add styles for the new site wrapper
gemmaleigh Jun 1, 2017
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: 1 addition & 3 deletions app/views/guide_alpha_beta.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@

{% block page_title %}Alpha and beta banners — GOV.UK elements{% endblock %}

{% block content %}
{% block main_content %}

<main id="content" role="main" tabindex="-1">

{% include "includes/breadcrumb.html" %}

<h1 class="heading-xlarge">
<span class="heading-secondary">GOV.UK elements</span>
Alpha and beta banners
Expand Down
4 changes: 1 addition & 3 deletions app/views/guide_buttons.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@

{% block page_title %}Buttons — GOV.UK elements{% endblock %}

{% block content %}
{% block main_content %}

<main id="content" role="main" tabindex="-1">

{% include "includes/breadcrumb.html" %}

<h1 class="heading-xlarge">
<span class="heading-secondary">GOV.UK elements</span>
Buttons
Expand Down
4 changes: 1 addition & 3 deletions app/views/guide_colour.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@

{% block page_title %}Colour — GOV.UK elements{% endblock %}

{% block content %}
{% block main_content %}

<main id="content" role="main" tabindex="-1">

{% include "includes/breadcrumb.html" %}

<h1 class="heading-xlarge">
<span class="heading-secondary">GOV.UK elements</span>
Colour
Expand Down
4 changes: 1 addition & 3 deletions app/views/guide_data.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@

{% block page_title %}Data — GOV.UK elements{% endblock %}

{% block content %}
{% block main_content %}

<main id="content" role="main" tabindex="-1">

{% include "includes/breadcrumb.html" %}

<h1 class="heading-xlarge">
<span class="heading-secondary">GOV.UK elements</span>
Data
Expand Down
4 changes: 1 addition & 3 deletions app/views/guide_errors.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@

{% block page_title %}Errors and validation — GOV.UK elements{% endblock %}

{% block content %}
{% block main_content %}

<main id="content" role="main" tabindex="-1">

{% include "includes/breadcrumb.html" %}

<h1 class="heading-xlarge">
<span class="heading-secondary">GOV.UK elements</span>
Errors and validation
Expand Down
4 changes: 1 addition & 3 deletions app/views/guide_form_elements.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@

{% block page_title %}Form elements — GOV.UK elements{% endblock %}

{% block content %}
{% block main_content %}

<main id="content" role="main" tabindex="-1">

{% include "includes/breadcrumb.html" %}

<h1 class="heading-xlarge">
<span class="heading-secondary">GOV.UK elements</span>
Form elements
Expand Down
4 changes: 1 addition & 3 deletions app/views/guide_icons_images.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@

{% block page_title %}Icons and images — GOV.UK elements{% endblock %}

{% block content %}
{% block main_content %}

<main id="content" role="main" tabindex="-1">

{% include "includes/breadcrumb.html" %}

<h1 class="heading-xlarge">
<span class="heading-secondary">GOV.UK elements</span>
Icons and images
Expand Down
4 changes: 1 addition & 3 deletions app/views/guide_layout.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@

{% block page_title %}Layout — GOV.UK elements{% endblock %}

{% block content %}
{% block main_content %}

<main id="content" role="main" tabindex="-1">

{% include "includes/breadcrumb.html" %}

<h1 class="heading-xlarge">
<span class="heading-secondary">GOV.UK elements</span>
Layout
Expand Down
4 changes: 1 addition & 3 deletions app/views/guide_typography.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@

{% block page_title %}Typography — GOV.UK elements{% endblock %}

{% block content %}
{% block main_content %}

<main id="content" role="main" tabindex="-1">

{% include "includes/breadcrumb.html" %}

<h1 class="heading-xlarge">
<span class="heading-secondary">GOV.UK elements</span>
Typography
Expand Down
5 changes: 1 addition & 4 deletions app/views/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,9 @@
GOV.UK elements
{% endblock %}

{% block content %}

{% block main_content %}
<main class="elements-index" id="content" role="main" tabindex="-1">

{% include "includes/breadcrumb.html" %}

<div class="grid-row">
<div class="column-two-thirds">

Expand Down
7 changes: 7 additions & 0 deletions app/views/layout.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,13 @@
{% include "includes/elements_tracking.html" %}
{% endblock %}

{% block content %}
<div class="site-wrapper">
{% include "includes/breadcrumb.html" %}
{% block main_content %}{% endblock %}
</div>
{% endblock %}

{% block cookie_message %}
<p>{{cookieText | safe }}</p>
{% endblock %}
Expand Down
14 changes: 13 additions & 1 deletion assets/sass/elements-documentation.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,21 @@

// ==========================================================================
// Elements page styles
// These are example styles, used only for the elements pages
// ==========================================================================

// These are example styles, used only for the elements pages
// Add a class to wrap the <main> element
// This is so the breadcrumb can sit outside <main>
.site-wrapper {
@extend %site-width-container;

// Override margins set on #content
// This is a kludge to prevent a breaking change to govuk_elements_sass
// where @extend %site-width-container; is set for #content, so we need to override its margins
#content {
margin: 0;
}
}

.elements-index {
// Reduce top and bottom margins
Expand Down