diff --git a/packages/core/package.json b/packages/core/package.json index ad5515a230a..21c82f28026 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -34,7 +34,7 @@ "@types/tether": "^1.1.27", "classnames": "^2.2", "dom4": "^1.8", - "normalize.css": "4.1.1", + "normalize.css": "^7.0.0", "popper.js": "^1.12.6", "pure-render-decorator": "^1.1", "react-popper": "~0.7.4", diff --git a/packages/core/src/components/button/_common.scss b/packages/core/src/components/button/_common.scss index b17608082e4..7b478b87cdd 100644 --- a/packages/core/src/components/button/_common.scss +++ b/packages/core/src/components/button/_common.scss @@ -100,6 +100,7 @@ $button-intents: ( cursor: pointer; padding: $button-padding; vertical-align: middle; + font-family: inherit; font-size: $pt-font-size; } diff --git a/packages/core/src/components/hotkeys/_hotkeys.scss b/packages/core/src/components/hotkeys/_hotkeys.scss index f0dda618d92..6de770a9fc9 100644 --- a/packages/core/src/components/hotkeys/_hotkeys.scss +++ b/packages/core/src/components/hotkeys/_hotkeys.scss @@ -20,7 +20,7 @@ $modifier-key-padding: 3px 8px 3px 6px !default; text-align: center; line-height: $pt-grid-size * 2; color: $pt-text-color-muted; - font-family: $pt-font-family; + font-family: inherit; font-size: $pt-font-size-small; &.pt-modifier-key { diff --git a/packages/docs-app/package.json b/packages/docs-app/package.json index b57c3fbe4fa..8e5fd79c8ee 100644 --- a/packages/docs-app/package.json +++ b/packages/docs-app/package.json @@ -27,7 +27,7 @@ "classnames": "^2.2.5", "dom4": "^1.8.3", "moment": "^2.18.1", - "normalize.css": "~4.1.1", + "normalize.css": "^7.0.0", "popper.js": "^1.12.6", "pure-render-decorator": "^1.2.1", "react": "^15.6.1", diff --git a/packages/table-dev-app/package.json b/packages/table-dev-app/package.json index b3f18801e25..f8dd1d71848 100644 --- a/packages/table-dev-app/package.json +++ b/packages/table-dev-app/package.json @@ -20,7 +20,7 @@ "@blueprintjs/table": "^1.31.0", "classnames": "^2.2.5", "dom4": "^1.8.3", - "normalize.css": "~4.1.1", + "normalize.css": "^7.0.0", "pure-render-decorator": "^1.2.1", "react": "^15.6.1", "react-dom": "^15.6.1" diff --git a/yarn.lock b/yarn.lock index 4855393154e..fbd3eed2eb2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5471,9 +5471,9 @@ normalize-url@^1.4.0: query-string "^4.1.0" sort-keys "^1.0.0" -normalize.css@4.1.1, normalize.css@~4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/normalize.css/-/normalize.css-4.1.1.tgz#4f0b1d5a235383252b04d8566b866cc5fcad9f0c" +normalize.css@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/normalize.css/-/normalize.css-7.0.0.tgz#abfb1dd82470674e0322b53ceb1aaf412938e4bf" npm-run-all@^4.1.1, npm-run-all@^4.1.2: version "4.1.2"