Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

#6412 fix LoD menu breaks in lab #6467

Merged
merged 7 commits into from
Dec 7, 2017
Merged

#6412 fix LoD menu breaks in lab #6467

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e85bdde
#6412 add bootstrap, less, less-loader packages
Dec 6, 2017
9878fc3
#6412 add less-loaser to webpack configuration
Dec 6, 2017
5cdab90
#6412 fix - jupyter lab in contrast to jupyter notebooks does not inc…
Dec 6, 2017
184dea8
Merge branch 'master' of https://github.com/twosigma/beakerx into luk…
Dec 6, 2017
70efc0d
#6412 fix after merge
Dec 6, 2017
84c13df
#6412 swich bootstrap from less to sass
Dec 7, 2017
9b8458c
Merge branch 'master' of https://github.com/twosigma/beakerx into luk…
Dec 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions js/notebook/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
"fork-ts-checker-webpack-plugin": "^0.2.8",
"html-loader": "^0.4.5",
"json-loader": "^0.5.4",
"less": "^2.7.3",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do we really need less? we already have scss, can we just stick with one?

"less-loader": "^4.0.5",
"node-sass": "^4.5.2",
"sass-loader": "^6.0.5",
"source-map-loader": "^0.2.1",
Expand All @@ -44,6 +46,7 @@
"dependencies": {
"@phosphor/widgets": "^1.5.0",
"big.js": "^3.1.3",
"bootstrap": "^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
View file
Open in desktop
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.less');
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
View file
Open in desktop
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
3 changes: 3 additions & 0 deletions js/notebook/src/shared/style/bootstrap.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@import '~bootstrap/less/variables.less';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

all files need banner

@import '~bootstrap/less/mixins.less';
@import '~bootstrap/less/dropdowns.less';
5 changes: 5 additions & 0 deletions js/notebook/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,11 @@ var rules = [
"css-loader",
"sass-loader"
] },
{ test: /\.less$/, use: [
"style-loader",
"css-loader",
"less-loader"
] },
{ test: /\.(jpg|png|gif)$/, loader: "file-loader" },
{ test: /\.woff2(\?v=\d+\.\d+\.\d+)?$/, loader: "url-loader?limit=10000&mimetype=application/font-woff" },
{ test: /\.woff(\?v=\d+\.\d+\.\d+)?$/, loader: "url-loader?limit=10000&mimetype=application/font-woff" },
Expand Down
51 changes: 49 additions & 2 deletions js/notebook/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,10 @@ array-unique@^0.2.1:
version "0.2.1"
resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"

asap@~2.0.3:
version "2.0.6"
resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"

asn1.js@^4.0.0:
version "4.9.1"
resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.9.1.tgz#48ba240b45a9280e94748990ba597d216617fd40"
Expand Down Expand Up @@ -342,6 +346,10 @@ boom@2.x.x:
dependencies:
hoek "2.x.x"

bootstrap@^3.3.7:
version "3.3.7"
resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-3.3.7.tgz#5a389394549f23330875a3b150656574f8a9eb71"

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 Expand Up @@ -596,6 +604,10 @@ clone@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.2.tgz#260b7a99ebb1edfe247538175f783243cb19d149"

clone@^2.1.1:
version "2.1.1"
resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.1.tgz#d217d1e961118e3ac9a4b8bba3285553bf647cdb"

co@^4.6.0:
version "4.6.0"
resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
Expand Down Expand Up @@ -1250,7 +1262,7 @@ enhanced-resolve@^3.0.0, enhanced-resolve@^3.4.0:
object-assign "^4.0.1"
tapable "^0.2.7"

errno@^0.1.3, errno@^0.1.4:
errno@^0.1.1, errno@^0.1.3, errno@^0.1.4:
version "0.1.4"
resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.4.tgz#b896e23a9e5e8ba33871fc996abd3635fc9a1c7d"
dependencies:
Expand Down Expand Up @@ -1786,6 +1798,10 @@ iferr@^0.1.5:
version "0.1.5"
resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"

image-size@~0.5.0:
version "0.5.5"
resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c"

imurmurhash@^0.1.4:
version "0.1.4"
resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
Expand Down Expand Up @@ -2071,6 +2087,27 @@ lcid@^1.0.0:
dependencies:
invert-kv "^1.0.0"

less-loader@^4.0.5:
version "4.0.5"
resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-4.0.5.tgz#ae155a7406cac6acd293d785587fcff0f478c4dd"
dependencies:
clone "^2.1.1"
loader-utils "^1.1.0"
pify "^2.3.0"

less@^2.7.3:
version "2.7.3"
resolved "https://registry.yarnpkg.com/less/-/less-2.7.3.tgz#cc1260f51c900a9ec0d91fb6998139e02507b63b"
optionalDependencies:
errno "^0.1.1"
graceful-fs "^4.1.2"
image-size "~0.5.0"
mime "^1.2.11"
mkdirp "^0.5.0"
promise "^7.1.1"
request "2.81.0"
source-map "^0.5.3"

load-json-file@^1.0.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
Expand Down Expand Up @@ -2273,6 +2310,10 @@ mime@1.3.x:
version "1.3.6"
resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.6.tgz#591d84d3653a6b0b4a3b9df8de5aa8108e72e5e0"

mime@^1.2.11:
version "1.6.0"
resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"

mimic-fn@^1.0.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.1.0.tgz#e667783d92e89dbd342818b5230b9d62a672ad18"
Expand Down Expand Up @@ -2980,6 +3021,12 @@ promise-inflight@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"

promise@^7.1.1:
version "7.3.1"
resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
dependencies:
asap "~2.0.3"

prr@~0.0.0:
version "0.0.0"
resolved "https://registry.yarnpkg.com/prr/-/prr-0.0.0.tgz#1a84b85908325501411853d0081ee3fa86e2926a"
Expand Down Expand Up @@ -3198,7 +3245,7 @@ repeating@^2.0.0:
dependencies:
is-finite "^1.0.0"

request@2, request@^2.79.0, request@^2.81.0:
request@2, request@2.81.0, request@^2.79.0, request@^2.81.0:
version "2.81.0"
resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0"
dependencies:
Expand Down