Skip to content
This repository has been archived by the owner on Jun 11, 2024. It is now read-only.

Typeography #260

Open
wants to merge 7 commits into
base: develop
Choose a base branch
from
Open

Typeography #260

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
517ba83
Typography edits
Aug 17, 2018
63fbe7e
Multiple updates
Aug 22, 2018
79d55dc
Merge branch 'develop' into Typeography
Sep 11, 2018
1e2bedb
Update _settings.colors.scss
Sep 11, 2018
768fa81
hex case
Sep 12, 2018
f137e8f
Merge branch 'Typeography' of https://github.com/NHSLeadership/nighti…
Sep 12, 2018
5f85a20
Update circle.yml
Sep 13, 2018
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
Binary file added assets/img/logos/NHS_Nightingale_Logo_Blue.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/logos/[email protected]
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions components/buttons/_components.buttons.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,14 @@
transition: 0.2s;

&:hover {
text-decoration: none;
cehwitham marked this conversation as resolved.
Show resolved Hide resolved
transform: translateY(-1px);
box-shadow: 0 2px 2px 0 rgba($color-btn-shadow, 0.2),
0 8px 10px 0 rgba($color-btn-shadow, 0.4);
}

&:active {
text-decoration: none;
cehwitham marked this conversation as resolved.
Show resolved Hide resolved
box-shadow: 0 4px 4px 0 rgba($color-btn-shadow, 0.1) inset,
0 2px 2px 0 rgba($color-btn-shadow, 0.3) inset;
border-color: transparent;
Expand Down
2 changes: 1 addition & 1 deletion components/quotes/_components.quotes.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@

.c-quote--rev {
color: $color-quote-alt;
background-color: color('nhs-purple');
background-color: color('nhs-blue');
padding: $global-spacing-unit-small;
padding-left: $global-spacing-unit;

Expand Down
3 changes: 3 additions & 0 deletions elements/_elements.links.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,21 @@

a {
color: $color-links;
text-decoration: none;
cehwitham marked this conversation as resolved.
Show resolved Hide resolved
text-decoration-skip: ink; /* [1] */

&:visited {
color: $color-links-visited;
}

&:hover {
text-decoration: underline;
color: $color-links-hover;
}

&:active,
&:focus {
text-decoration: underline;
color: $color-links-active;
}

Expand Down
11 changes: 7 additions & 4 deletions generic/_generic.shared.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@
========================================================================== */

address,
details,
blockquote, p, pre,
dl, ol, ul,
figure,
hr,
Expand All @@ -20,11 +18,16 @@ fieldset {
@include rem(margin-bottom, $global-spacing-unit);
}

h1, h2, h3, h4, h5, h6 {
details,
h1, h2, h3, h4, h5, h6,
blockquote, p, pre,
ul, ol,
dd {

@include rem(margin-bottom, $global-spacing-unit-small);
}

ul, ol,
dd {
@include rem(margin-left, $global-spacing-unit);
@include rem(margin-left, $global-spacing-unit-large);
}
Loading