From d5ad0d39c48505fd1b01a7dcaac02cc98d6843de Mon Sep 17 00:00:00 2001 From: Mariusz Jurowicz Date: Wed, 30 May 2018 15:43:34 +0200 Subject: [PATCH] #7442 fix Spark connection status in Lab (#7448) * #7442 fix Spark connection status in Lab * #7442 add tooltip to disconnect button --- js/notebook/src/shared/style/spark.scss | 25 +++++++++++++++++++ .../com/twosigma/beakerx/widget/SparkUI.java | 1 + 2 files changed, 26 insertions(+) diff --git a/js/notebook/src/shared/style/spark.scss b/js/notebook/src/shared/style/spark.scss index 7595497d03..1e739a5030 100644 --- a/js/notebook/src/shared/style/spark.scss +++ b/js/notebook/src/shared/style/spark.scss @@ -16,6 +16,31 @@ @import "bxvariables"; +.label { + display: inline; + padding: .2em .6em .3em; + font-size: 75%; + font-weight: bold; + line-height: 1; + color: #fff; + text-align: center; + white-space: nowrap; + vertical-align: baseline; + border-radius: .25em; +} + +.label-info { + background-color: $bxColorInfo; +} + +.label-danger { + background-color: $bxColorError; +} + +.label-default { + background-color: $bxColorDefault; +} + .bx-spark-stagePanel { max-width: 600px; margin: 8px 0; diff --git a/kernel/sparkex/src/main/java/com/twosigma/beakerx/widget/SparkUI.java b/kernel/sparkex/src/main/java/com/twosigma/beakerx/widget/SparkUI.java index 9c3248f26e..8e98c35f22 100644 --- a/kernel/sparkex/src/main/java/com/twosigma/beakerx/widget/SparkUI.java +++ b/kernel/sparkex/src/main/java/com/twosigma/beakerx/widget/SparkUI.java @@ -215,6 +215,7 @@ private Label createAppStatus() { private Button createDisconnectButton() { Button disconnect = new Button(); disconnect.registerOnClick((content, message) -> getSparkSession().sparkContext().stop()); + disconnect.setTooltip("Stop Spark Session"); disconnect.setDomClasses(new ArrayList<>(Arrays.asList("bx-button", "icon-close"))); return disconnect; }