From ba6686ab521155473a4c4e835ecddb1d8ab943da Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Wed, 11 Nov 2015 10:37:07 +0100 Subject: [PATCH] rename chat css from style.scss to chat.scss --- public/assets/chat/{style.css => chat.css} | 6 ++++-- public/assets/chat/{style.scss => chat.scss} | 0 public/assets/chat/gulpfile.js | 4 ++-- public/assets/chat/index.html | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) rename public/assets/chat/{style.css => chat.css} (98%) rename public/assets/chat/{style.scss => chat.scss} (100%) diff --git a/public/assets/chat/style.css b/public/assets/chat/chat.css similarity index 98% rename from public/assets/chat/style.css rename to public/assets/chat/chat.css index 35d87a3f6..a4a579484 100644 --- a/public/assets/chat/style.css +++ b/public/assets/chat/chat.css @@ -170,12 +170,14 @@ margin: 0.5em 0; } .zammad-chat-message-body { - padding: 0.6em 1em; + padding: 0.5em 1em; + line-height: 1.4; border-radius: 1em; background: #f6f8f9; display: inline-block; max-width: 70%; - white-space: pre; + white-space: pre-line; + word-wrap: break-word; box-shadow: 0 2px rgba(255, 255, 255, 0.15) inset, 0 0 0 1px rgba(0, 0, 0, 0.08) inset, 0 1px rgba(0, 0, 0, 0.02); } .zammad-chat-message--customer { diff --git a/public/assets/chat/style.scss b/public/assets/chat/chat.scss similarity index 100% rename from public/assets/chat/style.scss rename to public/assets/chat/chat.scss diff --git a/public/assets/chat/gulpfile.js b/public/assets/chat/gulpfile.js index 256cb794e..60372ab40 100644 --- a/public/assets/chat/gulpfile.js +++ b/public/assets/chat/gulpfile.js @@ -11,7 +11,7 @@ var merge = require('merge-stream'); var plumber = require('gulp-plumber'); gulp.task('css', function(){ - return gulp.src('style.scss') + return gulp.src('chat.scss') .pipe(sass.sync().on('error', gutil.log)) .pipe(autoprefixer({ browsers: ['last 4 versions'], @@ -40,7 +40,7 @@ gulp.task('js', function(){ }); gulp.task('default', function(){ - var cssWatcher = gulp.watch('style.scss', ['css']); + var cssWatcher = gulp.watch('chat.scss', ['css']); cssWatcher.on('change', function(event) { console.log('File ' + event.path + ' was ' + event.type + ', running tasks...'); }); diff --git a/public/assets/chat/index.html b/public/assets/chat/index.html index 7514b78f6..e6456945c 100644 --- a/public/assets/chat/index.html +++ b/public/assets/chat/index.html @@ -1,7 +1,7 @@ Zammad Chat - +