Merge branch 'master' into feat-issue-741-add-event-cta

Author: castastrophe

CHANGELOG-prerelease.md

@@ -2,6 +2,7 @@
 
 Tag: [v1.0.0-prerelease.42](https://github.com/patternfly/patternfly-elements/releases/tag/v1.0.0-prerelease.42)
 
+- [fbc251b](https://github.com/patternfly/patternfly-elements/commit/fbc251b5180684da26a57c0941235d57f961990e) fix: set consistent line-height for pfe-nav triggers (#773)
 - [](https://github.com/patternfly/patternfly-elements/commit/) feat: adding event to pfe-cta component
 
 ## Prerelease 41 ( 2020-03-19 )

elements/pfe-navigation/src/pfe-navigation--lightdom.scss

@@ -301,6 +301,7 @@ pfe-navigation-item {
     [slot="trigger"] {
         font-family: #{pfe-var(font-family)};
         margin: .25em 0 0 0!important;
+        line-height: 1.3;
     }
     // Utility links.
     pfe-icon + [slot="trigger"] > a {

elements/pfe-select/src/pfe-select.scss

@@ -17,8 +17,8 @@ $variables: (
   BorderLeft:                 #{pfe-local(BorderWidth) pfe-var(ui--border-style) pfe-local(BorderColor)},
   BorderRight:                #{pfe-local(BorderWidth) pfe-var(ui--border-style) pfe-local(BorderColor)},
   BorderBottom:               #{pfe-local(BorderBottomWidth) pfe-var(ui--border-style) pfe-local(BorderBottomColor)},
-  BorderBottom--hover:        #{pfe-local(BorderBottomWidth) pfe-var(ui--border-style) pfe-local(BorderBottomColor--hover)}
-
+  BorderBottom--hover:        #{pfe-local(BorderBottomWidth) pfe-var(ui--border-style) pfe-local(BorderBottomColor--hover)},
+  FontFamily:                 #{pfe-var(font-family)}
 );
 
 :host {
@@ -82,6 +82,7 @@ $variables: (
 
     font-size:    #{pfe-var(font-size)};
     font-weight:  #{pfe-var(font-weight--normal)};
+    font-family: #{pfe-local(FontFamily)};
 
     appearance: none;
     box-shadow: none;