Merge branch 'register-component-api' of github.com:reactioncommerce/…

…reaction into register-component-api * 'register-component-api' of github.com:reactioncommerce/reaction: Fix issue 2535. Transliteration in Safari/IE (#2553) fix 2547: vertically-center navbar link using @navbar-height height variable instead of percentage height (#2551)
reactioncommerce · Jul 12, 2017 · 5b2a053 · 5b2a053
2 parents 2da4cf2 + 02141f4
commit 5b2a053
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/client/modules/core/helpers/utils.js b/client/modules/core/helpers/utils.js
@@ -1,6 +1,4 @@
-/* global slugify */
-// client slugify only works when import minified version.
-import "transliteration/lib/browser/transliteration.js";
+import { slugify } from "transliteration";
 
 /**
  * getSlug - return a client slugified string using the "slugify"

diff --git a/imports/plugins/included/default-theme/client/styles/tagNav.less b/imports/plugins/included/default-theme/client/styles/tagNav.less
@@ -294,7 +294,7 @@
 }
 
 .rui.tagnav .navbar-item {
-  height: 100%;
+  height: @navbar-height;
 }
 
 .rui.tagnav.vertical .navbar-item {

diff --git a/package.json b/package.json
@@ -104,7 +104,7 @@
     "swiper": "^3.4.2",
     "tether-drop": "^1.4.2",
     "tether-tooltip": "^1.2.0",
-    "transliteration": "1.6.2",
+    "transliteration": "github:reactioncommerce/transliteration",
     "twilio": "^3.4.0",
     "url": "^0.11.0",
     "velocity-animate": "^1.5.0",