Merge pull request #108 from wfp/hotfix-v0.10.1

Hotfix v0.10.1
wfp · Aug 4, 2016 · 7de3557 · 7de3557
2 parents 64b154e + c56b336
commit 7de3557
Show file tree

Hide file tree

Showing 13 changed files with 47 additions and 42 deletions.
diff --git a/dist/css/bootstrap-theme.css b/dist/css/bootstrap-theme.css
diff --git a/dist/css/wfpui+grid.css b/dist/css/wfpui+grid.css
diff --git a/dist/css/wfpui.css b/dist/css/wfpui.css
diff --git a/docs/_config.yml b/docs/_config.yml
@@ -4,7 +4,7 @@ email: "[email protected]"
 description: ""
 # baseurl: "/guides/ui/v0.5.0" # WFP CDN
 url: "https://cdn.wfp.org" # WFP CDN
-version: "v0.10.0"
+version: "v0.10.1"
 quiet: true
 
 exclude: ["*.sublime-*", "*.sh", "*.yml", "*.DS_*"]

diff --git a/scss/bootstrap-theme.scss b/scss/bootstrap-theme.scss
@@ -1,5 +1,5 @@
 /*!
- * WFP UI Bootstrap Theme, v0.10.0
+ * WFP UI Bootstrap Theme, v0.10.1
  * Copyright 2016 WFP/MADBIT Co.
  * License: https://github.com/wfp/ui/blob/master/LICENSE
  */

diff --git a/scss/components/_buttons.scss b/scss/components/_buttons.scss
@@ -182,10 +182,6 @@ $color-gplus: #dc4e41;
   }
 }
 
-a[class*="wfp-btn"] {
- border-bottom-color: inherit;
-}
-
 .wfp-btn {
   @include button;
 }

diff --git a/scss/components/navigation/_breadcrumbs.scss b/scss/components/navigation/_breadcrumbs.scss
@@ -28,6 +28,9 @@
 
   .breadcrumbs--link {
     @include seg-control--link;
+    @include pv(1);
+    @include ph(2);
+    @include lh-scale(1.083);
     font-weight: normal;
     color: darken($primary, 12%);
     white-space: nowrap;
@@ -52,6 +55,9 @@
 
   .breadcrumbs--last {
     @include seg-control--link;
+    @include pv(1);
+    @include ph(2);
+    @include lh-scale(1.083);
     font-weight: normal;
     color: $grey-darker;
     cursor: default;

diff --git a/scss/layouts/_header.scss b/scss/layouts/_header.scss
@@ -9,7 +9,7 @@
 // -----------------------------------------------------------------------------
 .wfp-header-spacer--narrow {
   overflow: auto;
-  padding-top: 4.25em;
+  padding-top: 4.125rem;
 }
 
 %masthead {
@@ -18,8 +18,8 @@
   background-color: $primary;
   color: $white;
   box-shadow: rgba($black, 0.25) 0 1px 3px;
-  min-height: 3em;
-  max-height: 6.5em;
+  min-height: 3rem;
+  max-height: 6.5rem;
 
   .wrapper {
     position: relative;
@@ -30,12 +30,12 @@
 // Masthead: Narrow
 // -----------------------------------------------------------------------------
 %header--container {
-  padding: 0.5em 0;
+  padding: 0.5rem 0;
 }
 
 %header--title {
   line-height: 1.2;
-  font-size: 1em;
+  font-size: 1rem;
   letter-spacing: initial;
   margin: 0;
 
@@ -51,7 +51,7 @@
   text-decoration: none;
 
   img {
-    height: 4.5em;
+    height: 4.5rem;
   }
 }
 
@@ -66,7 +66,7 @@
   transition-property: border, background, color, width;
   transition-duration: 0.1s;
   transition-timing-function: ease-in;
-  padding: 0.25em 0.66em;
+  padding: 0.25rem 0.66rem;
 
   &:hover {
     color: $orange;
@@ -86,15 +86,15 @@
     position: absolute;
     left: 0;
     top: 0;
-    width: 2.25em;
-    height: 2.25em;
+    width: 2.25rem;
+    height: 2.25rem;
     content: "";
     color: $white;
     z-index: 1;
   }
 
   .header--input {
-    padding: 0.5em 0.75em 0.5em 2em;
+    padding: 0.5rem 0.75rem 0.5rem 2rem;
   }
 }
 

diff --git a/scss/modules/elements/_headings.scss b/scss/modules/elements/_headings.scss
@@ -5,64 +5,63 @@
 
 @mixin h--headline {
   @include lh-scale(0.75);
-  font-size: 1.75rem;
-  margin: 0.25rem 0;
+  @include margin(0.25rem 0);
+  @include fs(3);
 
   @include media-query($md-screen) {
-    // @include lh-scale(0.5);
-    font-size: 3rem;
-    letter-spacing: -0.05rem;
-    margin: 0.5rem 0;
+    @include lh-scale(0.75);
+    @include fs(1);
+    @include tracking(tight);
   }
 }
 
 @mixin h--tagline {
   @include lh-scale(0.875);
-  font-size: 0.875rem;
-  margin: 0.25rem 0;
+  @include margin(0.25rem 0);
+  @include fs(6);
 
   @include media-query($md-screen) {
-    // @include lh-scale(1);
-    font-size: 1.25rem;
+    @include mv(2);
+    @include fs(4);
   }
 }
 
 @mixin h1 {
   @include lh-scale(0.5);
-  font-size: 3rem;
-  letter-spacing: -0.05rem;
-  margin: 0.5rem 0;
+  @include fs(1);
+  @include tracking(tight);
+  @include margin(0.5rem 0);
 }
 
 @mixin h2 {
+  @include margin(0.25rem 0);
   @include lh-scale(0.75);
   font-size: 2.5rem;
   letter-spacing: -0.025rem;
-  margin: 0.25rem 0;
 }
 
 @mixin h3 {
   @include lh-scale(0.875);
+  @include margin(0.25rem 0);
   font-size: 2rem;
-  margin: 0.25rem 0;
 }
 
 @mixin h4 {
+  @include margin(0.25rem 0);
   @include lh-scale;
   font-size: 1.75rem;
-  margin: 0.25rem 0;
 }
 
 @mixin h5 {
+  @include margin(0.25rem 0);
   @include lh-scale;
   font-size: 1.5rem;
-  margin: 0.25rem 0;
 }
 
 @mixin h6 {
+  @include margin(0.25rem 0);
   @include lh-scale;
   font-size: 1.25rem;
-  margin: 0.25rem 0;
 }
 
 .h--headline    { @include h--headline; }

diff --git a/scss/modules/typography/_size.scss b/scss/modules/typography/_size.scss
@@ -16,6 +16,10 @@ $fs: (
   font-size: map-get($fs, $size);
 }
 
+@mixin font-size($size) {
+  font-size: #{$size}rem;
+}
+
 .fs1 { @include fs(1); }
 .fs2 { @include fs(2); }
 .fs3 { @include fs(3); }

diff --git a/scss/modules/typography/_tracking.scss b/scss/modules/typography/_tracking.scss
@@ -4,7 +4,7 @@
 // URL: http://matthewmorek.com
 
 $spaces: (
-  tight: -0.05em,
+  tight: -0.03em,
   loose:  0.16em,
   xloose: 0.32em
 );

diff --git a/scss/wfpui+grid.scss b/scss/wfpui+grid.scss
@@ -1,5 +1,5 @@
 /*!
- * WFP UI with grids, v0.10.0
+ * WFP UI with grids, v0.10.1
  * Copyright 2016 WFP/MADBIT Co.
  * License: https://github.com/wfp/ui/blob/master/LICENSE
  */

diff --git a/scss/wfpui.scss b/scss/wfpui.scss
@@ -1,5 +1,5 @@
 /*!
- * WFP UI sans grids, v0.10.0
+ * WFP UI sans grids, v0.10.1
  * Copyright 2016 WFP/MADBIT Co.
  * License: https://github.com/wfp/ui/blob/master/LICENSE
  */