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 using the new Lumino classes #97

Merged
merged 2 commits into from
Mar 15, 2024
Merged

Fix CSS using the new Lumino classes #97

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
fb1eb1e
Fix CSS using the new Lumino classes
martinRenou Mar 14, 2024
3e4096d
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_widgets/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-widgets",
"version": "2.4.1",
"version": "2.4.2",
"description": "BeakerX: Beaker EasyForms, Magics, Plots and Spark Extension for Jupyter Lab 2.x",
"homepage": "http://beakerx.com/",
"keywords": [
Expand Down
89 changes: 70 additions & 19 deletions beakerx_widgets/js/sass/lab/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

@use 'fonts';
@use 'base';

body {
background-color: var(--jp-layout-color3);
}
Expand Down Expand Up @@ -98,20 +98,32 @@ pre {
fill: var(--jp-content-font-color1);
}

#beakerx-tree-widget .p-TabBar-content {
/* <DEPRECATED> */
#beakerx-tree-widget .p-TabBar-content,
/* </DEPRECATED> */
#beakerx-tree-widget .lm-TabBar-content {
border-color: var(--jp-border-color2);
}

#beakerx-tree-widget .p-TabBar-tab.p-mod-current {
/* <DEPRECATED> */
#beakerx-tree-widget .p-TabBar-tab.p-mod-current,
/* </DEPRECATED> */
#beakerx-tree-widget .lm-TabBar-tab.lm-mod-current {
background-color: var(--jp-layout-color1);
border-color: var(--jp-border-color2);
}

#beakerx-tree-widget .p-TabBar-tab {
/* <DEPRECATED> */
#beakerx-tree-widget .p-TabBar-tab,
/* </DEPRECATED> */
#beakerx-tree-widget .lm-TabBar-tab {
background-color: var(--jp-layout-color2);
}

#beakerx-tree-widget .p-TabBar-tab:hover:not(.p-mod-current) {
/* <DEPRECATED> */
#beakerx-tree-widget .p-TabBar-tab:hover:not(.p-mod-current),
/* </DEPRECATED> */
#beakerx-tree-widget .lm-TabBar-tab:hover:not(.lm-mod-current) {
background-color: var(--jp-layout-color0);
}

Expand Down Expand Up @@ -153,14 +165,23 @@ pre {
border-color: var(--jp-border-color2);
}

.p-DataGrid {
/* <DEPRECATED> */
.p-DataGrid,
/* </DEPRECATED> */
.lm-DataGrid {
border-color: transparent;
}

.p-DataGrid-viewport {
/* <DEPRECATED> */
.p-DataGrid-viewport,
/* </DEPRECATED> */
.lm-DataGrid-viewport {
border-color: var(--jp-border-color2);
}
.p-DataGrid-viewport input[type="text"] {
/* <DEPRECATED> */
.p-DataGrid-viewport input[type="text"],
/* </DEPRECATED> */
.lm-DataGrid-viewport input[type="text"] {
background-color: var(--jp-layout-color1);
color: var(--jp-content-font-color1);
border-color: var(--jp-border-color2);
Expand All @@ -169,27 +190,45 @@ pre {
color: var(--jp-content-font-color1);
}

.p-DataGrid-scrollBar {
/* <DEPRECATED> */
.p-DataGrid-scrollBar,
/* </DEPRECATED> */
.lm-DataGrid-scrollBar {
border-color: var(--jp-border-color2) !important;
}
.p-DataGrid-scrollBar .p-ScrollBar-button {
/* <DEPRECATED> */
.p-DataGrid-scrollBar .p-ScrollBar-button,
/* </DEPRECATED> */
.lm-DataGrid-scrollBar .lm-ScrollBar-button {
background-color: var(--jp-layout-color0);
}
.p-DataGrid-scrollBar .p-ScrollBar-track {
/* <DEPRECATED> */
.p-DataGrid-scrollBar .p-ScrollBar-track,
/* </DEPRECATED> */
.lm-DataGrid-scrollBar .lm-ScrollBar-track {
background-color: var(--jp-layout-color2);
}
.p-DataGrid-scrollBar .p-ScrollBar-thumb {
/* <DEPRECATED> */
.p-DataGrid-scrollBar .p-ScrollBar-thumb,
/* </DEPRECATED> */
.lm-DataGrid-scrollBar .lm-ScrollBar-thumb {
background-color: var(--jp-layout-color0);
border-color: var(--jp-border-color2) !important;
}

.p-DataGrid-tooltip {
/* <DEPRECATED> */
.p-DataGrid-tooltip,
/* </DEPRECATED> */
.lm-DataGrid-tooltip {
background-color: var(--jp-layout-color1);
color: var(--jp-content-font-color1);
border-color: var(--jp-border-color1);
}

.p-DataGrid-scrollCorner {
/* <DEPRECATED> */
.p-DataGrid-scrollCorner,
/* </DEPRECATED> */
.lm-DataGrid-scrollCorner {
background-color: var(--jp-layout-color0);
border-color: var(--jp-border-color2);
}
Expand Down Expand Up @@ -221,20 +260,32 @@ pre {
background-color: var(--jp-layout-color0);
}

.bko-table-menu .p-Menu-content .p-Menu-item {
/* <DEPRECATED> */
.bko-table-menu .p-Menu-content .p-Menu-item,
/* </DEPRECATED> */
.bko-table-menu .lm-Menu-content .lm-Menu-item {
color: var(--jp-ui-font-color0);
}

.bko-table-menu .p-Menu-content .p-Menu-item:hover {
/* <DEPRECATED> */
.bko-table-menu .p-Menu-content .p-Menu-item:hover,
/* </DEPRECATED> */
.bko-table-menu .lm-Menu-content .lm-Menu-item:hover {
background-color: var(--jp-layout-color2);
color: var(--jp-ui-font-color0);
}

.p-Menu-item.p-mod-active {
/* <DEPRECATED> */
.p-Menu-item.p-mod-active,
/* </DEPRECATED> */
.lm-Menu-item.lm-mod-active {
background-color: var(--jp-layout-color2);
}

.bko-table-menu .p-Menu-content [data-type="submenu"] > .p-Menu-itemSubmenuIcon:after {
/* <DEPRECATED> */
.bko-table-menu .p-Menu-content [data-type="submenu"] > .p-Menu-itemSubmenuIcon:after,
/* </DEPRECATED> */
.bko-table-menu .lm-Menu-content [data-type="submenu"] > .lm-Menu-itemSubmenuIcon:after {
color: var(--jp-ui-font-color0);
}

Expand Down Expand Up @@ -350,4 +401,4 @@ span.flatpickr-weekday {

.lds-spinner div {
background-color: #2196F3;
}
}
4 changes: 2 additions & 2 deletions beakerx_widgets/js/sass/partials/tree.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,15 +120,15 @@ a {
}

.p-TabBar-tab.p-mod-current,
.lm-TabBar-tab.p-mod-current {
.lm-TabBar-tab.lm-mod-current {
background-color: $bxBgColor1;
border-color: $bxBorderColor1;
border-bottom-color: transparent;
transform: translateY(1px);
}

.p-TabBar-tab:hover:not(.p-mod-current),
.lm-TabBar-tab:hover:not(.p-mod-current) {
.lm-TabBar-tab:hover:not(.lm-mod-current) {
background: $bxBgColor2;
}

Expand Down
Loading