From: Pascal Pixel <pascal@superpencil.com>
Date: Fri, 11 Aug 2017 05:51:42 +0000 (+0900)
Subject: Emoji Defaults (#22565)
X-Git-Tag: v4.0.0-beta.2~427
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4634b39a1bd2034a5d6d9c3ba9872905580c4a39;p=thirdparty%2Fbootstrap.git

Emoji Defaults (#22565)
---

diff --git a/scss/_variables.scss b/scss/_variables.scss
index 8a6e7c3f92..e75e44e6a2 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -232,7 +232,7 @@ $transition-collapse:    height .35s ease !default;
 //
 // Font, line-height, and color for body text, headings, and more.
 
-$font-family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif !default;
+$font-family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol" !default;
 $font-family-monospace:  "SFMono-Regular", Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace !default;
 $font-family-base:       $font-family-sans-serif !default;