Skip to content

Commit

Permalink
Revert headings colour
Browse files Browse the repository at this point in the history
  • Loading branch information
ediblecode committed Oct 18, 2018
1 parent ed564fd commit 02c01da
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 34 deletions.
1 change: 0 additions & 1 deletion src/components/footer/_footer.scss
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,6 @@

&__heading {
@include font-size(-1);
color: $colour-text-inverse;
display: inline-block;
font-weight: normal;
margin: em(0 $spacing-small 0 0);
Expand Down
11 changes: 0 additions & 11 deletions src/components/hero/_hero.scss
Original file line number Diff line number Diff line change
Expand Up @@ -29,24 +29,13 @@
// Extra supplementary links etc
&__extra {
@include grid-item(12, $md: 4, $loose: true);

// sass-lint:disable-block no-universal-selectors
h2,
h3,
h4,
h5,
h6 {
color: $colour-text-inverse;
}
}

&__title {
@include h1;
color: $colour-text-inverse;
}

&__intro {
@include lead;
color: $colour-text-inverse;
}
}
10 changes: 2 additions & 8 deletions src/components/panel/_panel.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
/// @since 0.1.0
.panel {
background: $colour-panel-default;
border: 1px solid $colour-panel-default-border; // To distinguish panel from off-grey body background
margin: em($spacing-medium 0 $spacing-large);
padding: em($spacing-medium);

Expand All @@ -30,13 +31,6 @@
.panel--inverse {
@include links-inverse;
background: $colour-panel-inverse;
border: 0;
color: $colour-text-inverse;

h2,
h3,
h4,
h5,
h6 {
color: $colour-text-inverse;
}
}
22 changes: 14 additions & 8 deletions src/stylesheets/settings/_settings-colours-semantic.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,19 @@ $colour-true-white: #fff;

// GLOBAL

/// Page background colour
/// Page background colour. It's off-white in an attempt to make
/// text easier to read for those with 'visual stress', 50% of
/// which happen to be dyslexic (British Dyslexia association), by
/// reducing contrast. See https://ux.stackexchange.com/a/73918/92081
/// for a more detailed explanation.
/// @since 0.2.0
$colour-body: #fafafa;
$colour-body: #f4f4f4;

/// Standard, primary body text colour
/// Standard, primary body text colour. Off-black, to slightly reduce
/// contrast in an attempt to make text easier to read for those with
/// 'visual stress', see also $colour-body.
/// @since 0.2.0
$colour-text: $colour-nice-rich-black;

/// Heading text colour
/// @since 0.5.2
$colour-headings: $colour-nice-black;
$colour-text: $colour-nice-black;

/// Subtle text colour
/// @since 0.2.0
Expand Down Expand Up @@ -165,6 +167,10 @@ $colour-border: $colour-nice-grey-1;
/// @since 0.2.0
$colour-panel-default: $colour-nice-grey-3;

// Default (light) panel border
/// @since 0.5.2
$colour-panel-default-border: $colour-nice-grey-2;

// Inverse (dark) panels background
/// @since 0.2.0
$colour-panel-inverse: $colour-nice-dark-grey;
Expand Down
6 changes: 0 additions & 6 deletions src/stylesheets/typography/_typography-headings.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
@mixin h1 {
@include font(h1);
clear: both;
color: $colour-headings;
font-weight: 900;
max-width: 66ch;
}
Expand All @@ -19,7 +18,6 @@
@mixin h2 {
@include font(h2);
clear: both;
color: $colour-headings;
font-weight: 700;
max-width: 66ch;
}
Expand All @@ -30,7 +28,6 @@
@mixin h3 {
@include font(h3);
clear: both;
color: $colour-headings;
font-weight: 700;
max-width: 66ch;
}
Expand All @@ -41,7 +38,6 @@
@mixin h4 {
@include font(h4);
clear: both;
color: $colour-headings;
font-weight: 700;
max-width: 66ch;
}
Expand All @@ -52,7 +48,6 @@
@mixin h5 {
@include font(h5);
clear: both;
color: $colour-headings;
font-weight: 700;
max-width: 66ch;
}
Expand All @@ -63,7 +58,6 @@
@mixin h6 {
@include font(h6);
clear: both;
color: $colour-headings;
font-weight: 700;
max-width: 66ch;
}
Expand Down

0 comments on commit 02c01da

Please sign in to comment.