From 6bfb7914e25eeef6cff8f8cc8037dae3cedc614e Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Mon, 11 Apr 2016 10:51:32 +0100 Subject: [PATCH] Respect linebreaks in templates If a user puts a linebreak in an SMS template then the recipient will see these linebreaks on their phone. So when we show a preview of an SMS template, it should have linebreaks in it. --- app/assets/stylesheets/components/sms-message.scss | 10 ++++++++++ app/templates/components/sms-message.html | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/components/sms-message.scss b/app/assets/stylesheets/components/sms-message.scss index d86d6a48d..b4e00d9ce 100644 --- a/app/assets/stylesheets/components/sms-message.scss +++ b/app/assets/stylesheets/components/sms-message.scss @@ -1,5 +1,6 @@ %sms-message-wrapper, .sms-message-wrapper { + width: 100%; box-sizing: border-box; padding: $gutter-half; @@ -9,6 +10,15 @@ white-space: normal; margin: 0 0 $gutter 0; clear: both; + + p { + margin: 0; + } + + p + p { + margin-top: 20px; + } + } .sms-message-wrapper-with-radio { diff --git a/app/templates/components/sms-message.html b/app/templates/components/sms-message.html index 04d334d97..4d0e1fdd7 100644 --- a/app/templates/components/sms-message.html +++ b/app/templates/components/sms-message.html @@ -16,7 +16,7 @@ {{ from }} {% endif %} - {{ body }} + {{ body|nl2br }} {% if recipient %}