Skip to content

Commit

Permalink
#6412 fix LoD menu breaks in lab (#6467)
Browse files Browse the repository at this point in the history
* #6412 add bootstrap, less, less-loader packages

* #6412 add less-loaser to webpack configuration

* #6412 fix - jupyter lab in contrast to jupyter notebooks does not include bootstrap styles

* #6412 fix after merge

* #6412 swich bootstrap from less to sass
  • Loading branch information
piorek authored and scottdraves committed Dec 7, 2017
1 parent e7a8fb9 commit 8794454
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 6 deletions.
1 change: 1 addition & 0 deletions js/notebook/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
"dependencies": {
"@phosphor/widgets": "^1.5.0",
"big.js": "^3.1.3",
"bootstrap-sass": "^3.3.7",
"d3": "^4.9.1",
"datatables.net": "^1.10.15",
"datatables.net-buttons": "^1.3.1",
Expand Down
7 changes: 4 additions & 3 deletions js/notebook/src/embed.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@
// Export widget models and views, and the npm package version number.
module.exports = {};

require('./../src/shared/style/beakerx.scss');
require('./../src/plot/bko-combinedplot.css');
require('./../src/plot/bko-plot.css');
require('./shared/style/bootstrap.scss');
require('./shared/style/beakerx.scss');
require('./plot/bko-combinedplot.css');
require('./plot/bko-plot.css');

var loadedModules = [
require("./Plot"),
Expand Down
6 changes: 3 additions & 3 deletions js/notebook/src/extension.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ if (window.require) {
}
__webpack_public_path__ = document.querySelector('body').getAttribute('data-base-url') + 'nbextensions/beakerx/';

require('./../src/shared/style/beakerx.scss');
require('./../src/plot/bko-combinedplot.css');
require('./../src/plot/bko-plot.css');
require('./shared/style/beakerx.scss');
require('./plot/bko-combinedplot.css');
require('./plot/bko-plot.css');

define([
'services/config',
Expand Down
19 changes: 19 additions & 0 deletions js/notebook/src/shared/style/bootstrap.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
/*
* 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.
*/

@import '~bootstrap-sass/assets/stylesheets/bootstrap/_variables.scss';
@import '~bootstrap-sass/assets/stylesheets/bootstrap/_mixins.scss';
@import '~bootstrap-sass/assets/stylesheets/bootstrap/_dropdowns.scss';
4 changes: 4 additions & 0 deletions js/notebook/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,10 @@ boom@2.x.x:
dependencies:
hoek "2.x.x"

bootstrap-sass@^3.3.7:
version "3.3.7"
resolved "https://registry.yarnpkg.com/bootstrap-sass/-/bootstrap-sass-3.3.7.tgz#6596c7ab40f6637393323ab0bc80d064fc630498"

brace-expansion@^1.1.7:
version "1.1.8"
resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.8.tgz#c07b211c7c952ec1f8efd51a77ef0d1d3990a292"
Expand Down

0 comments on commit 8794454

Please sign in to comment.