From 615fa2a3fc164f1830a2f18b789856d1c8090292 Mon Sep 17 00:00:00 2001
From: Kristiyan Kostadinov <crisbeto@users.noreply.github.com>
Date: Thu, 1 Jun 2017 22:26:52 +0200
Subject: [PATCH] fix(button,tabs): potential clash with typography styles
 (#4915)

Since the buttons and tabs depend on their `line-height` for sizing, we shouldn't override it via the typography styles. This fix removes the `line-height` that is set from the typography, in order to prevent potential issues.
---
 src/lib/button/_button-theme.scss | 6 +++++-
 src/lib/tabs/_tabs-theme.scss     | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/lib/button/_button-theme.scss b/src/lib/button/_button-theme.scss
index c0f2c88548c..4d23b7b6e8a 100644
--- a/src/lib/button/_button-theme.scss
+++ b/src/lib/button/_button-theme.scss
@@ -120,6 +120,10 @@
 
 @mixin mat-button-typography($config) {
   .mat-button, .mat-raised-button, .mat-icon-button {
-    @include mat-typography-level-to-styles($config, button);
+    font: {
+      family: mat-font-family($config);
+      size: mat-font-size($config, button);
+      weight: mat-font-weight($config, button);
+    }
   }
 }
diff --git a/src/lib/tabs/_tabs-theme.scss b/src/lib/tabs/_tabs-theme.scss
index f22571fa63b..28f0b488f23 100644
--- a/src/lib/tabs/_tabs-theme.scss
+++ b/src/lib/tabs/_tabs-theme.scss
@@ -46,6 +46,10 @@
   }
 
   .mat-tab-label, .mat-tab-link {
-    @include mat-typography-level-to-styles($config, button);
+    font: {
+      family: mat-font-family($config);
+      size: mat-font-size($config, button);
+      weight: mat-font-weight($config, button);
+    }
   }
 }