Skip to content

Commit

Permalink
Merge pull request #1582 from timkpaine/webpacktilde
Browse files Browse the repository at this point in the history
remove deprecated webpack-specific tilde prefix convention
  • Loading branch information
texodus authored Oct 16, 2021
2 parents ab5ed59 + c49cf1a commit ea2bd63
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 12 deletions.
6 changes: 3 additions & 3 deletions packages/perspective-jupyterlab/src/less/index.less
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@import "~@finos/perspective-viewer/src/less/fonts.less";
@import "~@finos/perspective-viewer/src/themes/material-dense.less";
@import "@finos/perspective-viewer/src/less/fonts.less";
@import "@finos/perspective-viewer/src/themes/material-dense.less";
@import (reference)
"~@finos/perspective-viewer/src/themes/material-dense.dark.less";
"@finos/perspective-viewer/src/themes/material-dense.dark.less";

div.PSPContainer,
div.PSPContainer-dark {
Expand Down
2 changes: 1 addition & 1 deletion packages/perspective-viewer-d3fc/src/less/chart.less
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*
*/

@import "~@finos/perspective-viewer/src/less/variables.less";
@import "@finos/perspective-viewer/src/less/variables.less";

@sans-serif-fonts: Arial, sans-serif;

Expand Down
2 changes: 1 addition & 1 deletion packages/perspective-workspace/src/less/menu.less
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*
*/

@import (inline) "~@lumino/widgets/style/menu.css";
@import (inline) "@lumino/widgets/style/menu.css";

.p-Menu {
padding: 8px;
Expand Down
2 changes: 1 addition & 1 deletion packages/perspective-workspace/src/less/tabbar.less
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*
*/

@import "~@finos/perspective-viewer/src/less/variables.less";
@import "@finos/perspective-viewer/src/less/variables.less";

.p-TabBar-tabLabel {
background-color: transparent;
Expand Down
2 changes: 1 addition & 1 deletion packages/perspective-workspace/src/less/workspace.less
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*/

:host {
@import "~@lumino/widgets/style/index.css";
@import (less) "@lumino/widgets/style/index.css";
@import "./tabbar.less";
@import "./dockpanel.less";
@import "./widget.less";
Expand Down
6 changes: 3 additions & 3 deletions packages/perspective-workspace/src/theme/material.dark.less
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@import "~@finos/perspective-viewer/src/less/fonts.less";
@import "~@finos/perspective-viewer/src/less/variables.less";
@import (reference) "~@finos/perspective-viewer/src/themes/material-dense.dark.less";
@import "@finos/perspective-viewer/src/less/fonts.less";
@import "@finos/perspective-viewer/src/less/variables.less";
@import (reference) "@finos/perspective-viewer/src/themes/material-dense.dark.less";
@import (reference) "./material.less";

perspective-workspace {
Expand Down
4 changes: 2 additions & 2 deletions packages/perspective-workspace/src/theme/material.less
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import "~@finos/perspective-viewer/src/less/fonts.less";
@import (reference) "~@finos/perspective-viewer/src/themes/material-dense.less";
@import "@finos/perspective-viewer/src/less/fonts.less";
@import (reference) "@finos/perspective-viewer/src/themes/material-dense.less";

perspective-workspace {
.perspective-workspace-material-base();
Expand Down

0 comments on commit ea2bd63

Please sign in to comment.