From f5711c9bc5a8848d9d8a3fc004eaa6d0ad564130 Mon Sep 17 00:00:00 2001 From: Petra Gulicher Date: Wed, 9 Nov 2016 16:23:24 +1100 Subject: [PATCH 1/5] Adjust spacing and alignment of Site Nav --- assets/sass/components/_site-nav.scss | 32 ++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/assets/sass/components/_site-nav.scss b/assets/sass/components/_site-nav.scss index 42ac60a4..a131bc4f 100644 --- a/assets/sass/components/_site-nav.scss +++ b/assets/sass/components/_site-nav.scss @@ -46,8 +46,7 @@ $site-nav-toggle-width: 40%; border-top: $site-nav-border-width solid $site-nav-border-colour; @include media($tablet) { - display: flex; - justify-content: space-between; + @include clearfix; border-top: none; @include ie-lte(9) { @@ -56,6 +55,12 @@ $site-nav-toggle-width: 40%; } } + &.nav-collapse { + li { + width: auto !important; // Override's Responsive Nav plugin styles + } + } + li { margin: 0; @@ -67,19 +72,34 @@ $site-nav-toggle-width: 40%; } } + @include media($mobile) { + padding-left: $gutter / 2; + padding-right: $gutter / 2; + } + @include media($tablet) { + float: left; text-align: center; + } - @include ie-lte(9) { - float: left; - } + @include media($desktop) { + padding-left: $gutter; + padding-right: $gutter; + } + + &:first-child { + padding-left: 0; + } + + &:last-child { + padding-right: 0; } a { display: block; border-color: $site-nav-border-colour; border-width: $site-nav-border-width; - padding: $medium-spacing $gutter; + padding: $medium-spacing 0; font-weight: $bold-font-weight; font-size: $site-nav-type-size; From aea47f255dd436e42520e83251043836e68f8078 Mon Sep 17 00:00:00 2001 From: Pascal Klein Date: Wed, 9 Nov 2016 16:38:23 +1100 Subject: [PATCH 2/5] Removes button-colours mixin include for header, and logs site nav edits. --- CHANGELOG.md | 7 ++++++- assets/sass/components/_links.scss | 5 ++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8ec3fa29..2f2823fe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ ## UI Kit "Kraken" +### 1.10.3 - 2016-11-10 + +- Switches from flexbox to floats for the site navigation feature. +- Undoes link-button mixin application to the `header[role='banner']` from 1.10.0. + ### 1.10.2 - 2016-11-9 - Fixed `ui-kit.js` Gulp task so that minified version is created @@ -10,7 +15,7 @@ - Update version number in package.json so that it's SemVer valid (X.Y.Z) -### 1.10 - 2016-11-8 +### 1.10.0 - 2016-11-8 #### UI-Kit changes diff --git a/assets/sass/components/_links.scss b/assets/sass/components/_links.scss index b327eac4..fd8691a8 100644 --- a/assets/sass/components/_links.scss +++ b/assets/sass/components/_links.scss @@ -211,7 +211,10 @@ Style guide: Link styles.1 Hover links } } -header[role='banner'], +header[role='banner'] { + @include link-colours($non-black, $light-aqua, $non-black); +} + body > main { @include link-colours($non-black, $light-aqua, $non-black); @include button-colours($button-bg-colour, $button-bg-colour--hover, $button-bg-colour--active, $button-text-colour); From 9dd483acdaf21dc5556934e1fd1b58f09b105e11 Mon Sep 17 00:00:00 2001 From: Pascal Klein Date: Wed, 9 Nov 2016 16:40:01 +1100 Subject: [PATCH 3/5] Spello fix0r. --- assets/sass/components/_site-nav.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/sass/components/_site-nav.scss b/assets/sass/components/_site-nav.scss index a131bc4f..a1664069 100644 --- a/assets/sass/components/_site-nav.scss +++ b/assets/sass/components/_site-nav.scss @@ -57,7 +57,7 @@ $site-nav-toggle-width: 40%; &.nav-collapse { li { - width: auto !important; // Override's Responsive Nav plugin styles + width: auto !important; // Overrides Responsive Nav plugin styles } } From 6629b0a534d11fa16218361236a4581fdbbb509c Mon Sep 17 00:00:00 2001 From: Pascal Klein Date: Wed, 9 Nov 2016 16:51:34 +1100 Subject: [PATCH 4/5] More verbose comments for the important rule addition. --- assets/sass/components/_site-nav.scss | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/assets/sass/components/_site-nav.scss b/assets/sass/components/_site-nav.scss index a1664069..49589f52 100644 --- a/assets/sass/components/_site-nav.scss +++ b/assets/sass/components/_site-nav.scss @@ -57,7 +57,9 @@ $site-nav-toggle-width: 40%; &.nav-collapse { li { - width: auto !important; // Overrides Responsive Nav plugin styles + width: auto !important; + // Overrides Responsive Nav plugin styles because it sets width:100%, + // breaking the nav. } } From d80a389da693ac1593feb6d72e19372f3c05d5b6 Mon Sep 17 00:00:00 2001 From: Pascal Klein Date: Wed, 9 Nov 2016 17:14:51 +1100 Subject: [PATCH 5/5] Bumps version to 1.10.3. --- assets/sass/ui-kit.scss | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/sass/ui-kit.scss b/assets/sass/ui-kit.scss index d383fd2b..80609bf6 100644 --- a/assets/sass/ui-kit.scss +++ b/assets/sass/ui-kit.scss @@ -1,6 +1,6 @@ /* -UI-Kit version: 1.10.2 +UI-Kit version: 1.10.3 */ diff --git a/package.json b/package.json index 7a5e2d3e..2fda7c49 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gov-au-ui-kit", - "version": "1.10.2", + "version": "1.10.3", "description": "GOV.AU UI framework, using Bourbon and Neat", "author": "GOV.AU UI Kit team ", "main": "assets/sass/ui-kit.scss",