Skip to content

Commit

Permalink
Merge branch 'master' of github.com:nhsevidence/nice-design-system
Browse files Browse the repository at this point in the history
  • Loading branch information
ediblecode committed Jan 23, 2018
2 parents 1d3f66a + 313cdd2 commit 4a9963f
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 4 deletions.
14 changes: 10 additions & 4 deletions src/components/page-header/_page-header.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
/// lead intro paragraph and call-to-action.
///
/// @example html
/// <div class="page-header">
/// <header class="page-header">
/// <h1 class="page-header__heading">
/// Breast cancer
/// </h1>
Expand All @@ -16,12 +16,12 @@
/// Includes related guidelines, NICE Pathways, quality standards and advice.
/// </p>
/// <p class="page-header__cta">
/// <a href="">Register as a stakeholder</a>
/// <a href="/some-action.html">Register as a stakeholder</a>
/// </p>
/// </div>
/// </header>
/// @since 0.4.0
.page-header {
margin: rem($spacing-large 0 $spacing-x-large 0);
margin: rem(0 0 $spacing-x-large 0);

&__heading {
@include font-size(h1);
Expand All @@ -38,4 +38,10 @@
display: block;
margin: 0;
}

@media print {
&__cta {
display: none;
}
}
}
5 changes: 5 additions & 0 deletions src/stylesheets/grid/_grid.scss
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@
&--gutterless {
@include grid-gutterless;

// sass-lint:disable-block no-combinators
> [data-g] {
@include grid-item-gutterless;
}
Expand All @@ -89,6 +90,7 @@
&--compact {
@include grid-compact;

// sass-lint:disable-block no-combinators
> [data-g] {
@include grid-item-compact;
}
Expand All @@ -97,6 +99,7 @@
&--loose {
@include grid-loose;

// sass-lint:disable-block no-combinators
> [data-g] {
@include grid-item-loose;
}
Expand All @@ -111,12 +114,14 @@
}

&--middle {
// sass-lint:disable-block no-combinators
> [data-g] {
@include grid-item-middle;
}
}

&--bottom {
// sass-lint:disable-block no-combinators
> [data-g] {
@include grid-item-bottom;
}
Expand Down

0 comments on commit 4a9963f

Please sign in to comment.