From 7e11f5908e1aac51b25d3d07b26e8c18aacda141 Mon Sep 17 00:00:00 2001 From: Paul Gschwendtner Date: Thu, 26 Jan 2017 20:27:36 +0100 Subject: [PATCH] fix: apply font-family to text components * Applies the `font-family` to all components that use content projection and have a label or a text displayed. * Switches the hard-coded font-family in the `simple-snack-bar` to the global variable. --- src/lib/button-toggle/button-toggle.scss | 1 + src/lib/checkbox/checkbox.scss | 1 + src/lib/radio/radio.scss | 1 + src/lib/snack-bar/simple-snack-bar.scss | 4 +++- 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/lib/button-toggle/button-toggle.scss b/src/lib/button-toggle/button-toggle.scss index a54c1c274b94..661eeaa3e53f 100644 --- a/src/lib/button-toggle/button-toggle.scss +++ b/src/lib/button-toggle/button-toggle.scss @@ -34,6 +34,7 @@ md-button-toggle-group { md-button-toggle { white-space: nowrap; + font-family: $md-font-family; } .md-button-toggle-label-content { diff --git a/src/lib/checkbox/checkbox.scss b/src/lib/checkbox/checkbox.scss index 213663d7123d..77adb06612e7 100644 --- a/src/lib/checkbox/checkbox.scss +++ b/src/lib/checkbox/checkbox.scss @@ -193,6 +193,7 @@ $md-checkbox-ripple-size: 15px; md-checkbox { cursor: pointer; + font-family: $md-font-family; // Animation transition: background $swift-ease-out-duration $swift-ease-out-timing-function, diff --git a/src/lib/radio/radio.scss b/src/lib/radio/radio.scss index 574833a0a37b..db27eb4ff004 100644 --- a/src/lib/radio/radio.scss +++ b/src/lib/radio/radio.scss @@ -8,6 +8,7 @@ $md-radio-ripple-size: $md-radio-size * 0.75; // Top-level host container. md-radio-button { display: inline-block; + font-family: $md-font-family; } // Inner label container, wrapping entire element. diff --git a/src/lib/snack-bar/simple-snack-bar.scss b/src/lib/snack-bar/simple-snack-bar.scss index 9935cd92950e..019ff2cfe79e 100644 --- a/src/lib/snack-bar/simple-snack-bar.scss +++ b/src/lib/snack-bar/simple-snack-bar.scss @@ -1,3 +1,5 @@ +@import '../core/style/variables'; + md-simple-snackbar { display: flex; justify-content: space-between; @@ -7,7 +9,7 @@ md-simple-snackbar { box-sizing: border-box; border: none; color: white; - font-family: Roboto, 'Helvetica Neue', sans-serif; + font-family: $md-font-family; font-size: 14px; line-height: 20px; outline: none;