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

Update lumino dependencies #7763

Merged
merged 5 commits into from Jan 15, 2020
Merged

Update lumino dependencies #7763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5d63bc1
bump lumino dependencies
Jan 9, 2020
e99c2d0
integrity
Jan 9, 2020
528ac19
bump commands
Jan 9, 2020
b6b7284
integrity
Jan 9, 2020
3e31b4d
Update p-* selectors, events, and data attributes to lm-*.
afshin Jan 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions dev_mode/package.json
View file
Open in desktop
Expand Up @@ -171,17 +171,17 @@
"@jupyterlab/vdom-extension": "~2.0.0-beta.2",
"@jupyterlab/vega5-extension": "~2.0.0-beta.2",
"@lumino/algorithm": "^1.2.3",
"@lumino/application": "^1.7.7",
"@lumino/commands": "^1.9.1",
"@lumino/application": "^1.8.0",
"@lumino/commands": "^1.9.2",
"@lumino/coreutils": "^1.4.2",
"@lumino/disposable": "^1.3.4",
"@lumino/domutils": "^1.1.7",
"@lumino/dragdrop": "^1.4.4",
"@lumino/dragdrop": "^1.5.0",
"@lumino/messaging": "^1.3.3",
"@lumino/properties": "^1.1.6",
"@lumino/signaling": "^1.3.4",
"@lumino/virtualdom": "^1.4.0",
"@lumino/widgets": "^1.9.7",
"@lumino/widgets": "^1.10.0",
"react": "~16.9.0",
"react-dom": "~16.9.0"
},
Expand Down
4 changes: 2 additions & 2 deletions examples/cell/package.json
View file
Open in desktop
Expand Up @@ -15,8 +15,8 @@
"@jupyterlab/rendermime": "^2.0.0-beta.2",
"@jupyterlab/services": "^5.0.0-beta.2",
"@jupyterlab/theme-light-extension": "^2.0.0-beta.2",
"@lumino/commands": "^1.9.1",
"@lumino/widgets": "^1.9.7",
"@lumino/commands": "^1.9.2",
"@lumino/widgets": "^1.10.0",
"es6-promise": "~4.2.8"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion examples/console/index.css
View file
Open in desktop
Expand Up @@ -18,7 +18,7 @@ body {
bottom: 4px;
}

#main .p-CommandPalette {
#main .lm-CommandPalette {
border-top: var(--jp-border-width) solid var(--jp-border-color2);
min-width: 300px;
}
Expand Down
4 changes: 2 additions & 2 deletions examples/console/package.json
View file
Open in desktop
Expand Up @@ -13,8 +13,8 @@
"@jupyterlab/rendermime": "^2.0.0-beta.2",
"@jupyterlab/services": "^5.0.0-beta.2",
"@jupyterlab/theme-light-extension": "^2.0.0-beta.2",
"@lumino/commands": "^1.9.1",
"@lumino/widgets": "^1.9.7",
"@lumino/commands": "^1.9.2",
"@lumino/widgets": "^1.10.0",
"es6-promise": "~4.2.8"
},
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions examples/filebrowser/package.json
View file
Open in desktop
Expand Up @@ -17,8 +17,8 @@
"@jupyterlab/services": "^5.0.0-beta.2",
"@jupyterlab/theme-light-extension": "^2.0.0-beta.2",
"@lumino/algorithm": "^1.2.3",
"@lumino/commands": "^1.9.1",
"@lumino/widgets": "^1.9.7",
"@lumino/commands": "^1.9.2",
"@lumino/widgets": "^1.10.0",
"es6-promise": "~4.2.8"
},
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions examples/notebook/package.json
View file
Open in desktop
Expand Up @@ -18,8 +18,8 @@
"@jupyterlab/rendermime": "^2.0.0-beta.2",
"@jupyterlab/services": "^5.0.0-beta.2",
"@jupyterlab/theme-light-extension": "^2.0.0-beta.2",
"@lumino/commands": "^1.9.1",
"@lumino/widgets": "^1.9.7",
"@lumino/commands": "^1.9.2",
"@lumino/widgets": "^1.10.0",
"es6-promise": "~4.2.8"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion examples/terminal/package.json
View file
Open in desktop
Expand Up @@ -11,7 +11,7 @@
"@jupyterlab/services": "^5.0.0-beta.2",
"@jupyterlab/terminal": "^2.0.0-beta.2",
"@jupyterlab/theme-light-extension": "^2.0.0-beta.2",
"@lumino/widgets": "^1.9.7",
"@lumino/widgets": "^1.10.0",
"es6-promise": "~4.2.8"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion jupyterlab/tests/mock_packages/mimeextension/package.json
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@
"version": "0.3.0",
"private": true,
"dependencies": {
"@lumino/widgets": "^1.9.7"
"@lumino/widgets": "^1.10.0"
},
"jupyterlab": {
"mimeExtension": true
Expand Down
2 changes: 1 addition & 1 deletion packages/application-extension/package.json
View file
Open in desktop
Expand Up @@ -46,7 +46,7 @@
"@lumino/algorithm": "^1.2.3",
"@lumino/coreutils": "^1.4.2",
"@lumino/disposable": "^1.3.4",
"@lumino/widgets": "^1.9.7",
"@lumino/widgets": "^1.10.0",
"react": "~16.9.0"
},
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions packages/application-extension/src/index.tsx
View file
Open in desktop
Expand Up @@ -475,7 +475,7 @@ const sidebar: JupyterFrontEndPlugin<void> = {
// Add a context menu item to sidebar tabs.
app.contextMenu.addItem({
command: CommandIDs.switchSidebar,
selector: '.jp-SideBar .p-TabBar-tab',
selector: '.jp-SideBar .lm-TabBar-tab',
rank: 500
});
},
Expand Down Expand Up @@ -598,7 +598,7 @@ function addCommands(app: JupyterLab, palette: ICommandPalette | null): void {
// specific selector since we really only want tabs that are
// in the main area, as opposed to those in sidebars, ipywidgets, etc.
const tabSelector =
'#jp-main-dock-panel .p-DockPanel-tabBar.jp-Activity .p-TabBar-tab';
'#jp-main-dock-panel .lm-DockPanel-tabBar.jp-Activity .lm-TabBar-tab';

commands.addCommand(CommandIDs.close, {
label: () => 'Close Tab',
Expand Down
6 changes: 3 additions & 3 deletions packages/application/package.json
View file
Open in desktop
Expand Up @@ -45,15 +45,15 @@
"@jupyterlab/statedb": "^2.0.0-beta.2",
"@jupyterlab/ui-components": "^2.0.0-beta.2",
"@lumino/algorithm": "^1.2.3",
"@lumino/application": "^1.7.7",
"@lumino/commands": "^1.9.1",
"@lumino/application": "^1.8.0",
"@lumino/commands": "^1.9.2",
"@lumino/coreutils": "^1.4.2",
"@lumino/disposable": "^1.3.4",
"@lumino/messaging": "^1.3.3",
"@lumino/polling": "^1.0.3",
"@lumino/properties": "^1.1.6",
"@lumino/signaling": "^1.3.4",
"@lumino/widgets": "^1.9.7"
"@lumino/widgets": "^1.10.0"
},
"devDependencies": {
"rimraf": "~3.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/application/style/base.css
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@
| Distributed under the terms of the Modified BSD License.
|----------------------------------------------------------------------------*/

.p-Widget.p-mod-hidden {
.lm-Widget.lm-mod-hidden {
display: none !important;
}

Expand Down
6 changes: 3 additions & 3 deletions packages/application/style/datagrid.css
View file
Open in desktop
Expand Up @@ -3,17 +3,17 @@
| Distributed under the terms of the Modified BSD License.
|----------------------------------------------------------------------------*/

.p-DataGrid {
.lm-DataGrid {
min-width: 64px;
min-height: 64px;
border: 1px solid #a0a0a0;
}

.p-DataGrid-scrollCorner {
.lm-DataGrid-scrollCorner {
background-color: #f0f0f0;
}

.p-DataGrid-scrollCorner::after {
.lm-DataGrid-scrollCorner::after {
content: '';
position: absolute;
top: 0;
Expand Down
14 changes: 7 additions & 7 deletions packages/application/style/dockpanel.css
View file
Open in desktop
Expand Up @@ -11,25 +11,25 @@
| DockPanel
|----------------------------------------------------------------------------*/

.p-DockPanel-widget {
.lm-DockPanel-widget {
background: var(--jp-layout-color0);
border-left: var(--jp-border-width) solid var(--jp-border-color1);
border-right: var(--jp-border-width) solid var(--jp-border-color1);
border-bottom: var(--jp-border-width) solid var(--jp-border-color1);
}

.p-DockPanel-overlay {
.lm-DockPanel-overlay {
background: rgba(33, 150, 243, 0.1);
border: var(--jp-border-width) dashed var(--jp-brand-color1);
transition-property: top, left, right, bottom;
transition-duration: 150ms;
transition-timing-function: ease;
}

.p-DockPanel-overlay.p-mod-root-top,
.p-DockPanel-overlay.p-mod-root-left,
.p-DockPanel-overlay.p-mod-root-right,
.p-DockPanel-overlay.p-mod-root-bottom,
.p-DockPanel-overlay.p-mod-root-center {
.lm-DockPanel-overlay.lm-mod-root-top,
.lm-DockPanel-overlay.lm-mod-root-left,
.lm-DockPanel-overlay.lm-mod-root-right,
.lm-DockPanel-overlay.lm-mod-root-bottom,
.lm-DockPanel-overlay.lm-mod-root-center {
border-width: 2px;
}
48 changes: 24 additions & 24 deletions packages/application/style/menus.css
View file
Open in desktop
Expand Up @@ -16,56 +16,56 @@
| MenuBar
|----------------------------------------------------------------------------*/

.p-MenuBar {
.lm-MenuBar {
padding-left: 5px;
background: var(--jp-layout-color1);
color: var(--jp-ui-font-color1);
font-size: var(--jp-ui-font-size1);
}

.p-MenuBar-menu {
.lm-MenuBar-menu {
transform: translateY(calc(-2 * var(--jp-border-width)));
}

.p-MenuBar-item {
.lm-MenuBar-item {
padding: 0px 8px;
border-left: var(--jp-border-width) solid transparent;
border-right: var(--jp-border-width) solid transparent;
line-height: var(--jp-private-menubar-height);
}

.p-MenuBar-item.p-mod-active {
.lm-MenuBar-item.lm-mod-active {
background: var(--jp-layout-color2);
}

.p-MenuBar.p-mod-active .p-MenuBar-item.p-mod-active {
.lm-MenuBar.lm-mod-active .lm-MenuBar-item.lm-mod-active {
z-index: 10001;
background: var(--jp-layout-color0);
border-left: var(--jp-border-width) solid var(--jp-border-color1);
border-right: var(--jp-border-width) solid var(--jp-border-color1);
box-shadow: var(--jp-elevation-z6);
}

.p-MenuBar-item.p-mod-disabled {
.lm-MenuBar-item.lm-mod-disabled {
color: var(--jp-ui-font-color3);
}

.p-MenuBar-item.p-type-separator {
.lm-MenuBar-item.lm-type-separator {
margin: 2px;
padding: 0;
border: none;
border-left: var(--jp-border-width) solid var(--jp-border-color2);
}

.p-MenuBar-itemMnemonic {
.lm-MenuBar-itemMnemonic {
text-decoration: underline;
}

/*-----------------------------------------------------------------------------
| Menu
|----------------------------------------------------------------------------*/

.p-Menu {
.lm-Menu {
z-index: 10000;
padding: 4px 0px;
background: var(--jp-layout-color0);
Expand All @@ -75,73 +75,73 @@
box-shadow: var(--jp-elevation-z6);
}

.p-Menu-item {
.lm-Menu-item {
min-height: var(--jp-private-menu-item-height);
max-height: var(--jp-private-menu-item-height);
padding: 0px;
line-height: var(--jp-private-menu-item-height);
}

.p-Menu-item.p-mod-active {
.lm-Menu-item.lm-mod-active {
background: var(--jp-layout-color2);
}

.p-Menu-item.p-mod-disabled {
.lm-Menu-item.lm-mod-disabled {
color: var(--jp-ui-font-color3);
}

.p-Menu-itemIcon {
.lm-Menu-itemIcon {
width: 21px;
padding: 0px 2px 0px 4px;
margin-top: -2px;
}

.p-Menu-itemLabel {
.lm-Menu-itemLabel {
padding: 0px 32px 0px 2px;
}

.p-Menu-itemMnemonic {
.lm-Menu-itemMnemonic {
text-decoration: underline;
}

.p-Menu-itemShortcut {
.lm-Menu-itemShortcut {
padding: 0px;
}

.p-Menu-itemSubmenuIcon {
.lm-Menu-itemSubmenuIcon {
width: 18px;
padding: 0px 4px 0px 0px;
}

.p-Menu-item[data-type='separator'] > div {
.lm-Menu-item[data-type='separator'] > div {
padding: 0;
height: 9px;
}

.p-Menu-item[data-type='separator'] > div::after {
.lm-Menu-item[data-type='separator'] > div::after {
content: '';
display: block;
position: relative;
top: 4px;
border-top: var(--jp-border-width) solid var(--jp-layout-color2);
}

.p-Menu-itemIcon,
.p-Menu-itemSubmenuIcon {
.lm-Menu-itemIcon,
.lm-Menu-itemSubmenuIcon {
background-size: 16px;
background-repeat: no-repeat;
background-position: center;
}

.p-Menu-item.p-mod-toggled > .p-Menu-itemIcon {
.lm-Menu-item.lm-mod-toggled > .lm-Menu-itemIcon {
background-image: var(--jp-icon-check);
}

.p-Menu-item.p-mod-toggled.p-mod-disabled > .p-Menu-itemIcon {
.lm-Menu-item.lm-mod-toggled.lm-mod-disabled > .lm-Menu-itemIcon {
background-image: var(--jp-icon-check-disabled);
}

.p-Menu-item[data-type='submenu'] > .p-Menu-itemSubmenuIcon {
.lm-Menu-item[data-type='submenu'] > .lm-Menu-itemSubmenuIcon {
background-image: var(--jp-icon-caret-right);
background-size: 18px;
background-repeat: no-repeat;
Expand Down