Merge branch '36448-smiles-are-broken-in-9-5-0-rc2' into 'master'

Fixes the blown up emoji problem in notes Closes #36448 and #36282 See merge request !13632

Merge branch '36448-smiles-are-broken-in-9-5-0-rc2' into 'master'
f993d7f0 · Clement Ho · Jose Ivan Vargas · eac2f24d · f993d7f0
Commit f993d7f0 authored Aug 17, 2017 by Clement Ho Committed by Jose Ivan Vargas Aug 18, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

typography.scss app/assets/stylesheets/framework/typography.scss +2 -1

No files found.
--- a/app/assets/stylesheets/framework/typography.scss
+++ b/app/assets/stylesheets/framework/typography.scss
@@ -18,7 +18,8 @@
    background-color: $gray-lightest;
  }

-  img.js-lazy-loaded {
+  img.js-lazy-loaded,
+  img.emoji {
    min-width: inherit;
    min-height: inherit;
    background-color: inherit;