From bfb4ffb29157e82600a0fa06526af01e8faeaaf7 Mon Sep 17 00:00:00 2001 From: Machiko Yasuda Date: Tue, 11 Jul 2017 18:10:25 -0700 Subject: [PATCH 1/2] fix 2547: vertically-center navbar link using @navbar-height height variable instead of percentage height (#2551) --- .../plugins/included/default-theme/client/styles/tagNav.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/imports/plugins/included/default-theme/client/styles/tagNav.less b/imports/plugins/included/default-theme/client/styles/tagNav.less index 1297aa589bc..404a6bd8522 100644 --- 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 { From 125b919ff72bcf3748da8def54ee2d2debebe0b7 Mon Sep 17 00:00:00 2001 From: Brent Hoover Date: Wed, 12 Jul 2017 23:26:51 +0800 Subject: [PATCH 2/2] Fix issue 2535. Transliteration in Safari/IE (#2553) * Use official Reaction fork * Go back to standard import --- client/modules/core/helpers/utils.js | 4 +--- package.json | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/client/modules/core/helpers/utils.js b/client/modules/core/helpers/utils.js index 447f54258e6..07e999c0252 100644 --- 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/package.json b/package.json index 9935c9ac5f1..26b7c68811e 100644 --- a/package.json +++ b/package.json @@ -103,7 +103,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",