Merge branch 'release-1.10.3'

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
 

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);

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,14 @@ $site-nav-toggle-width: 40%;
     }
   }
 
+  &.nav-collapse {
+    li {
+      width: auto !important;
+      // Overrides Responsive Nav plugin styles because it sets width:100%,
+      // breaking the nav.
+    }
+  }
+
   li {
     margin: 0;
 
@@ -67,19 +74,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;
 

assets/sass/ui-kit.scss

@@ -1,6 +1,6 @@
 /*
 
-UI-Kit version: 1.10.2
+UI-Kit version: 1.10.3
 
 */
 

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 <[email protected]>",
   "main": "assets/sass/ui-kit.scss",