You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by mo...@apache.org on 2015/12/26 06:03:16 UTC
incubator-zeppelin git commit: Keep paragraph height unchanged when
progress bar is shown
Repository: incubator-zeppelin
Updated Branches:
refs/heads/master f78d3096e -> c043ff88e
Keep paragraph height unchanged when progress bar is shown
### What is this PR for?
Paragraph height is changing depends on progress bar.
This PR make paragraph height unchanged whether progress bar is shown or not.
### What type of PR is it?
Bug Fix
### How should this be tested?
Run paragraph and see progress bar change it's height.
### Screenshots (if appropriate)
before
after
### Questions:
* Does the licenses files need update? no
* Is there breaking changes for older versions? no
* Does this needs documentation? no
Author: Lee moon soo <mo...@apache.org>
Closes #568 from Leemoonsoo/fixed_height and squashes the following commits:
76a7bf1 [Lee moon soo] Let progress bar does not change paragraph height
Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/c043ff88
Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/c043ff88
Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/c043ff88
Branch: refs/heads/master
Commit: c043ff88ecc785c6025d0158f70cf6014f1216e8
Parents: f78d309
Author: Lee moon soo <mo...@apache.org>
Authored: Thu Dec 24 14:49:16 2015 +0900
Committer: Lee moon soo <mo...@apache.org>
Committed: Fri Dec 25 21:04:45 2015 -0800
----------------------------------------------------------------------
.../src/app/notebook/paragraph/paragraph-progressBar.html | 4 ++--
zeppelin-web/src/app/notebook/paragraph/paragraph.css | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/c043ff88/zeppelin-web/src/app/notebook/paragraph/paragraph-progressBar.html
----------------------------------------------------------------------
diff --git a/zeppelin-web/src/app/notebook/paragraph/paragraph-progressBar.html b/zeppelin-web/src/app/notebook/paragraph/paragraph-progressBar.html
index 010cea7..2d1575c 100644
--- a/zeppelin-web/src/app/notebook/paragraph/paragraph-progressBar.html
+++ b/zeppelin-web/src/app/notebook/paragraph/paragraph-progressBar.html
@@ -12,8 +12,8 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-<div id="{{paragraph.id}}_runControl" class="runControl" ng-show="paragraph.status=='RUNNING'">
- <div id="{{paragraph.id}}_progress" class="progress">
+<div id="{{paragraph.id}}_runControl" class="runControl">
+ <div id="{{paragraph.id}}_progress" class="progress" ng-show="paragraph.status=='RUNNING'">
<div ng-if="getProgress()>0 && getProgress()<100 && paragraph.status=='RUNNING'"
class="progress-bar" role="progressbar" style="width:{{getProgress()}}%;"></div>
<div ng-if="(getProgress()<=0 || getProgress()>=100) && (paragraph.status=='RUNNING' )"
http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/c043ff88/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 7c7e133..d0007de 100644
--- a/zeppelin-web/src/app/notebook/paragraph/paragraph.css
+++ b/zeppelin-web/src/app/notebook/paragraph/paragraph.css
@@ -140,7 +140,7 @@
font-size: 1px;
color: #AAAAAA;
height:4px;
- margin: 0px 0px 3px 0px;
+ margin: 0px 0px 0px 0px;
}
.paragraph .runControl .progress {
@@ -297,6 +297,7 @@
*/
.tableDisplay {
+ margin-top: 2px;
}
.tableDisplay div {