From 1e4a8c814383562a2ea21c182a8d7052c5f61b07 Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Sat, 25 Jul 2015 16:02:35 +0100 Subject: [PATCH] Added emoji parsing support --- composer.json | 1 + config/app.php | 1 + resources/assets/sass/_status-page.scss | 11 +++++++++++ 3 files changed, 13 insertions(+) diff --git a/composer.json b/composer.json index 28d3f3d4..c169c8da 100644 --- a/composer.json +++ b/composer.json @@ -21,6 +21,7 @@ "require": { "php": "^5.5.9", "laravel/framework": "~5.1.6", + "alt-three/emoji": "^1.0", "alt-three/segment": "^1.0", "barryvdh/laravel-cors": "^0.5", "doctrine/dbal": "^2.5", diff --git a/config/app.php b/config/app.php index a4869533..1cf52fc2 100644 --- a/config/app.php +++ b/config/app.php @@ -149,6 +149,7 @@ return [ /* * Packages Service Providers... */ + 'AltThree\Emoji\EmojiServiceProvider', 'AltThree\Segment\SegmentServiceProvider', 'Barryvdh\Cors\CorsServiceProvider', 'Fideloper\Proxy\TrustedProxyServiceProvider', diff --git a/resources/assets/sass/_status-page.scss b/resources/assets/sass/_status-page.scss index fae2bf9a..92af695d 100755 --- a/resources/assets/sass/_status-page.scss +++ b/resources/assets/sass/_status-page.scss @@ -231,6 +231,17 @@ body.status-page { font-size: 1.1em; } } + + img { + box-sizing: border-box; + + &.emoji { + height: 20px; + width: 20px; + vertical-align: middle; + max-width: none; + } + } } } }