Skip to content

Commit

Permalink
#7204 WIP
Browse files Browse the repository at this point in the history
  • Loading branch information
piorek committed May 17, 2018
1 parent f621ccb commit 911f3de
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 10 deletions.
2 changes: 1 addition & 1 deletion js/notebook/src/shared/style/bootstrap.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
*/

$icon-font-path: "~bootstrap-sass/assets/fonts/bootstrap/";
@import '~bootstrap-sass/assets/stylesheets/bootstrap';
//@import '~bootstrap-sass/assets/stylesheets/bootstrap';
32 changes: 32 additions & 0 deletions js/notebook/src/shared/style/tree.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
/*
* Copyright 2017 TWO SIGMA OPEN SOURCE, LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

#beakerx-tree {

#default_options {

.label {

}
.input {

}
.addon {

}
}

}
12 changes: 3 additions & 9 deletions js/notebook/src/tree/Widgets/JVMOptions/DefaultOptionsWidget.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,9 @@ export default class DefaultOptionsWidget extends Widget implements DefaultOptio

public readonly HTML_ELEMENT_TEMPLATE = `
<div id="default_options">
<div class="form-inline form-group">
<label class="control-label" for="heap_GB">Heap Size</label>
<div class="input-group">
<input id="heap_GB" name="heap_size_prop" value="" class="form-control mb-2 mr-sm-2 mb-sm-0">
<div class="input-group-addon">GB</div>
</div>
</div>
<label class="control-label" for="heap_GB">Heap Size</label>
<input id="heap_GB" name="heap_size_prop" value="">
<span>GB</span>
</div>
`;

Expand Down

0 comments on commit 911f3de

Please sign in to comment.