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

Fix CSS rules to match the new Lumino classes #99

Merged
merged 2 commits into from
Mar 15, 2024
Merged

Fix CSS rules to match the new Lumino classes #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a8abf1
Fix CSS rules to match the new Lumino classes
martinRenou Mar 14, 2024
9f0c9b8
Bump
martinRenou Mar 14, 2024
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
2 changes: 1 addition & 1 deletion beakerx_tabledisplay/beakerx_tabledisplay/_version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
version_info = (2, 4, 0)
version_info = (2, 4, 1)
__version__ = '.'.join(map(str, version_info))
2 changes: 1 addition & 1 deletion beakerx_tabledisplay/js/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@beakerx/beakerx-tabledisplay",
"version": "2.4.0",
"version": "2.4.1",
"description": "BeakerX: Beaker TableDisplay Extension for Jupyter Notebook and Lab",
"homepage": "http://beakerx.com/",
"keywords": [
Expand Down
114 changes: 91 additions & 23 deletions beakerx_tabledisplay/js/sass/table_display.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,10 @@ a.dtmenu {
}
}

.p-Menu.bko-header-menu {
/* <DEPRECATED> */
.p-Menu.bko-header-menu,
/* </DEPRECATED> */
.lm-Menu.bko-header-menu {
overflow: visible;
}

Expand All @@ -327,7 +330,10 @@ a.dtmenu {
box-shadow: 0 6px 10px $shadow;
background-clip: padding-box;

.p-Menu-content {
/* <DEPRECATED> */
.p-Menu-content,
/* </DEPRECATED> */
.lm-Menu-content {
border-collapse: collapse;
display: block;
position: relative;
Expand All @@ -336,7 +342,10 @@ a.dtmenu {
overflow: visible;
width: 100%;

.p-Menu-item {
/* <DEPRECATED> */
.p-Menu-item,
/* </DEPRECATED> */
.lm-Menu-item {
display: block;
font-weight: normal;
line-height: 1.42857143;
Expand All @@ -349,29 +358,44 @@ a.dtmenu {
}
}

.p-Menu-itemLabel {
/* <DEPRECATED> */
.p-Menu-itemLabel,
/* </DEPRECATED> */
.lm-Menu-itemLabel {
padding: 3px;
white-space: nowrap;
display: inline-block;
}

/* <DEPRECATED> */
.p-Menu-itemIcon,
.p-Menu-itemShortcut {
/* </DEPRECATED> */
.lm-Menu-itemIcon,
/* <DEPRECATED> */
.p-Menu-itemShortcut,
/* </DEPRECATED> */
.lm-Menu-itemShortcut {
min-width: 22px;
position: static;
padding: 4px;
display: inline-block;
}

.p-Menu-itemSubmenuIcon {
/* <DEPRECATED> */
.p-Menu-itemSubmenuIcon,
/* </DEPRECATED> */
.lm-Menu-itemSubmenuIcon {
display: inline-block;
position: absolute;
right: 0px;
padding-right: 10px;
margin-top: 3px;
}

[data-type="submenu"] > .p-Menu-itemSubmenuIcon {
/* <DEPRECATED> */
[data-type="submenu"] > .p-Menu-itemSubmenuIcon,
/* </DEPRECATED> */
[data-type="submenu"] > .lm-Menu-itemSubmenuIcon {
background: none;

&:after {
Expand Down Expand Up @@ -417,7 +441,10 @@ a.dtmenu {
}
}

.p-DataGrid {
/* <DEPRECATED> */
.p-DataGrid,
/* </DEPRECATED> */
.lm-DataGrid {
min-width: 64px;
max-width: 100%;
min-height: 330px;
Expand Down Expand Up @@ -489,7 +516,10 @@ a.dtmenu {
}
}

.p-DataGrid-tooltip {
/* <DEPRECATED> */
.p-DataGrid-tooltip,
/* </DEPRECATED> */
.lm-DataGrid-tooltip {
background-color: $buttonBackground;
box-shadow: 0 0 2px $shadow;
border-radius: 3px;
Expand All @@ -508,17 +538,26 @@ a.dtmenu {
}
}

.p-DataGrid-viewport {
/* <DEPRECATED> */
.p-DataGrid-viewport,
/* </DEPRECATED> */
.lm-DataGrid-viewport {
border: $gridBorder;
}

.p-DataGrid-scrollCorner {
/* <DEPRECATED> */
.p-DataGrid-scrollCorner,
/* </DEPRECATED> */
.lm-DataGrid-scrollCorner {
background-color: $buttonDetail;
border-right: $gridBorder;
border-bottom: $gridBorder;
}

.p-DataGrid-scrollCorner::after {
/* <DEPRECATED> */
.p-DataGrid-scrollCorner::after,
/* </DEPRECATED> */
.lm-DataGrid-scrollCorner::after {
content: '';
position: absolute;
top: 0;
Expand All @@ -528,8 +567,14 @@ a.dtmenu {
background-color: $buttonDetail;
}

.p-ScrollBar {
.p-ScrollBar-button {
/* <DEPRECATED> */
.p-ScrollBar,
/* </DEPRECATED> */
.lm-ScrollBar {
/* <DEPRECATED> */
.p-ScrollBar-button,
/* </DEPRECATED> */
.lm-ScrollBar-button {
color: $buttonHover;
font: normal normal normal 14px/1 'Font Awesome 5 Free', FontAwesome;
font-weight: 900;
Expand All @@ -544,14 +589,20 @@ a.dtmenu {
border-left: $gridBorder;
border-right: $gridBorder;

.p-ScrollBar-thumb {
/* <DEPRECATED> */
.p-ScrollBar-thumb,
/* </DEPRECATED> */
.lm-ScrollBar-thumb {
height: 100%;
min-width: 15px;
border-left: $gridBorder;
border-right: $gridBorder;
}

.p-ScrollBar-button {
/* <DEPRECATED> */
.p-ScrollBar-button,
/* </DEPRECATED> */
.lm-ScrollBar-button {
&[data-action='increment'] {
&:before {
content: "\f0da";
Expand All @@ -574,15 +625,20 @@ a.dtmenu {
border-top: $gridBorder;
border-bottom: $gridBorder;

.p-ScrollBar-thumb {
/* <DEPRECATED> */
.p-ScrollBar-thumb,
/* </DEPRECATED> */
.lm-ScrollBar-thumb {
width: 100%;
min-height: 15px;
border-top: $gridBorder;
border-bottom: $gridBorder;
}


.p-ScrollBar-button {
/* <DEPRECATED> */
.p-ScrollBar-button,
/* </DEPRECATED> */
.lm-ScrollBar-button {
&[data-action='increment'] {
&:before {
content: "\f0d7";
Expand All @@ -598,7 +654,10 @@ a.dtmenu {
}
}

.p-ScrollBar-button {
/* <DEPRECATED> */
.p-ScrollBar-button,
/* </DEPRECATED> */
.lm-ScrollBar-button {
background-color: $buttonBackground;
background-position: center center;
min-height: 15px;
Expand All @@ -617,19 +676,28 @@ a.dtmenu {
}
}

.p-ScrollBar-track {
/* <DEPRECATED> */
.p-ScrollBar-track,
/* </DEPRECATED> */
.lm-ScrollBar-track {
background: $buttonBackground;
}

.p-ScrollBar-thumb {
/* <DEPRECATED> */
.p-ScrollBar-thumb,
/* </DEPRECATED> */
.lm-ScrollBar-thumb {
background: $buttonDetail;

&:hover {
background: $buttonDetail;
cursor: pointer;
}

&.p-mod-active {
/* <DEPRECATED> */
&.p-mod-active,
/* </DEPRECATED> */
&.lm-mod-active {
background: $buttonDetail;
cursor: pointer;
}
Expand Down
2 changes: 1 addition & 1 deletion beakerx_tabledisplay/js/src/dataGrid/cell/CellTooltip.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export class CellTooltip {
this.node = document.createElement('div');
this.node.style.position = 'absolute';
this.node.style.visibility = 'visible';
this.node.classList.add('p-DataGrid-tooltip');
this.node.classList.add('lm-DataGrid-tooltip');

if (text) {
this.node.innerText = text;
Expand Down
Loading