Skip to content

Commit

Permalink
Merge pull request #50 from hbcarlos/dark-theme
Browse files Browse the repository at this point in the history
Dark theme
  • Loading branch information
ildipo authored Jan 6, 2021
2 parents 60c4453 + 711d525 commit 133ac52
Show file tree
Hide file tree
Showing 76 changed files with 1,264 additions and 843 deletions.
73 changes: 0 additions & 73 deletions js/_old/lab/src/tree.ts

This file was deleted.

27 changes: 16 additions & 11 deletions js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,14 @@
"prettier:fix": "prettier --check src/**/*.{ts,js} --write"
},
"devDependencies": {
"@jupyterlab/application": "^1.2.8",
"@jupyterlab/apputils": "^1.2.8",
"@jupyterlab/coreutils": "^3.2.0",
"@jupyterlab/cells": "^1.2.9",
"@jupyterlab/codemirror": "^1.2.8",
"@jupyterlab/docregistry": "^1.2.8",
"@jupyterlab/notebook": "^1.2.9",
"@jupyterlab/application": "^2.2.4",
"@jupyterlab/apputils": "^2.2.4",
"@jupyterlab/coreutils": "^4.2.3",
"@jupyterlab/cells": "^2.2.4",
"@jupyterlab/codemirror": "^2.2.2",
"@jupyterlab/docregistry": "^2.2.2",
"@jupyterlab/notebook": "^2.2.4",
"@jupyterlab/settingregistry": "^2.2.3",
"@types/big.js": "^4.0.5",
"@types/chai": "^4.2.11",
"@types/codemirror": "^0.0.76",
Expand Down Expand Up @@ -67,10 +68,14 @@
"webpack-cli": "^3.3.11"
},
"dependencies": {
"@jupyter-widgets/base": "^1.2.5 || ^2.0.2",
"@jupyter-widgets/controls": "^1.5.3",
"@jupyterlab/coreutils": "^3.2.0",
"@phosphor/widgets": "^1.9.3",
"@jupyter-widgets/base": "^3.0.0",
"@jupyter-widgets/controls": "^2.0.0",
"@lumino/commands": "^1.11.3",
"@lumino/coreutils": "^1.5.3",
"@lumino/disposable" : "^1.4.3",
"@lumino/messaging": "^1.4.3",
"@lumino/signaling": "^1.4.3",
"@lumino/widgets": "^1.14.0",
"big.js": "^5.2.2",
"d3": "^5.16.0",
"flatpickr": "^4.6.3",
Expand Down
2 changes: 1 addition & 1 deletion js/sass/beakerx_widgets_lab.scss
Original file line number Diff line number Diff line change
@@ -1 +1 @@
@use "lab-light";
@use "lab";
19 changes: 0 additions & 19 deletions js/sass/lab-light/index.scss

This file was deleted.

18 changes: 6 additions & 12 deletions js/sass/lab-light/base.scss → js/sass/lab/base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
border-color: var(--jp-widgets-input-focus-border-color);
}

.ui-combobox-input {
.easyform-combobox-input {
box-sizing: border-box;
border: var(--jp-widgets-input-border-width) solid var(--jp-widgets-input-border-color) !important;
background-color: var(--jp-widgets-input-background-color);
Expand All @@ -58,13 +58,13 @@
line-height: var(--jp-widgets-inline-height);
}

.ui-combobox-toggle {
.easyform-combobox-toggle {
border-color: var(--jp-widgets-input-border-color);
background-color: var(--jp-widgets-input-background-color);
}
.ui-combobox-toggle:focus,
.ui-combobox-toggle:active,
.ui-combobox-toggle:hover {
.easyform-combobox-toggle:focus,
.easyform-combobox-toggle:active,
.easyform-combobox-toggle:hover {
border-color: var(--jp-widgets-input-focus-border-color);
background-color: var(--jp-widgets-input-background-color);
}
Expand All @@ -85,7 +85,6 @@
.beaker-easyform-container .datepicker-container.flatpickr .date-picker-button {
border-color: var(--jp-widgets-input-border-color);
background-color: var(--jp-widgets-input-background-color);
height: var(--jp-widgets-inline-height);
}
.beaker-easyform-container .datepicker-container.flatpickr .date-picker-button:focus,
.beaker-easyform-container .datepicker-container.flatpickr .date-picker-button:active,
Expand All @@ -94,11 +93,6 @@
outline: none !important;
}

.beaker-fieldset legend {
border-color: var(--jp-widgets-input-border-color);
background-color: var(--jp-widgets-input-background-color);
}

.hidden {
display: none !important;
}
Expand All @@ -109,4 +103,4 @@

.bx-stats .label {
box-sizing: border-box;
}
}
32 changes: 32 additions & 0 deletions js/sass/lab-light/fonts.scss → js/sass/lab/fonts.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,38 @@
* limitations under the License.
*/

@font-face {
font-family: 'Roboto Mono';
src: url('../fonts/robotomono/robotomono.woff') format('woff'),
url('../fonts/robotomono/robotomono.ttf') format('truetype');

font-style: normal;
font-weight: normal;
}

@font-face {
font-family: 'Roboto Mono';
src: url('../fonts/robotomono/robotomono-bold.woff') format('woff'),
url('../fonts/robotomono/robotomono-bold.ttf') format('truetype');
font-weight: bold;
}

@font-face {
font-family: 'Lato';
src: url('../fonts/lato/Lato-Regular.woff') format('woff'),
url('../fonts/lato/Lato-Regular.ttf') format('truetype');

font-style: normal;
font-weight: normal;
}

@font-face {
font-family: 'Lato';
src: url('../fonts/lato/Lato-Black.woff') format('woff'),
url('../fonts/lato/Lato-Black.ttf') format('truetype');
font-weight: bold;
}

.improveFonts .CodeMirror pre,
.improveFonts .rendered_html pre,
.improveFonts .rendered_html code,
Expand Down
Loading

0 comments on commit 133ac52

Please sign in to comment.