diff --git a/js/notebook/src/shared/style/spark.scss b/js/notebook/src/shared/style/spark.scss index 5915823989..7d01d94454 100644 --- a/js/notebook/src/shared/style/spark.scss +++ b/js/notebook/src/shared/style/spark.scss @@ -201,11 +201,18 @@ .bx-spark-connect-error { margin-left: 20px; } + + .bx-spark-configuration { + .bx-properties-add-label { + width: 298px; + text-align: right; + } + } } .bx-spark-save-button { - margin-left: 10px; - width: 80px; + margin-left: 10px; + width: 80px; } .bx-toolbar-spark-widget { diff --git a/kernel/sparkex/src/main/java/com/twosigma/beakerx/widget/SparkConfiguration.java b/kernel/sparkex/src/main/java/com/twosigma/beakerx/widget/SparkConfiguration.java index 2c294831eb..de8b359e1b 100644 --- a/kernel/sparkex/src/main/java/com/twosigma/beakerx/widget/SparkConfiguration.java +++ b/kernel/sparkex/src/main/java/com/twosigma/beakerx/widget/SparkConfiguration.java @@ -35,10 +35,10 @@ public class SparkConfiguration extends VBox { SparkConfiguration(Map advancedSettings, String sparkVersion) { super(new ArrayList<>()); this.add = createAddButton(); - this.header = new HBox(asList(this.add, sparkVersionWidget(sparkVersion))); + this.header = new HBox(asList(sparkVersionWidget(sparkVersion), this.add)); List propertyItems = createPropertyItems(advancedSettings); this.properties = new PropertiesWidget(propertyItems); - VBox configuration = new VBox(asList(this.header, this.properties.getWidget())); + VBox configuration = new VBox(asList(this.properties.getWidget(), this.header)); configuration.setDomClasses(new ArrayList<>(asList("bx-spark-configuration"))); add(configuration); } @@ -47,6 +47,7 @@ private HTML sparkVersionWidget(String version) { HTML html = new HTML(); String ap = String.format("https://spark.apache.org/docs/%s/configuration.html#available-properties", version); html.setValue("Available properties" + ""); + html.setDomClasses(new ArrayList<>(asList("bx-properties-add-label"))); return html; } @@ -59,7 +60,7 @@ private List createPropertyItems(Map advancedSetti private Button createAddButton() { Button add = new Button(); add.setTooltip("Add property"); - add.setDomClasses(new ArrayList<>(asList("bx-button", "icon-add"))); + add.setDomClasses(new ArrayList<>(asList("bx-button", "icon-add", "bx-properties-add-button"))); add.registerOnClick((content, message) -> addProperty()); return add; } @@ -122,7 +123,7 @@ public void setConfiguration(Map advancedSettings) { List propertyItems = createPropertyItems(advancedSettings); this.properties = new PropertiesWidget(propertyItems); this.remove(this.getChildren().get(0)); - add(new VBox(asList(this.header, this.properties.getWidget()))); + add(new VBox(asList(this.properties.getWidget(), this.header))); } public void setDisabledToAll() {