From d889a96099fe7f6eb840cefa125e4703f15524ef Mon Sep 17 00:00:00 2001
From: Martin Lijanto <mlijanto@microsoft.com>
Date: Wed, 18 Nov 2015 14:54:11 -0800
Subject: [PATCH] Added variables for font paths.

---
 bower.json                         |  2 +-
 package.json                       |  2 +-
 src/scss/win/_resources.scss       |  3 ++-
 src/scss/win/_side-navigation.scss |  2 ++
 src/scss/win/_type.scss            | 32 ++++++++++++++++--------------
 5 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/bower.json b/bower.json
index 29c6fb7..d9cfffc 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
     "name": "Winstrap",
-    "version": "0.5.4",
+    "version": "0.5.5",
     "main": [
         "src/scss/winstrap.scss"
     ],
diff --git a/package.json b/package.json
index 1474bdb..878bdbf 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
     "type": "git",
     "url": "git+https://github.com/winjs/winstrap.git"
   },
-  "version": "0.5.4",
+  "version": "0.5.5",
   "author": "Microsoft",
   "contributors": [
     "Frederic Perrin",
diff --git a/src/scss/win/_resources.scss b/src/scss/win/_resources.scss
index 8f203de..b255a7d 100644
--- a/src/scss/win/_resources.scss
+++ b/src/scss/win/_resources.scss
@@ -1 +1,2 @@
-$icon-font-path: "../fonts/glyphs";
+$font-path:         "../fonts" !default;
+$icon-font-path:    "#{$font-path}/glyphs" !default;
diff --git a/src/scss/win/_side-navigation.scss b/src/scss/win/_side-navigation.scss
index 7e8e94f..0767f71 100644
--- a/src/scss/win/_side-navigation.scss
+++ b/src/scss/win/_side-navigation.scss
@@ -1,9 +1,11 @@
 // This is for viewports 1 & 2 and lives outside the .side-navigation structure to be visible when .side-navigation is not
 a.navigation-btn {
     position: relative;
+    text-align: left;
     margin-top: spacing(xs);
     padding-left: spacing(sm);
     [dir="rtl"] & {
+        text-align: right;
         padding-right: spacing(sm);
     }
     &:hover {
diff --git a/src/scss/win/_type.scss b/src/scss/win/_type.scss
index 4ce6cf1..41d0be0 100644
--- a/src/scss/win/_type.scss
+++ b/src/scss/win/_type.scss
@@ -8,37 +8,37 @@
 
 @font-face {
     font-family: "Selawik";
-    src: url("../fonts/selawk.eot");
-    src: url("../fonts/selawk.eot#iefix") format("embedded-opentype"),
-         url("../fonts/selawk.ttf") format("truetype");
+    src: url("#{$font-path}/selawk.eot");
+    src: url("#{$font-path}/selawk.eot#iefix") format("embedded-opentype"),
+         url("#{$font-path}/selawk.ttf") format("truetype");
 }
 
 @font-face {
     font-family: "Selawik Bold";
-    src: url("../fonts/selawkb.eot");
-    src: url("../fonts/selawkb.eot#iefix") format("embedded-opentype"),
-         url("../fonts/selawkb.ttf") format("truetype");
+    src: url("#{$font-path}/selawkb.eot");
+    src: url("#{$font-path}/selawkb.eot#iefix") format("embedded-opentype"),
+         url("#{$font-path}/selawkb.ttf") format("truetype");
 }
 
 @font-face {
     font-family: "Selawik Light";
-    src: url("../fonts/selawkl.eot");
-    src: url("../fonts/selawkl.eot#iefix") format("embedded-opentype"),
-         url("../fonts/selawkl.ttf") format("truetype");
+    src: url("#{$font-path}/selawkl.eot");
+    src: url("#{$font-path}/selawkl.eot#iefix") format("embedded-opentype"),
+         url("#{$font-path}/selawkl.ttf") format("truetype");
 }
 
 @font-face {
     font-family: "Selawik Semibold";
-    src: url("../fonts/selawksb.eot");
-    src: url("../fonts/selawksb.eot#iefix") format("embedded-opentype"),
-         url("../fonts/selawksb.ttf") format("truetype");
+    src: url("#{$font-path}/selawksb.eot");
+    src: url("#{$font-path}/selawksb.eot#iefix") format("embedded-opentype"),
+         url("#{$font-path}/selawksb.ttf") format("truetype");
 }
 
 @font-face {
     font-family: "Selawik Semilight";
-    src: url("../fonts/selawksl.eot");
-    src: url("../fonts/selawksl.eot#iefix") format("embedded-opentype"),
-         url("../fonts/selawksl.ttf") format("truetype");
+    src: url("#{$font-path}/selawksl.eot");
+    src: url("#{$font-path}/selawksl.eot#iefix") format("embedded-opentype"),
+         url("#{$font-path}/selawksl.ttf") format("truetype");
 }
 
 // Responsive Typography mixin
@@ -203,3 +203,5 @@ h5 { @extend .type-h5; }
 h6 { @extend .type-h6; }
 
 p { @extend .type-p3; }
+
+figcaption { @extend .type-c1 }