From 517ba833aed226ff5f8946f07a2582f1b85845b2 Mon Sep 17 00:00:00 2001 From: Paul Novak Date: Fri, 17 Aug 2018 11:41:16 +0100 Subject: [PATCH 1/5] Typography edits - Swapped margins to small - Link colour corrections - Quote colour corrections - Made Index highlight typography examples - --- components/buttons/_components.buttons.scss | 2 + components/quotes/_components.quotes.scss | 2 +- elements/_elements.links.scss | 3 + generic/_generic.shared.scss | 13 +- index.html | 226 ++++++++++++++------ settings/_settings.colors.scss | 6 +- 6 files changed, 178 insertions(+), 74 deletions(-) diff --git a/components/buttons/_components.buttons.scss b/components/buttons/_components.buttons.scss index 433992e..8e24038 100644 --- a/components/buttons/_components.buttons.scss +++ b/components/buttons/_components.buttons.scss @@ -27,12 +27,14 @@ transition: 0.2s; &:hover { + text-decoration: none; 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; 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; diff --git a/components/quotes/_components.quotes.scss b/components/quotes/_components.quotes.scss index 3953b41..70ebe1b 100644 --- a/components/quotes/_components.quotes.scss +++ b/components/quotes/_components.quotes.scss @@ -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; diff --git a/elements/_elements.links.scss b/elements/_elements.links.scss index f82eaf6..776eec8 100644 --- a/elements/_elements.links.scss +++ b/elements/_elements.links.scss @@ -11,6 +11,7 @@ a { color: $color-links; + text-decoration: none; text-decoration-skip: ink; /* [1] */ &:visited { @@ -18,11 +19,13 @@ a { } &:hover { + text-decoration: underline; color: $color-links-hover; } &:active, &:focus { + text-decoration: underline; color: $color-links-active; } diff --git a/generic/_generic.shared.scss b/generic/_generic.shared.scss index 9a34121..d6a337d 100644 --- a/generic/_generic.shared.scss +++ b/generic/_generic.shared.scss @@ -10,9 +10,6 @@ ========================================================================== */ address, -details, -h1, h2, h3, h4, h5, h6, -blockquote, p, pre, dl, ol, ul, figure, hr, @@ -21,7 +18,15 @@ fieldset { @include rem(margin-bottom, $global-spacing-unit); } +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); } diff --git a/index.html b/index.html index acb8289..38898d3 100644 --- a/index.html +++ b/index.html @@ -292,6 +292,166 @@

Call to Action Card

+ + +

Typography

+ +
+ +

Heading 1 - Example link

+ +

Leading paragraph is the style that should + only be used when accentuating the first paragraph only be used once per + article. Example link

+ + + +
    +
  1. + List item +
      +
    1. Sub list item
      2. +
    +
    2. +
+ +

Default paragraph is the style that should be used in all instances when + not accentuating the copy content. Example link

+ + + +
    +
  1. + List item +
      +
    1. Sub list item
      2. +
    +
    2. +
+ +

Supporting paragraph is the style that should only be used in certain + instances such as when copy need not distract or draw away attention from + default paragraph. Example link

+ +
    +
  • + List item +
      +
    • Sub list item
      • +
    +
    • +
+ +
    +
  1. + List item +
      +
    1. Sub list item
      2. +
    +
    2. +
+ +
+

Many centuries ago, man was able to tell the time by looking at the + sun and its position in the sky. Then came the sundial and finally + clocks and watches.

+ + Quote author
+ Author role
+ Organisation + +
+ +
+

Many centuries ago, man was able to tell the time by looking at the + sun and its position in the sky. Then came the sundial and finally + clocks and watches.

+ + Quote author
+ Author role
+ Organisation + +
+ +
+ Expandable Content – closed by Default + +
+

Pellentesque habitant morbi tristique senectus et netus et malesuada + fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, + ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam + egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend + leo.

+
+ +
+ + + +

Heading 2 - Example link

+ +

Leading paragraph is the style that should + only be used when accentuating the first paragraph only be used once per + article. Example link

+ +

Default paragraph is the style that should be used in all instances when + not accentuating the copy content. Example link

+ +

Supporting paragraph is the style that should only be used in certain + instances such as when copy need not distract or draw away attention from + default paragraph. Example link

+ +

Heading 3 - Example link

+ +

Default paragraph is the style that should be used in all instances when + not accentuating the copy content. Example link

+ +

Supporting paragraph is the style that should only be used in certain + instances such as when copy need not distract or draw away attention from + default paragraph. Example link

+ +

Heading 4 - Example link

+ +

Default paragraph is the style that should be used in all instances when + not accentuating the copy content. Example link

+ +

Supporting paragraph is the style that should only be used in certain + instances such as when copy need not distract or draw away attention from + default paragraph. Example link

+ +
Heading 5 - Example link
+ +

Default paragraph is the style that should be used in all instances when + not accentuating the copy content. Example link

+ +

Supporting paragraph is the style that should only be used in certain + instances such as when copy need not distract or draw away attention from + default paragraph. Example link

+ +
Heading 6 - Example link
+ +

Supporting paragraph is the style that should only be used in certain + instances such as when copy need not distract or draw away attention from + default paragraph. Example link

+ +
+ + +

Cards

@@ -1278,31 +1438,7 @@

Tables

-

Headings

- -

Heading Level 1

- -

Heading Level 2

- -

Heading Level 3

- -

Heading Level 4

- -
Heading Level 5
- -
Heading Level 6
- -

Heading Level Link 1

- -

Heading Level Link 2

-

Heading Level Link 3

- -

Heading Level Link 4

- -
Heading Level Link 5
- -
Heading Level Link 6

Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Vestibulum tortor quam, @@ -1379,49 +1515,7 @@

Hints

-

Typography

- -

Default body copy is the style that should be used in all instances when - not accentuating the copy content. Style should be set as Frutiger 55 - Roman 18px #231F20 (line height 26px) example link style

- - Supporting body copy is the style that should only be used in certain - instances such as when copy need not distract or draw away attention from - default body copy. Style should be set as Frutiger 55 Roman 14px #231F20 - (line height 20px) example link style - -
    -
  • Item 1
    • -
  • - Item 2 -
      -
    • Sub-item 1
      • -
    • Sub-item 2
      • -
    -
    • -
  • Item 3
    • -
  • Item 4
    • -
  • Item 5
    • -
- -
    -
  1. Item 1
    2. -
  2. - Item 2 -
      -
    1. Sub-item 1
      2. -
    2. Sub-item 2
      3. -
    -
    3. -
  3. Item 3
    4. -
  4. Item 4
    5. -
  5. Item 5
    6. -
-

Pellentesque habitant morbi tristique senectus et netus et malesuada - fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, ultricies - eget, tempor sit amet, ante. Donec eu libero sit amet quam egestas semper. - Aenean ultricies mi vitae est. Mauris placerat eleifend leo.

diff --git a/settings/_settings.colors.scss b/settings/_settings.colors.scss index 92e5123..f7689e6 100644 --- a/settings/_settings.colors.scss +++ b/settings/_settings.colors.scss @@ -16,7 +16,7 @@ $color-text: color('nhs-black') !default; // [1] $color-text-bg: color('white') !default; // [1] -$color-lists: color('nhs-grey-dark') !default; +$color-lists: color('nhs-black') !default; @@ -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; $color-links-active: color('nhs-blue') !default; $color-links-visited: color('nhs-purple') !default; @@ -267,4 +267,4 @@ $color-quote: color('nhs-grey-dark') !default; $color-quote-meta: color('nhs-black') !default; $color-quote-border: color('nhs-grey-pale') !default; $color-quote-alt: color('white') !default; -$color-quote-alt-bg: color('nhs-purple') !default; +$color-quote-alt-bg: color('nhs-blue') !default; From 63fbe7e03eb327607841e127473b01de807b1656 Mon Sep 17 00:00:00 2001 From: Paul Novak Date: Wed, 22 Aug 2018 13:58:26 +0100 Subject: [PATCH 2/5] Multiple updates - 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 - --- .../img/logos/NHS_Nightingale_Logo_Blue.png | Bin 0 -> 7411 bytes .../logos/NHS_Nightingale_Logo_Blue@2x.png | Bin 0 -> 15589 bytes index.html | 473 ++++++++++++------ 3 files changed, 323 insertions(+), 150 deletions(-) create mode 100644 assets/img/logos/NHS_Nightingale_Logo_Blue.png create mode 100644 assets/img/logos/NHS_Nightingale_Logo_Blue@2x.png diff --git a/assets/img/logos/NHS_Nightingale_Logo_Blue.png b/assets/img/logos/NHS_Nightingale_Logo_Blue.png new file mode 100644 index 0000000000000000000000000000000000000000..2cd5d2ac0c836d64708cbf5dd282001d4dc87203 GIT binary patch literal 7411 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 literal 0 HcmV?d00001 diff --git a/assets/img/logos/NHS_Nightingale_Logo_Blue@2x.png b/assets/img/logos/NHS_Nightingale_Logo_Blue@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..3e9d16d2e313165bdceb7bd00caf6d76a8a8a202 GIT binary patch literal 15589 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 - +
@@ -222,69 +222,29 @@

This is a new sub nav area

-

Nightingale

-

Welcome to the NHS Leadership Academy UI Toolkit and front-end - framework, codename Nightingale.

-
-
-
-

Header Link

-

With some supporting text

-
-
-

Header Link

-

With some supporting text

-
-
-

Header Link

-

With some supporting text

-
-
-
+
-
-
-
-

Call to Action Card

-

This is your chance
- Don't miss out

-

Another paragraph of text to test the layout.

-

And another.

 -

Apply Now!

-
-
-
-
-

Call to Action Card

-

This is your chance
- Don't miss out

 -

Apply Now!

-
-
-
-
-

Call to Action Card

-

This is your chance
- Don't miss out

 -

Apply Now!

-
-
-
+

Nightingale

+ +

The following showcases the Leadership Academy front-end + framework, codename Nightingale.

+ +
+
@@ -293,8 +253,7 @@

Call to Action Card

- -

Typography

+

Typography


@@ -304,6 +263,8 @@

Heading 1 - Example link

only be used when accentuating the first paragraph only be used once per article. Example link

+ +
  • List item @@ -325,6 +286,19 @@

    Heading 1 - Example link

    Default paragraph is the style that should be used in all instances when not accentuating the copy content. Example link

    +
    + Expandable Content – closed by Default + +
    +

    Pellentesque habitant morbi tristique senectus et netus et malesuada + fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, + ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam + egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend + leo.

    +
    + +
    +
    • List item @@ -343,6 +317,8 @@

      Heading 1 - Example link

      • + +

      Supporting paragraph is the style that should only be used in certain instances such as when copy need not distract or draw away attention from default paragraph. Example link

      @@ -365,105 +341,293 @@

      Heading 1 - Example link

      -
      -

      Many centuries ago, man was able to tell the time by looking at the - sun and its position in the sky. Then came the sundial and finally - clocks and watches.

      - - Quote author
      - Author role
      - Organisation -       -
      - -
      -

      Many centuries ago, man was able to tell the time by looking at the - sun and its position in the sky. Then came the sundial and finally - clocks and watches.

      - - Quote author
      - Author role
      - Organisation -       -
      - -
      - Expandable Content – closed by Default +
      +
      -
      -

      Pellentesque habitant morbi tristique senectus et netus et malesuada - fames ac turpis egestas. Vestibulum tortor quam, feugiat vitae, - ultricies eget, tempor sit amet, ante. Donec eu libero sit amet quam - egestas semper. Aenean ultricies mi vitae est. Mauris placerat eleifend - leo.

      -
      -
      +

      Heading 2 - Example link

      +
      +

      Leading paragraph is the style that should + only be used when accentuating the first paragraph only be used once per + article. Example link

      -

      Heading 2 - Example link

      +
        +
      • + List item +
          +
        • Sub list item
          • +
        +
        • +
      -

      Leading paragraph is the style that should - only be used when accentuating the first paragraph only be used once per - article. Example link

      +
        +
      1. + List item +
          +
        1. Sub list item
          2. +
        +
        2. +
      + +

      Default paragraph is the style that should be used in all instances when + not accentuating the copy content. Example link

      + +
        +
      • + List item +
          +
        • Sub list item
          • +
        +
        • +
      + +
        +
      1. + List item +
          +
        1. Sub list item
          2. +
        +
        2. +
      + +

      Supporting paragraph is the style that should only be used in certain + instances such as when copy need not distract or draw away attention from + default paragraph. Example link

      + +
        +
      • + List item +
          +
        • Sub list item
          • +
        +
        • +
      + +
        +
      1. + List item +
          +
        1. Sub list item
          2. +
        +
        2. +
      + + +
      +
      + + +

      Heading 3 - Example link

      + +
      + +

      Default paragraph is the style that should be used in all instances when + not accentuating the copy content. Example link

      + +
        +
      • + List item +
          +
        • Sub list item
          • +
        +
        • +
      + +
        +
      1. + List item +
          +
        1. Sub list item
          2. +
        +
        2. +
      + +

      Supporting paragraph is the style that should only be used in certain + instances such as when copy need not distract or draw away attention from + default paragraph. Example link

      + +
        +
      • + List item +
          +
        • Sub list item
          • +
        +
        • +
      + +
        +
      1. + List item +
          +
        1. Sub list item
          2. +
        +
        2. +
      + +
      +
      + + +

      Heading 4 - Example link

      + +
      + +

      Supporting paragraph is the style that should only be used in certain + instances such as when copy need not distract or draw away attention from + default paragraph. Example link

      + +
        +
      • + List item +
          +
        • Sub list item
          • +
        +
        • +
      + +
        +
      1. + List item +
          +
        1. Sub list item
          2. +
        +
        2. +
      + +
      +
      -

      Default paragraph is the style that should be used in all instances when - not accentuating the copy content. Example link

      +
      Heading 5 - Example link
      -

      Supporting paragraph is the style that should only be used in certain - instances such as when copy need not distract or draw away attention from - default paragraph. Example link

      +
      + +

      Supporting paragraph is the style that should only be used in certain + instances such as when copy need not distract or draw away attention from + default paragraph. Example link

      + +
        +
      • + List item +
          +
        • Sub list item
          • +
        +
        • +
      + +
        +
      1. + List item +
          +
        1. Sub list item
          2. +
        +
        2. +
      + +
      +
      + +
      Heading 6 - Example link
      + +
      + +

      Supporting paragraph is the style that should only be used in certain + instances such as when copy need not distract or draw away attention from + default paragraph. Example link

      + +
        +
      • + List item +
          +
        • Sub list item
          • +
        +
        • +
      + +
        +
      1. + List item +
          +
        1. Sub list item
          2. +
        +
        2. +
      + +
      + + + + + + + + +
      + +
      +

      Quotes

      + +
      +

      Many centuries ago, man was able to tell the time by looking at the + sun and its position in the sky. Then came the sundial and finally + clocks and watches.

      + + Quote author
      + Author role
      + Organisation +       +
      + +
      +

      Many centuries ago, man was able to tell the time by looking at the + sun and its position in the sky. Then came the sundial and finally + clocks and watches.

      + + Quote author
      + Author role
      + Organisation +       +
      + +
      +
      -

      Heading 3 - Example link

      -

      Default paragraph is the style that should be used in all instances when - not accentuating the copy content. Example link

      -

      Supporting paragraph is the style that should only be used in certain - instances such as when copy need not distract or draw away attention from - default paragraph. Example link

      -

      Heading 4 - Example link

      -

      Default paragraph is the style that should be used in all instances when - not accentuating the copy content. Example link

      -

      Supporting paragraph is the style that should only be used in certain - instances such as when copy need not distract or draw away attention from - default paragraph. Example link

      -
      Heading 5 - Example link
      -

      Default paragraph is the style that should be used in all instances when - not accentuating the copy content. Example link

      -

      Supporting paragraph is the style that should only be used in certain - instances such as when copy need not distract or draw away attention from - default paragraph. Example link

      -
      Heading 6 - Example link
      -

      Supporting paragraph is the style that should only be used in certain - instances such as when copy need not distract or draw away attention from - default paragraph. Example link

      -

      Cards

      -
      This is an information card
      +

      This is an information card

      I hope you find it informative
      -
      This is an alert!
      +

      This is an alert!

      I hope you're paying attention
      +
      +

      Call to Action Card

      +

      This is your chance
      + Don't miss out

       +

      Apply Now!

      +
      + +
      +

      Comments

      @@ -1525,7 +1689,40 @@

      Hints

      -

      Progress

      + + + +

      Quotes

      + +
      +

      Many centuries ago, man was able to tell the time by looking at the + sun and its position in the sky. Then came the sundial and finally + clocks and watches.

      + + Quote author
      + Author role
      + Organisation +       +
      + +
      +

      Many centuries ago, man was able to tell the time by looking at the + sun and its position in the sky. Then came the sundial and finally + clocks and watches.

      + + Quote author
      + Author role
      + Organisation +       +
      + +
      + +
      + + + +

      Progress

      33% @@ -1564,31 +1761,7 @@

      Spinners

      -

      Quotes

      -
      -

      Many centuries ago, man was able to tell the time by looking at the - sun and its position in the sky. Then came the sundial and finally - clocks and watches.

      - - Quote author
      - Author role
      - Organisation -       -
      - -
      -

      Many centuries ago, man was able to tell the time by looking at the - sun and its position in the sky. Then came the sundial and finally - clocks and watches.

      - - Quote author
      - Author role
      - Organisation -       -
      - -

      Reveal

      From 1e2bedb899e91a0b1b48beb08971cb6aa75d00a6 Mon Sep 17 00:00:00 2001 From: ProPaul Date: Tue, 11 Sep 2018 14:41:47 +0100 Subject: [PATCH 3/5] Update _settings.colors.scss uppercase hex to lowercase --- settings/_settings.colors.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings/_settings.colors.scss b/settings/_settings.colors.scss index 5b20b54..f1a5a57 100644 --- a/settings/_settings.colors.scss +++ b/settings/_settings.colors.scss @@ -42,7 +42,7 @@ $color-warning: color('warning') !default; // ========================================================================== */ $color-links: color('nhs-blue') !default; -$color-links-hover: #4C8ECF !default; +$color-links-hover: #4c8ecf !default; $color-links-active: color('nhs-blue') !default; $color-links-visited: color('nhs-purple') !default; From 768fa8139a237fd2297d4421e0b691f9f84fd00a Mon Sep 17 00:00:00 2001 From: Paul Novak Date: Wed, 12 Sep 2018 10:15:13 +0100 Subject: [PATCH 4/5] hex case changed hex upercase to lowercase --- settings/_settings.colors.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings/_settings.colors.scss b/settings/_settings.colors.scss index f7689e6..6f8a293 100644 --- a/settings/_settings.colors.scss +++ b/settings/_settings.colors.scss @@ -42,7 +42,7 @@ $color-warning: color('warning') !default; // ========================================================================== */ $color-links: color('nhs-blue') !default; -$color-links-hover: #4C8ECF !default; +$color-links-hover: #4c8ecf !default; $color-links-active: color('nhs-blue') !default; $color-links-visited: color('nhs-purple') !default; From 5f85a20cb881144e98a9d41d9cd6cede50b00986 Mon Sep 17 00:00:00 2001 From: ProPaul Date: Thu, 13 Sep 2018 15:34:52 +0100 Subject: [PATCH 5/5] Update circle.yml --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 53b8ed5..86f2242 100644 --- a/circle.yml +++ b/circle.yml @@ -1,6 +1,6 @@ machine: node: - version: 6.1.0 + version: 6.2.2 environment: PATH: "${PATH}:${HOME}/${CIRCLE_PROJECT_REPONAME}/node_modules/.bin" timezone: