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

wants to merge 7 commits into from

Conversation

penpadstudio
Copy link
Contributor

  • I previously made some typography updates whilst Harry was here and would like to merge them in to develop so we can see how it works up to date.
  • Would appreciate if you have time to go through and review with me please.
    Thanks @cehwitham

Paul Novak added 2 commits August 17, 2018 11:41
- Swapped margins to small
- Link colour corrections
- Quote colour corrections
- Made Index highlight typography examples
-
- added Nightingale logo
- Breadcrumbs styleing update
- Edited intro text to framework
- Many building edits on typography styling.
- Update to quote box colour
- Alert card heading change sizing
-
Copy link
Member

@cehwitham cehwitham left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@pro-paul just a few comments to reply to. Can you resolve the merge conflicts so that the code is ready to merge please? @Android63 could help next week if you need some assistance with this. You can also merge the newer changes into this branch so you can test before merging into develop also.

components/buttons/_components.buttons.scss Show resolved Hide resolved
components/buttons/_components.buttons.scss Show resolved Hide resolved
elements/_elements.links.scss Show resolved Hide resolved
@@ -42,7 +42,7 @@ $color-warning: color('warning') !default;
// ========================================================================== */

$color-links: color('nhs-blue') !default;
$color-links-hover: #8060a7 !default;
$color-links-hover: #4C8ECF !default;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we use lowercase letters in hex values please?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok

@penpadstudio
Copy link
Contributor Author

@cehwitham I have updated the conflicts and the branch has been tested and works properly. @Android63 No need to respond as have completed the task myself.

uppercase hex to lowercase
Paul Novak and others added 3 commits September 12, 2018 10:15
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Development

Successfully merging this pull request may close these issues.

2 participants