You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by co...@apache.org on 2015/11/17 09:23:10 UTC
incubator-zeppelin git commit: ZEPPELIN-414 - Contain result inside
paragraph
Repository: incubator-zeppelin
Updated Branches:
refs/heads/master bd5cd8567 -> 42d875dfa
ZEPPELIN-414 - Contain result inside paragraph
Taking care of https://issues.apache.org/jira/browse/ZEPPELIN-414
I only applied it on ``HTML`` and ``ANGULAR`` result, because it is the only one that i saw breaking.
Didn't have any problem with other types, although I couldn't test with the response type ``IMG``, any good example to test it?
Here is how it looks now:
Author: Damien CORNEAU <co...@gmail.com>
Closes #436 from corneadoug/fix/ZEPPELIN-414 and squashes the following commits:
1cf6921 [Damien CORNEAU] Add overflow auto to html and angular result container
Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/42d875df
Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/42d875df
Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/42d875df
Branch: refs/heads/master
Commit: 42d875dfa4626e07e47450de6a4ac861d5986ccd
Parents: bd5cd85
Author: Damien CORNEAU <co...@gmail.com>
Authored: Mon Nov 16 11:57:54 2015 +0900
Committer: Damien CORNEAU <co...@gmail.com>
Committed: Tue Nov 17 17:22:57 2015 +0900
----------------------------------------------------------------------
zeppelin-web/src/app/notebook/paragraph/paragraph.css | 6 +++++-
zeppelin-web/src/app/notebook/paragraph/paragraph.html | 2 ++
2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/42d875df/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 79725ef..15be3d3 100644
--- a/zeppelin-web/src/app/notebook/paragraph/paragraph.css
+++ b/zeppelin-web/src/app/notebook/paragraph/paragraph.css
@@ -77,6 +77,10 @@
font-family: 'Roboto', sans-serif;
}
+.paragraph .resultContained {
+ overflow: auto;
+}
+
/*
Paragraph as Iframe CSS
*/
@@ -381,4 +385,4 @@
.lightBold {
font-weight: 500;
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/42d875df/zeppelin-web/src/app/notebook/paragraph/paragraph.html
----------------------------------------------------------------------
diff --git a/zeppelin-web/src/app/notebook/paragraph/paragraph.html b/zeppelin-web/src/app/notebook/paragraph/paragraph.html
index 25ac584..dcec107 100644
--- a/zeppelin-web/src/app/notebook/paragraph/paragraph.html
+++ b/zeppelin-web/src/app/notebook/paragraph/paragraph.html
@@ -372,11 +372,13 @@ limitations under the License.
</div>
<div id="p{{paragraph.id}}_html"
+ class="resultContained"
ng-if="paragraph.result.type == 'HTML'"
ng-Init="loadResultType(paragraph.result)">
</div>
<div id="p{{paragraph.id}}_angular"
+ class="resultContained"
ng-if="paragraph.result.type == 'ANGULAR'"
ng-Init="loadResultType(paragraph.result)">
</div>