Repository: incubator-zeppelin Updated Branches: refs/heads/master f0d3c3f0e -> 47eb95aee
Fix when result of paragraph contains carriage return ### What is this PR for? When the result in paragraph contains "carriage return" or "line feed", they are getting displayed in single line. The output should be in multiline. ### What type of PR is it? Bug Fix ### Screenshots Before <img width="1439" alt="screen shot 2015-12-16 at 11 26 08 am" src="https://cloud.githubusercontent.com/assets/674497/11833440/a48f1980-a3e8-11e5-908b-8d45f2e2290e.png"> After <img width="1440" alt="screen shot 2015-12-16 at 11 27 22 am" src="https://cloud.githubusercontent.com/assets/674497/11833441/a4929074-a3e8-11e5-974b-45405cb619be.png"> Author: Prabhjyot Singh <[email protected]> Closes #538 from prabhjyotsingh/multilineOutputFix and squashes the following commits: c8f63cb [Prabhjyot Singh] multi line output fix, when paragraph result contains "carriage return" or "line feed". Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/47eb95ae Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/47eb95ae Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/47eb95ae Branch: refs/heads/master Commit: 47eb95aeeefa8925ef5b49487b967f40ad451454 Parents: f0d3c3f Author: Prabhjyot Singh <[email protected]> Authored: Wed Dec 16 11:51:48 2015 +0530 Committer: Damien CORNEAU <[email protected]> Committed: Mon Dec 21 09:49:54 2015 +0900 ---------------------------------------------------------------------- zeppelin-web/src/app/notebook/paragraph/paragraph.css | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/47eb95ae/zeppelin-web/src/app/notebook/paragraph/paragraph.css ---------------------------------------------------------------------- diff --git a/zeppelin-web/src/app/notebook/paragraph/paragraph.css b/zeppelin-web/src/app/notebook/paragraph/paragraph.css index bdf09c2..7c7e133 100644 --- a/zeppelin-web/src/app/notebook/paragraph/paragraph.css +++ b/zeppelin-web/src/app/notebook/paragraph/paragraph.css @@ -32,17 +32,16 @@ */ .paragraph .text { - display: block; - unicode-bidi: embed; display: block !important; - margin: 0 0 0 !important; + font-family: "Monaco","Menlo","Ubuntu Mono","Consolas","source-code-pro",monospace; + font-size: 12px !important; line-height: 1.42857143 !important; + margin: 0 0 5px !important; + padding-top: 2px; + unicode-bidi: embed; + white-space: pre-wrap; word-break: break-all !important; word-wrap: break-word !important; - font-family: 'Monaco', 'Menlo', 'Ubuntu Mono', 'Consolas', 'source-code-pro', monospace; - font-size: 12px !important; - margin-bottom: 5px !important; - padding-top: 2px; } .paragraph table {
