diff --git a/.stylelintrc b/.stylelintrc index 294c5664c1..f4ed341223 100644 --- a/.stylelintrc +++ b/.stylelintrc @@ -12,7 +12,7 @@ "color-function-notation": "legacy", "declaration-empty-line-before": null, "no-invalid-position-at-import-rule": [true, { - "ignoreAtRules": ["use", "forward"] + "ignoreAtRules": ["use"] }], "scss/media-feature-value-dollar-variable": null, "selector-max-universal": 1 diff --git a/packages/core/src/_dark-theme.scss b/packages/core/src/_dark-theme.scss index a68c7cb973..11d15b3149 100644 --- a/packages/core/src/_dark-theme.scss +++ b/packages/core/src/_dark-theme.scss @@ -1,6 +1,5 @@ // Copyright 2021 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "common/variables" as *; .#{$ns}-dark { // this tells the browser to use a dark theme UI, which is most useful for enabling diff --git a/packages/core/src/_reset.scss b/packages/core/src/_reset.scss index 196e84dfe1..b5cb3c51b6 100644 --- a/packages/core/src/_reset.scss +++ b/packages/core/src/_reset.scss @@ -1,9 +1,8 @@ // Copyright 2015 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "common/variables" as *; -@use "common/color-aliases" as *; -@use "common/mixins" as *; +@import "common/variables"; +@import "common/mixins"; // Apply a natural box layout model to all elements, but allow components to change as necessary html { diff --git a/packages/core/src/_typography.scss b/packages/core/src/_typography.scss index 7030553668..4557b1d2c2 100644 --- a/packages/core/src/_typography.scss +++ b/packages/core/src/_typography.scss @@ -1,14 +1,11 @@ // Copyright 2015 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "@blueprintjs/colors/lib/scss/colors" as *; -@use "common/variables" as *; -@use "common/variables-extended" as *; -@use "common/color-aliases" as *; -@use "common/mixins" as *; -@use "common/typography-colors" as *; -@use "components/icon/icon" as *; -@use "components/html-table/html-table" as *; +@import "common/variables"; +@import "common/variables-extended"; +@import "common/mixins"; +@import "common/typography-colors"; +@import "components/icon/icon"; @include pt-typography-colors(); /* diff --git a/packages/core/src/accessibility/_focus-states.scss b/packages/core/src/accessibility/_focus-states.scss index 9092f0f26d..e9383ab3a6 100644 --- a/packages/core/src/accessibility/_focus-states.scss +++ b/packages/core/src/accessibility/_focus-states.scss @@ -1,7 +1,5 @@ // Copyright 2016 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "../common/variables" as *; -@use "../common/mixins" as *; :focus { @include focus-outline(); diff --git a/packages/core/src/blueprint.scss b/packages/core/src/blueprint.scss index 8affcd0006..497440e8ff 100644 --- a/packages/core/src/blueprint.scss +++ b/packages/core/src/blueprint.scss @@ -6,8 +6,13 @@ Licensed under the Apache License, Version 2.0. */ // Import files in the same order that they are documented in the docs -@forward "reset"; -@forward "typography"; -@forward "accessibility/focus-states"; -@forward "dark-theme"; -@forward "components/index"; +@import "@blueprintjs/colors/lib/scss/colors"; +@import "common/variables"; +@import "common/variables-extended"; +@import "common/mixins"; + +@import "reset"; +@import "typography"; +@import "accessibility/focus-states"; +@import "dark-theme"; +@import "components/index"; diff --git a/packages/core/src/common/_color-aliases.scss b/packages/core/src/common/_color-aliases.scss index 05ba6de177..427cadcc33 100644 --- a/packages/core/src/common/_color-aliases.scss +++ b/packages/core/src/common/_color-aliases.scss @@ -9,7 +9,6 @@ // - A limited subset of Sass syntax is supported. All syntax inluded here must be able to get parsed by the // `generate-css-variables` script in @blueprintjs/node-build-scripts. For example, "sass:math" is unsupported. // ---------------------------------------------------------------------------- -@use "@blueprintjs/colors/lib/scss/colors" as *; $pt-intent-primary: $blue3 !default; $pt-intent-success: $green3 !default; diff --git a/packages/core/src/common/_flex.scss b/packages/core/src/common/_flex.scss index 5ca8fa57fc..46bf5ace1f 100644 --- a/packages/core/src/common/_flex.scss +++ b/packages/core/src/common/_flex.scss @@ -1,6 +1,5 @@ // Copyright 2018 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "variables" as *; // this element becomes a flex container in the given direction. // supply `$margin` to put space between each child. diff --git a/packages/core/src/common/_mixins.scss b/packages/core/src/common/_mixins.scss index d7323eff49..e12f5415a5 100644 --- a/packages/core/src/common/_mixins.scss +++ b/packages/core/src/common/_mixins.scss @@ -2,10 +2,8 @@ // Licensed under the Apache License, Version 2.0. @use "sass:math"; -@use "@blueprintjs/colors/lib/scss/colors" as *; -@use "color-aliases" as *; -@use "variables" as *; -@use "flex" as *; +@import "@blueprintjs/colors/lib/scss/colors"; +@import "flex"; $pt-intent-colors: ( "primary": $pt-intent-primary, diff --git a/packages/core/src/common/_react-transition.scss b/packages/core/src/common/_react-transition.scss index 0b0415db30..67bd5b7dfe 100644 --- a/packages/core/src/common/_react-transition.scss +++ b/packages/core/src/common/_react-transition.scss @@ -1,8 +1,6 @@ // Copyright 2016 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "variables" as *; - /* A mixin to generate the classes for a React CSSTransition which animates any number of CSS properties at once. diff --git a/packages/core/src/common/_typography-colors.scss b/packages/core/src/common/_typography-colors.scss index 455476c1d9..ab584742f3 100644 --- a/packages/core/src/common/_typography-colors.scss +++ b/packages/core/src/common/_typography-colors.scss @@ -1,11 +1,9 @@ // Copyright 2022 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "@blueprintjs/colors/lib/scss/colors" as *; -@use "variables" as *; -@use "variables-extended" as *; -@use "color-aliases" as *; -@use "mixins" as *; +@import "variables"; +@import "variables-extended"; +@import "mixins"; @mixin pt-typography-colors() { // N.B. we can't declare any global colors here because this mixin is @included at diff --git a/packages/core/src/common/_variables-extended.scss b/packages/core/src/common/_variables-extended.scss index 6e0d962a2c..6a49cd2a19 100644 --- a/packages/core/src/common/_variables-extended.scss +++ b/packages/core/src/common/_variables-extended.scss @@ -1,7 +1,7 @@ // Copyright 2022 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "variables" as *; +@import "variables"; // ---------------------------------------------------------------------------- // This file contains additional common variables which we do not want to export in public API via variables.scss, diff --git a/packages/core/src/common/_variables.scss b/packages/core/src/common/_variables.scss index 51998a0ff3..b7472c94a1 100644 --- a/packages/core/src/common/_variables.scss +++ b/packages/core/src/common/_variables.scss @@ -1,8 +1,8 @@ // Copyright 2015 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "@blueprintjs/colors/lib/scss/colors" as *; -@use "color-aliases" as *; +@import "color-aliases"; +@import "mixins"; // ---------------------------------------------------------------------------- // This file is part of the public Sass API of @blueprintjs/core. diff --git a/packages/core/src/components/_index.scss b/packages/core/src/components/_index.scss index 406860ca7d..368d842ef9 100644 --- a/packages/core/src/components/_index.scss +++ b/packages/core/src/components/_index.scss @@ -1,49 +1,49 @@ // Copyright 2015 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@forward "alert/alert"; -@forward "breadcrumbs/breadcrumbs"; -@forward "button/button"; -@forward "button/button-group"; -@forward "callout/callout"; -@forward "card/card"; -@forward "card-list/card-list"; -@forward "collapse/collapse"; -@forward "context-menu/context-menu"; -@forward "control-card/control-card"; -@forward "divider/divider"; -@forward "dialog/dialog"; -@forward "dialog/dialog-body"; -@forward "dialog/dialog-footer"; -@forward "dialog/multistep-dialog"; -@forward "drawer/drawer"; -@forward "editable-text/editable-text"; -@forward "entity-title/entity-title"; -@forward "forms/index"; -@forward "html-select/html-select"; -@forward "html-table/html-table"; -@forward "hotkeys/hotkeys"; -@forward "icon/icon"; -@forward "menu/menu"; -@forward "navbar/navbar"; -@forward "non-ideal-state/non-ideal-state"; -@forward "overflow-list/overflow-list"; -@forward "overlay/overlay"; -@forward "panel-stack/panel-stack"; -@forward "panel-stack2/panel-stack2"; -@forward "popover/popover"; -@forward "portal/portal"; -@forward "progress-bar/progress-bar"; -@forward "section/section"; -@forward "segmented-control/segmented-control"; -@forward "skeleton/skeleton"; -@forward "slider/slider"; -@forward "spinner/spinner"; -@forward "tabs/tabs"; -@forward "tag/tag"; -@forward "tag/compound-tag"; -@forward "tag-input/tag-input"; -@forward "tag-input/resizable-input"; -@forward "toast/toast"; -@forward "tooltip/tooltip"; -@forward "tree/tree"; +@import "alert/alert"; +@import "breadcrumbs/breadcrumbs"; +@import "button/button"; +@import "button/button-group"; +@import "callout/callout"; +@import "card/card"; +@import "card-list/card-list"; +@import "collapse/collapse"; +@import "context-menu/context-menu"; +@import "control-card/control-card"; +@import "divider/divider"; +@import "dialog/dialog"; +@import "dialog/dialog-body"; +@import "dialog/dialog-footer"; +@import "dialog/multistep-dialog"; +@import "drawer/drawer"; +@import "editable-text/editable-text"; +@import "entity-title/entity-title"; +@import "forms/index"; +@import "html-select/html-select"; +@import "html-table/html-table"; +@import "hotkeys/hotkeys"; +@import "icon/icon"; +@import "menu/menu"; +@import "navbar/navbar"; +@import "non-ideal-state/non-ideal-state"; +@import "overflow-list/overflow-list"; +@import "overlay/overlay"; +@import "panel-stack/panel-stack"; +@import "panel-stack2/panel-stack2"; +@import "popover/popover"; +@import "portal/portal"; +@import "progress-bar/progress-bar"; +@import "section/section"; +@import "segmented-control/segmented-control"; +@import "skeleton/skeleton"; +@import "slider/slider"; +@import "spinner/spinner"; +@import "tabs/tabs"; +@import "tag/tag"; +@import "tag/compound-tag"; +@import "tag-input/tag-input"; +@import "tag-input/resizable-input"; +@import "toast/toast"; +@import "tooltip/tooltip"; +@import "tree/tree"; diff --git a/packages/core/src/components/alert/_alert.scss b/packages/core/src/components/alert/_alert.scss index f29152365b..18a294d7da 100644 --- a/packages/core/src/components/alert/_alert.scss +++ b/packages/core/src/components/alert/_alert.scss @@ -1,7 +1,7 @@ // Copyright 2016 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "../../common/variables" as *; +@import "../../common/variables"; .#{$ns}-alert { max-width: $pt-grid-size * 40; diff --git a/packages/core/src/components/breadcrumbs/_breadcrumbs.scss b/packages/core/src/components/breadcrumbs/_breadcrumbs.scss index 0ece8e2ac9..30c0fa1403 100644 --- a/packages/core/src/components/breadcrumbs/_breadcrumbs.scss +++ b/packages/core/src/components/breadcrumbs/_breadcrumbs.scss @@ -1,10 +1,8 @@ // Copyright 2016 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "@blueprintjs/colors/lib/scss/colors" as *; -@use "@blueprintjs/icons/lib/scss/variables" as *; -@use "../../common/variables" as *; -@use "../../common/color-aliases" as *; +@import "@blueprintjs/icons/lib/scss/variables"; +@import "../../common/variables"; /* Breadcrumbs diff --git a/packages/core/src/components/button/_button-group.scss b/packages/core/src/components/button/_button-group.scss index 555767f7bb..dd8b44b803 100644 --- a/packages/core/src/components/button/_button-group.scss +++ b/packages/core/src/components/button/_button-group.scss @@ -1,9 +1,9 @@ // Copyright 2015 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "../../common/variables" as *; -@use "../forms/common" as *; -@use "./common" as *; +@import "../../common/variables"; +@import "../forms/common"; +@import "./common"; /* Button groups diff --git a/packages/core/src/components/button/_button.scss b/packages/core/src/components/button/_button.scss index 00feee80b8..7633946f44 100644 --- a/packages/core/src/components/button/_button.scss +++ b/packages/core/src/components/button/_button.scss @@ -1,13 +1,9 @@ // Copyright 2015 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "@blueprintjs/colors/lib/scss/colors" as *; -@use "../../common/color-aliases" as *; -@use "../../common/variables" as *; -@use "../../common/variables-extended" as *; -@use "./common" as *; -@use "../icon/icon-mixins" as *; -@use "../progress-bar/common" as *; +@import "../../common/variables"; +@import "../../common/variables-extended"; +@import "./common"; /* Button diff --git a/packages/core/src/components/button/_common.scss b/packages/core/src/components/button/_common.scss index aaf69ec35c..669625fe3e 100644 --- a/packages/core/src/components/button/_common.scss +++ b/packages/core/src/components/button/_common.scss @@ -1,13 +1,10 @@ // Copyright 2015 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "@blueprintjs/colors/lib/scss/colors" as *; -@use "../../common/color-aliases" as *; -@use "../../common/flex" as *; -@use "../../common/mixins" as *; -@use "../../common/variables" as *; -@use "../../common/variables-extended" as *; -@use "../progress-bar/common" as *; +@import "../../common/mixins"; +@import "../../common/variables"; +@import "../../common/variables-extended"; +@import "../progress-bar/common"; $button-border-width: 1px !default; $button-padding: ($pt-grid-size * 0.5) $pt-grid-size !default; diff --git a/packages/core/src/components/callout/_callout.scss b/packages/core/src/components/callout/_callout.scss index d6b955f95c..d1c21bc50e 100644 --- a/packages/core/src/components/callout/_callout.scss +++ b/packages/core/src/components/callout/_callout.scss @@ -1,12 +1,7 @@ // Copyright 2015 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "@blueprintjs/colors/lib/scss/colors" as *; -@use "../../common/color-aliases" as *; -@use "../../common/variables" as *; -@use "../../common/variables-extended" as *; -@use "../../common/mixins" as *; -@use "../icon/icon-mixins" as *; +@import "../../common/variables-extended"; /* Callout diff --git a/packages/core/src/components/card-list/card-list.scss b/packages/core/src/components/card-list/card-list.scss index 5bb232b502..eb6cf5dad8 100644 --- a/packages/core/src/components/card-list/card-list.scss +++ b/packages/core/src/components/card-list/card-list.scss @@ -1,10 +1,7 @@ // Copyright 2023 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "@blueprintjs/colors/lib/scss/colors" as *; -@use "../../common/color-aliases" as *; -@use "../../common/variables" as *; -@use "../card/card-variables" as *; +@import "../card/card-variables"; .#{$ns}-card-list { overflow: auto; diff --git a/packages/core/src/components/card/_card-variables.scss b/packages/core/src/components/card/_card-variables.scss index 5693188763..a4653e32d3 100644 --- a/packages/core/src/components/card/_card-variables.scss +++ b/packages/core/src/components/card/_card-variables.scss @@ -1,10 +1,7 @@ // Copyright 2023 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "@blueprintjs/colors/lib/scss/colors" as *; -@use "../../common/color-aliases" as *; -@use "../../common/variables" as *; -@use "../../common/variables-extended" as *; +@import "../../common/variables-extended"; $card-padding: $pt-grid-size * 2 !default; $card-padding-compact: $pt-grid-size * 1.5 !default; diff --git a/packages/core/src/components/card/_card.scss b/packages/core/src/components/card/_card.scss index efd43de8da..2653b8962b 100644 --- a/packages/core/src/components/card/_card.scss +++ b/packages/core/src/components/card/_card.scss @@ -1,10 +1,7 @@ // Copyright 2015 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "@blueprintjs/colors/lib/scss/colors" as *; -@use "../../common/variables" as *; -@use "../../common/variables-extended" as *; -@use "./card-variables" as *; +@import "./card-variables"; /* Cards diff --git a/packages/core/src/components/collapse/_collapse.scss b/packages/core/src/components/collapse/_collapse.scss index 9e7c1eda57..39726d7a3f 100644 --- a/packages/core/src/components/collapse/_collapse.scss +++ b/packages/core/src/components/collapse/_collapse.scss @@ -1,7 +1,7 @@ // Copyright 2016 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "../../common/variables" as *; +@import "../../common/variables"; $collapse-transition: ($pt-transition-duration * 2) $pt-transition-ease !default; diff --git a/packages/core/src/components/context-menu/_context-menu.scss b/packages/core/src/components/context-menu/_context-menu.scss index 7721e83040..265c4fca3a 100644 --- a/packages/core/src/components/context-menu/_context-menu.scss +++ b/packages/core/src/components/context-menu/_context-menu.scss @@ -1,7 +1,7 @@ // Copyright 2021 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "../../common/variables" as *; +@import "../../common/variables"; .#{$ns}-context-menu-virtual-target { position: fixed; diff --git a/packages/core/src/components/control-card/_control-card.scss b/packages/core/src/components/control-card/_control-card.scss index fad2094b5e..2b74c42bdd 100644 --- a/packages/core/src/components/control-card/_control-card.scss +++ b/packages/core/src/components/control-card/_control-card.scss @@ -1,8 +1,7 @@ // Copyright 2023 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "../../common/variables" as *; -@use "../card/card-variables" as *; +@import "../card/card-variables"; // use an extra selector to increase specificity .#{$ns}-card.#{$ns}-control-card { diff --git a/packages/core/src/components/dialog/_dialog-body.scss b/packages/core/src/components/dialog/_dialog-body.scss index 1cce21a45d..8fff971000 100644 --- a/packages/core/src/components/dialog/_dialog-body.scss +++ b/packages/core/src/components/dialog/_dialog-body.scss @@ -1,9 +1,6 @@ // Copyright 2023 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "../../common/variables" as *; -@use "dialog" as *; - .#{$ns}-dialog-body { flex: 1 1 auto; // We'd like to use padding instead of margin here to be consistent with the -dialog-body-scroll-container class, diff --git a/packages/core/src/components/dialog/_dialog-footer.scss b/packages/core/src/components/dialog/_dialog-footer.scss index e0787cbcbc..add233f15d 100644 --- a/packages/core/src/components/dialog/_dialog-footer.scss +++ b/packages/core/src/components/dialog/_dialog-footer.scss @@ -1,11 +1,6 @@ // Copyright 2023 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "@blueprintjs/colors/lib/scss/colors" as *; -@use "../../common/color-aliases" as *; -@use "../../common/variables" as *; -@use "dialog" as *; - .#{$ns}-dialog-footer { flex: 0 0 auto; // We'd like to use padding instead of margin here to be consistent with the -dialog-footer-fixed class, diff --git a/packages/core/src/components/dialog/_dialog.scss b/packages/core/src/components/dialog/_dialog.scss index e97247d4a5..88431ef8c7 100644 --- a/packages/core/src/components/dialog/_dialog.scss +++ b/packages/core/src/components/dialog/_dialog.scss @@ -2,12 +2,10 @@ // Licensed under the Apache License, Version 2.0. @use "sass:math"; -@use "@blueprintjs/colors/lib/scss/colors" as *; -@use "@blueprintjs/icons/lib/scss/variables" as *; -@use "../../common/color-aliases" as *; -@use "../../common/mixins" as *; -@use "../../common/react-transition" as *; -@use "../../common/variables" as *; +@import "@blueprintjs/icons/lib/scss/variables"; +@import "../../common/mixins"; +@import "../../common/react-transition"; +@import "../../common/variables"; /* Dialog diff --git a/packages/core/src/components/dialog/_multistep-dialog.scss b/packages/core/src/components/dialog/_multistep-dialog.scss index 3af08c086b..bf092a7135 100644 --- a/packages/core/src/components/dialog/_multistep-dialog.scss +++ b/packages/core/src/components/dialog/_multistep-dialog.scss @@ -1,14 +1,12 @@ // Copyright 2020 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "@blueprintjs/colors/lib/scss/colors" as *; -@use "@blueprintjs/icons/lib/scss/variables" as *; -@use "../../common/color-aliases" as *; -@use "../../common/mixins" as *; -@use "../../common/react-transition" as *; -@use "../../common/variables" as *; -@use "dialog" as *; +@import "@blueprintjs/icons/lib/scss/variables"; +@import "../../common/mixins"; +@import "../../common/react-transition"; +@import "../../common/variables"; +$dialog-border-radius: $pt-border-radius * 2 !default; $step-radius: $pt-border-radius * 2 !default; .#{$ns}-multistep-dialog-panels { diff --git a/packages/core/src/components/divider/_divider.scss b/packages/core/src/components/divider/_divider.scss index 84e5f4f542..618fec9ba4 100644 --- a/packages/core/src/components/divider/_divider.scss +++ b/packages/core/src/components/divider/_divider.scss @@ -1,8 +1,7 @@ // Copyright 2018 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "../../common/color-aliases" as *; -@use "../../common/variables" as *; +@import "../../common/variables"; $divider-margin: $pt-grid-size * 0.5 !default; diff --git a/packages/core/src/components/drawer/_drawer.scss b/packages/core/src/components/drawer/_drawer.scss index 5f4ad48539..acc9a1cfd5 100644 --- a/packages/core/src/components/drawer/_drawer.scss +++ b/packages/core/src/components/drawer/_drawer.scss @@ -1,12 +1,10 @@ // Copyright 2018 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "@blueprintjs/colors/lib/scss/colors" as *; -@use "@blueprintjs/icons/lib/scss/variables" as *; -@use "../../common/color-aliases" as *; -@use "../../common/mixins" as *; -@use "../../common/react-transition" as *; -@use "../../common/variables" as *; +@import "@blueprintjs/icons/lib/scss/variables"; +@import "../../common/mixins"; +@import "../../common/react-transition"; +@import "../../common/variables"; $drawer-margin: ($pt-grid-size * 3) 0 !default; $drawer-padding: $pt-grid-size * 2 !default; diff --git a/packages/core/src/components/editable-text/_editable-text.scss b/packages/core/src/components/editable-text/_editable-text.scss index bf7de2b6f5..37d2e1dcf1 100644 --- a/packages/core/src/components/editable-text/_editable-text.scss +++ b/packages/core/src/components/editable-text/_editable-text.scss @@ -1,10 +1,8 @@ // Copyright 2016 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "../../common/color-aliases" as *; -@use "../../common/mixins" as *; -@use "../../common/variables" as *; -@use "../forms/common" as *; +@import "../../common/variables"; +@import "../forms/common"; .#{$ns}-editable-text { cursor: text; diff --git a/packages/core/src/components/entity-title/_entity-title.scss b/packages/core/src/components/entity-title/_entity-title.scss index 3ab1e9324e..5ff0cec3f7 100644 --- a/packages/core/src/components/entity-title/_entity-title.scss +++ b/packages/core/src/components/entity-title/_entity-title.scss @@ -1,9 +1,8 @@ // Copyright 2024 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "../../common/variables" as *; -@use "../../common/variables-extended" as *; -@use "../../typography" as *; +@import "../../common/variables"; +@import "../../common/variables-extended"; .#{$ns}-entity-title { align-items: center; diff --git a/packages/core/src/components/forms/_common.scss b/packages/core/src/components/forms/_common.scss index 962afd9f63..4801741910 100644 --- a/packages/core/src/components/forms/_common.scss +++ b/packages/core/src/components/forms/_common.scss @@ -1,11 +1,9 @@ // Copyright 2015 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "@blueprintjs/colors/lib/scss/colors" as *; -@use "@blueprintjs/icons/lib/scss/variables" as *; -@use "../../common/color-aliases" as *; -@use "../../common/variables" as *; -@use "../button/common" as *; +@import "@blueprintjs/icons/lib/scss/variables"; +@import "../../common/variables"; +@import "../button/common"; $input-padding-horizontal: $pt-grid-size !default; $input-small-padding: $pt-input-height-small - $pt-icon-size-standard !default; diff --git a/packages/core/src/components/forms/_control-group.scss b/packages/core/src/components/forms/_control-group.scss index 6dbd8750b5..55b54ea1fb 100644 --- a/packages/core/src/components/forms/_control-group.scss +++ b/packages/core/src/components/forms/_control-group.scss @@ -1,12 +1,10 @@ // Copyright 2016 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "../../common/flex" as *; -@use "../../common/mixins" as *; -@use "../../common/variables" as *; -@use "../button/common" as *; -@use "../divider/divider" as *; -@use "./common" as *; +@import "../../common/variables"; +@import "../button/common"; +@import "./common"; +@import "../divider/divider"; /* Control groups diff --git a/packages/core/src/components/forms/_controls.scss b/packages/core/src/components/forms/_controls.scss index 313bee8f38..0d412efe6b 100644 --- a/packages/core/src/components/forms/_controls.scss +++ b/packages/core/src/components/forms/_controls.scss @@ -2,11 +2,9 @@ // Licensed under the Apache License, Version 2.0. @use "sass:math"; -@use "@blueprintjs/colors/lib/scss/colors" as *; -@use "../../common/color-aliases" as *; -@use "../../common/mixins" as *; -@use "../../common/variables" as *; -@use "../button/common" as *; +@import "../../common/mixins"; +@import "../../common/variables"; +@import "../button/common"; $control-background-color: transparent !default; $control-background-color-hover: $minimal-button-background-color-hover !default; diff --git a/packages/core/src/components/forms/_file-input.scss b/packages/core/src/components/forms/_file-input.scss index bcd98848c2..7bb78d3e80 100644 --- a/packages/core/src/components/forms/_file-input.scss +++ b/packages/core/src/components/forms/_file-input.scss @@ -1,11 +1,9 @@ // Copyright 2016 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "../../common/color-aliases" as *; -@use "../../common/mixins" as *; -@use "../../common/variables" as *; -@use "../button/common" as *; -@use "./common" as *; +@import "../../common/variables"; +@import "../button/common"; +@import "../../common/mixins"; /* File input diff --git a/packages/core/src/components/forms/_form-group.scss b/packages/core/src/components/forms/_form-group.scss index 0892831da3..ed2c4de089 100644 --- a/packages/core/src/components/forms/_form-group.scss +++ b/packages/core/src/components/forms/_form-group.scss @@ -1,10 +1,9 @@ // Copyright 2017 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "../../common/color-aliases" as *; -@use "../../common/mixins" as *; -@use "../../common/variables" as *; -@use "./common" as *; +@import "../../common/variables"; +@import "../../common/mixins"; +@import "common"; /* Form groups diff --git a/packages/core/src/components/forms/_index.scss b/packages/core/src/components/forms/_index.scss index d275b294d6..b265ebf6fe 100644 --- a/packages/core/src/components/forms/_index.scss +++ b/packages/core/src/components/forms/_index.scss @@ -1,14 +1,19 @@ // Copyright 2015 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@forward "./control-group"; -@forward "./controls"; -@forward "./file-input"; -@forward "./form-group"; -@forward "./input-group"; -@forward "./input"; -@forward "./label"; -@forward "./numeric-input"; +// NOTE: this partial file is imported once here so form components can just use it. +// multiple @imports of shared/forms from different files causes placeholder @extends to +// output CSS multiple times which breaks textbox padding. +@import "./common"; + +@import "./control-group"; +@import "./controls"; +@import "./file-input"; +@import "./form-group"; +@import "./input-group"; +@import "./input"; +@import "./label"; +@import "./numeric-input"; form { display: block; diff --git a/packages/core/src/components/forms/_input-group.scss b/packages/core/src/components/forms/_input-group.scss index 32d4f648d8..a4598d46f4 100644 --- a/packages/core/src/components/forms/_input-group.scss +++ b/packages/core/src/components/forms/_input-group.scss @@ -1,13 +1,9 @@ // Copyright 2016 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "../../common/color-aliases" as *; -@use "../../common/mixins" as *; -@use "../../common/variables" as *; -@use "../../common/variables-extended" as *; -@use "../button/common" as *; -@use "../icon/icon-mixins" as *; -@use "./common" as *; +@import "../../common/variables"; +@import "../../common/variables-extended"; +@import "../button/common"; /* Input groups diff --git a/packages/core/src/components/forms/_input.scss b/packages/core/src/components/forms/_input.scss index 82df208d59..a310f241e1 100644 --- a/packages/core/src/components/forms/_input.scss +++ b/packages/core/src/components/forms/_input.scss @@ -1,9 +1,7 @@ // Copyright 2015 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "../../common/mixins" as *; -@use "../../common/variables" as *; -@use "./common" as *; +@import "../../common/variables"; /* Text inputs diff --git a/packages/core/src/components/forms/_label.scss b/packages/core/src/components/forms/_label.scss index 5d13fc08bf..902b024334 100644 --- a/packages/core/src/components/forms/_label.scss +++ b/packages/core/src/components/forms/_label.scss @@ -1,9 +1,7 @@ // Copyright 2015 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "../../common/color-aliases" as *; -@use "../../common/variables" as *; -@use "../../common/variables-extended" as *; +@import "../../common/variables-extended"; /* Labels diff --git a/packages/core/src/components/forms/_numeric-input.scss b/packages/core/src/components/forms/_numeric-input.scss index 9203ceff00..fff5724355 100644 --- a/packages/core/src/components/forms/_numeric-input.scss +++ b/packages/core/src/components/forms/_numeric-input.scss @@ -1,5 +1,5 @@ -@use "../../common/variables" as *; -@use "./common" as *; +@import "../../common/variables"; +@import "./common"; .#{$ns}-numeric-input { // we need a very-specific selector here to override specificicty of selectors defined elsewhere. diff --git a/packages/core/src/components/hotkeys/_hotkeys.scss b/packages/core/src/components/hotkeys/_hotkeys.scss index dd40007b48..d42937d7da 100644 --- a/packages/core/src/components/hotkeys/_hotkeys.scss +++ b/packages/core/src/components/hotkeys/_hotkeys.scss @@ -1,8 +1,7 @@ // Copyright 2016 Palantir Technologies, Inc. All rights reserved. -@use "../../common/flex" as *; -@use "../../common/mixins" as *; -@use "../../common/variables" as *; +@import "../../common/variables"; +@import "../../common/mixins"; .#{$ns}-key-combo { align-items: center; diff --git a/packages/core/src/components/html-select/_common.scss b/packages/core/src/components/html-select/_common.scss index 6bf95b83b2..840f3a721b 100644 --- a/packages/core/src/components/html-select/_common.scss +++ b/packages/core/src/components/html-select/_common.scss @@ -1,10 +1,7 @@ // Copyright 2018 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "../../common/color-aliases" as *; -@use "../../common/variables" as *; -@use "../button/common" as *; -@use "../forms/common" as *; +@import "../forms/common"; %pt-select { @include pt-button-layout(); diff --git a/packages/core/src/components/html-select/_html-select.scss b/packages/core/src/components/html-select/_html-select.scss index cc34b758c2..6ff48ae2f7 100644 --- a/packages/core/src/components/html-select/_html-select.scss +++ b/packages/core/src/components/html-select/_html-select.scss @@ -1,12 +1,9 @@ // Copyright 2015 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "@blueprintjs/icons/lib/scss/variables" as *; -@use "../../common/color-aliases" as *; -@use "../../common/variables" as *; -@use "../icon/icon-mixins" as *; -@use "../popover/common" as *; -@use "./common" as *; +@import "../../common/variables"; +@import "../popover/common"; +@import "./common"; /* HTML select diff --git a/packages/core/src/components/html-table/_html-table.scss b/packages/core/src/components/html-table/_html-table.scss index 23ef4376dc..5188898992 100644 --- a/packages/core/src/components/html-table/_html-table.scss +++ b/packages/core/src/components/html-table/_html-table.scss @@ -1,9 +1,7 @@ // Copyright 2015 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "@blueprintjs/colors/lib/scss/colors" as *; -@use "../../common/color-aliases" as *; -@use "../../common/variables" as *; +@import "../../common/variables"; /* Tables diff --git a/packages/core/src/components/icon/_icon-mixins.scss b/packages/core/src/components/icon/_icon-mixins.scss index 4e52ef4d38..587559198a 100644 --- a/packages/core/src/components/icon/_icon-mixins.scss +++ b/packages/core/src/components/icon/_icon-mixins.scss @@ -1,9 +1,7 @@ // Copyright 2021 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "@blueprintjs/colors/lib/scss/colors" as *; -@use "../../common/color-aliases" as *; -@use "../../common/variables" as *; +@import "@blueprintjs/colors/lib/scss/colors"; @mixin pt-icon-font-smoothing() { -moz-osx-font-smoothing: grayscale; diff --git a/packages/core/src/components/icon/_icon.scss b/packages/core/src/components/icon/_icon.scss index c7ca33e6f6..7439a722fa 100644 --- a/packages/core/src/components/icon/_icon.scss +++ b/packages/core/src/components/icon/_icon.scss @@ -1,12 +1,10 @@ // Copyright 2015 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "@blueprintjs/colors/lib/scss/colors" as *; -@use "@blueprintjs/icons/lib/scss/variables" as *; -@use "@blueprintjs/icons/lib/scss/blueprint-icons-20" as *; -@use "../../common/variables" as *; -@use "../../common/variables-extended" as *; -@use "icon-mixins" as *; +@import "@blueprintjs/icons/lib/scss/variables"; +@import "../../common/variables"; +@import "../../common/variables-extended"; +@import "icon-mixins"; // the icon class which will contain an SVG icon .#{$ns}-icon { diff --git a/packages/core/src/components/menu/_common.scss b/packages/core/src/components/menu/_common.scss index 4e00d5980e..dbc85796df 100644 --- a/packages/core/src/components/menu/_common.scss +++ b/packages/core/src/components/menu/_common.scss @@ -1,12 +1,9 @@ // Copyright 2016 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "@blueprintjs/colors/lib/scss/colors" as *; -@use "../../common/color-aliases" as *; -@use "../../common/flex" as *; -@use "../../common/mixins" as *; -@use "../../common/variables" as *; -@use "../../common/variables-extended" as *; +@import "../../common/mixins"; +@import "../../common/variables"; +@import "../../common/variables-extended"; $menu-item-border-radius: $pt-border-radius !default; diff --git a/packages/core/src/components/menu/_menu.scss b/packages/core/src/components/menu/_menu.scss index 2df054aef4..043a14a28e 100644 --- a/packages/core/src/components/menu/_menu.scss +++ b/packages/core/src/components/menu/_menu.scss @@ -1,14 +1,12 @@ // Copyright 2015 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "@blueprintjs/icons/lib/scss/variables" as *; -@use "../../common/color-aliases" as *; -@use "../../common/mixins" as *; -@use "../../common/variables" as *; -@use "../../common/variables-extended" as *; -@use "../icon/icon-mixins" as *; -@use "./common" as *; -@forward "./submenu"; +@import "../../common/variables"; +@import "@blueprintjs/icons/lib/scss/variables"; +@import "../../common/mixins"; + +@import "./common"; +@import "./submenu"; /* Menus diff --git a/packages/core/src/components/menu/_submenu.scss b/packages/core/src/components/menu/_submenu.scss index ac3174a674..fce8c6f6b6 100644 --- a/packages/core/src/components/menu/_submenu.scss +++ b/packages/core/src/components/menu/_submenu.scss @@ -1,10 +1,9 @@ // Copyright 2016 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "@blueprintjs/icons/lib/scss/variables" as *; -@use "../../common/variables" as *; -@use "../../common/variables-extended" as *; -@use "./common" as *; +@import "../../common/variables"; +@import "@blueprintjs/icons/lib/scss/variables"; +@import "./common"; .#{$ns}-submenu { > .#{$ns}-popover-wrapper { diff --git a/packages/core/src/components/navbar/_navbar.scss b/packages/core/src/components/navbar/_navbar.scss index 5dbe1dca74..dfc91a2e94 100644 --- a/packages/core/src/components/navbar/_navbar.scss +++ b/packages/core/src/components/navbar/_navbar.scss @@ -1,9 +1,8 @@ // Copyright 2015 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "../../common/color-aliases" as *; -@use "../../common/variables" as *; -@use "../card/card-variables" as *; +@import "../../common/variables"; +@import "../card/card-variables"; /* Navbars diff --git a/packages/core/src/components/non-ideal-state/_non-ideal-state.scss b/packages/core/src/components/non-ideal-state/_non-ideal-state.scss index 919b2847b4..f2c2d6da31 100644 --- a/packages/core/src/components/non-ideal-state/_non-ideal-state.scss +++ b/packages/core/src/components/non-ideal-state/_non-ideal-state.scss @@ -1,11 +1,8 @@ // Copyright 2016 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "@blueprintjs/colors/lib/scss/colors" as *; -@use "../../common/color-aliases" as *; -@use "../../common/flex" as *; -@use "../../common/mixins" as *; -@use "../../common/variables" as *; +@import "../../common/variables"; +@import "../../common/mixins"; /* Non-ideal state diff --git a/packages/core/src/components/overflow-list/_overflow-list.scss b/packages/core/src/components/overflow-list/_overflow-list.scss index 0fd4186b9a..6c85f00f0a 100644 --- a/packages/core/src/components/overflow-list/_overflow-list.scss +++ b/packages/core/src/components/overflow-list/_overflow-list.scss @@ -1,8 +1,6 @@ // Copyright 2018 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "../../common/variables" as *; - .#{$ns}-overflow-list { display: flex; flex-wrap: nowrap; diff --git a/packages/core/src/components/overlay/_overlay.scss b/packages/core/src/components/overlay/_overlay.scss index cf2bd8f8f1..61fb849667 100644 --- a/packages/core/src/components/overlay/_overlay.scss +++ b/packages/core/src/components/overlay/_overlay.scss @@ -1,10 +1,7 @@ // Copyright 2016 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "@blueprintjs/colors/lib/scss/colors" as *; -@use "../../common/mixins" as *; -@use "../../common/react-transition" as *; -@use "../../common/variables" as *; +@import "../../common/variables"; $overlay-background-color: rgba($black, 0.7) !default; diff --git a/packages/core/src/components/panel-stack/_panel-stack.scss b/packages/core/src/components/panel-stack/_panel-stack.scss index db89d9edc8..0a56b1562f 100644 --- a/packages/core/src/components/panel-stack/_panel-stack.scss +++ b/packages/core/src/components/panel-stack/_panel-stack.scss @@ -1,11 +1,9 @@ // Copyright 2018 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "../../common/color-aliases" as *; -@use "../../common/mixins" as *; -@use "../../common/react-transition" as *; -@use "../../common/variables" as *; -@use "../card/card-variables" as *; +@import "../../common/variables"; +@import "@blueprintjs/core/src/common/react-transition"; +@import "../card/card-variables"; .#{$ns}-panel-stack { overflow: hidden; diff --git a/packages/core/src/components/panel-stack2/_panel-stack2.scss b/packages/core/src/components/panel-stack2/_panel-stack2.scss index 35e1a91fe6..0a19b0121c 100644 --- a/packages/core/src/components/panel-stack2/_panel-stack2.scss +++ b/packages/core/src/components/panel-stack2/_panel-stack2.scss @@ -1,11 +1,9 @@ // Copyright 2021 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "../../common/color-aliases" as *; -@use "../../common/mixins" as *; -@use "../../common/react-transition" as *; -@use "../../common/variables" as *; -@use "../card/card-variables" as *; +@import "../../common/variables"; +@import "@blueprintjs/core/src/common/react-transition"; +@import "../card/card-variables"; .#{$ns}-panel-stack2 { overflow: hidden; diff --git a/packages/core/src/components/popover/_common.scss b/packages/core/src/components/popover/_common.scss index bafadfb743..b6029d4050 100644 --- a/packages/core/src/components/popover/_common.scss +++ b/packages/core/src/components/popover/_common.scss @@ -2,9 +2,8 @@ // Licensed under the Apache License, Version 2.0. @use "sass:math"; -@use "@blueprintjs/colors/lib/scss/colors" as *; -@use "../../common/variables" as *; -@use "../../common/react-transition" as *; +@import "../../common/variables"; +@import "../../common/react-transition"; $pt-popover-background-color: $white !default; $pt-dark-popover-background-color: $dark-gray3 !default; diff --git a/packages/core/src/components/popover/_popover-in-button-group.scss b/packages/core/src/components/popover/_popover-in-button-group.scss index e2d310e318..26513ce384 100644 --- a/packages/core/src/components/popover/_popover-in-button-group.scss +++ b/packages/core/src/components/popover/_popover-in-button-group.scss @@ -1,9 +1,8 @@ // Copyright 2021 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "../../common/variables" as *; -@use "../button/common" as *; -@use "./common" as *; +@import "./common"; +@import "@blueprintjs/core/src/components/button/common"; .#{$ns}-button-group { // support wrapping buttons in a tooltip, which adds a wrapper element diff --git a/packages/core/src/components/popover/_popover-in-control-group.scss b/packages/core/src/components/popover/_popover-in-control-group.scss index 5bb60ce183..a07e35c838 100644 --- a/packages/core/src/components/popover/_popover-in-control-group.scss +++ b/packages/core/src/components/popover/_popover-in-control-group.scss @@ -1,7 +1,7 @@ // Copyright 2021 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "../../common/variables" as *; +@import "./common"; .#{$ns}-control-group { // Add border radius inheritance to support components wrapped in a popover diff --git a/packages/core/src/components/popover/_popover-in-label.scss b/packages/core/src/components/popover/_popover-in-label.scss index 2b81466bb2..8c3d54a3d4 100644 --- a/packages/core/src/components/popover/_popover-in-label.scss +++ b/packages/core/src/components/popover/_popover-in-label.scss @@ -1,7 +1,7 @@ // Copyright 2021 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "../../common/variables" as *; +@import "./common"; label.#{$ns}-label { .#{$ns}-popover-target { diff --git a/packages/core/src/components/popover/_popover-in-submenu.scss b/packages/core/src/components/popover/_popover-in-submenu.scss index 82d2654251..cc19df5fa1 100644 --- a/packages/core/src/components/popover/_popover-in-submenu.scss +++ b/packages/core/src/components/popover/_popover-in-submenu.scss @@ -1,9 +1,8 @@ // Copyright 2021 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "../../common/variables" as *; -@use "../../common/variables-extended" as *; -@use "../menu/common" as *; +@import "./common"; +@import "@blueprintjs/core/src/components/menu/common"; .#{$ns}-submenu { .#{$ns}-popover-target { diff --git a/packages/core/src/components/popover/_popover-in-tree.scss b/packages/core/src/components/popover/_popover-in-tree.scss index 272a9c2390..9b0f335af5 100644 --- a/packages/core/src/components/popover/_popover-in-tree.scss +++ b/packages/core/src/components/popover/_popover-in-tree.scss @@ -1,7 +1,7 @@ // Copyright 2021 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "../../common/variables" as *; +@import "./common"; .#{$ns}-tree-node-secondary-label { .#{$ns}-popover-target { diff --git a/packages/core/src/components/popover/_popover.scss b/packages/core/src/components/popover/_popover.scss index 9e6f2abfa7..cbdbb63a06 100644 --- a/packages/core/src/components/popover/_popover.scss +++ b/packages/core/src/components/popover/_popover.scss @@ -2,15 +2,12 @@ // Licensed under the Apache License, Version 2.0. @use "sass:color"; -@use "@blueprintjs/colors/lib/scss/colors" as *; -@use "../../common/react-transition" as *; -@use "../../common/variables" as *; -@use "./common" as *; -@forward "./popover-in-button-group"; -@forward "./popover-in-control-group"; -@forward "./popover-in-label"; -@forward "./popover-in-submenu"; -@forward "./popover-in-tree"; +@import "./common"; +@import "./popover-in-button-group"; +@import "./popover-in-control-group"; +@import "./popover-in-label"; +@import "./popover-in-submenu"; +@import "./popover-in-tree"; $popover-width: $pt-grid-size * 35 !default; $popover-arrow-box-shadow: 1px 1px 6px rgba($black, $pt-drop-shadow-opacity) !default; diff --git a/packages/core/src/components/portal/_portal.scss b/packages/core/src/components/portal/_portal.scss index ea55cb4676..21755b7be3 100644 --- a/packages/core/src/components/portal/_portal.scss +++ b/packages/core/src/components/portal/_portal.scss @@ -1,8 +1,6 @@ // Copyright 2016 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "../../common/variables" as *; - .#{$ns}-portal { left: 0; // take the portal out of the document flow to prevent browsers from autoscrolling to the bottom diff --git a/packages/core/src/components/progress-bar/_common.scss b/packages/core/src/components/progress-bar/_common.scss index c002a77d33..c9438b4dd5 100644 --- a/packages/core/src/components/progress-bar/_common.scss +++ b/packages/core/src/components/progress-bar/_common.scss @@ -1,7 +1,7 @@ // Copyright 2017 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "@blueprintjs/colors/lib/scss/colors" as *; +@import "../../common/variables"; $progress-track-color: rgba($gray1, 0.2) !default; $progress-head-color: rgba($gray1, 0.8) !default; diff --git a/packages/core/src/components/progress-bar/_progress-bar.scss b/packages/core/src/components/progress-bar/_progress-bar.scss index 5fb05a67f1..8ce8b953c6 100644 --- a/packages/core/src/components/progress-bar/_progress-bar.scss +++ b/packages/core/src/components/progress-bar/_progress-bar.scss @@ -1,10 +1,8 @@ // Copyright 2015 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "@blueprintjs/colors/lib/scss/colors" as *; -@use "../../common/mixins" as *; -@use "../../common/variables" as *; -@use "./common" as *; +@import "../../common/variables"; +@import "common"; /* Progress bars diff --git a/packages/core/src/components/section/_section.scss b/packages/core/src/components/section/_section.scss index bfceecc223..77ddc4da03 100644 --- a/packages/core/src/components/section/_section.scss +++ b/packages/core/src/components/section/_section.scss @@ -1,7 +1,5 @@ @use "sass:math"; -@use "@blueprintjs/colors/lib/scss/colors" as *; -@use "../../common/color-aliases" as *; -@use "../../common/variables" as *; +@import "../../common/variables"; $section-min-height: $pt-grid-size * 5 !default; $section-padding-vertical: $pt-grid-size !default; diff --git a/packages/core/src/components/segmented-control/_segmented-control.scss b/packages/core/src/components/segmented-control/_segmented-control.scss index 83db3599a3..42887e342b 100644 --- a/packages/core/src/components/segmented-control/_segmented-control.scss +++ b/packages/core/src/components/segmented-control/_segmented-control.scss @@ -1,7 +1,5 @@ @use "sass:math"; -@use "@blueprintjs/colors/lib/scss/colors" as *; -@use "../../common/color-aliases" as *; -@use "../../common/variables" as *; +@import "../../common/variables"; .#{$ns}-segmented-control { background-color: $light-gray5; diff --git a/packages/core/src/components/skeleton/_common.scss b/packages/core/src/components/skeleton/_common.scss index 21f5b1e721..1cb4bc3803 100644 --- a/packages/core/src/components/skeleton/_common.scss +++ b/packages/core/src/components/skeleton/_common.scss @@ -1,7 +1,6 @@ // Copyright 2017 Palantir Technologies, Inc. All rights reserved. -@use "@blueprintjs/colors/lib/scss/colors" as *; -@use "../../common/variables" as *; +@import "../../common/variables"; $skeleton-animation: ($pt-transition-duration * 10) linear infinite alternate skeleton-glow !default; $skeleton-color-start: rgba($light-gray1, 0.2) !default; diff --git a/packages/core/src/components/skeleton/_skeleton.scss b/packages/core/src/components/skeleton/_skeleton.scss index 2516431847..ede2cc3827 100644 --- a/packages/core/src/components/skeleton/_skeleton.scss +++ b/packages/core/src/components/skeleton/_skeleton.scss @@ -1,8 +1,7 @@ // Copyright 2016 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "../../common/variables" as *; -@use "./common" as *; +@import "./common"; /* Skeletons diff --git a/packages/core/src/components/slider/_common.scss b/packages/core/src/components/slider/_common.scss index 65a88ed48c..0e3b8b1029 100644 --- a/packages/core/src/components/slider/_common.scss +++ b/packages/core/src/components/slider/_common.scss @@ -1,10 +1,10 @@ // Copyright 2016 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "../../common/variables" as *; -@use "@blueprintjs/icons/lib/scss/variables" as *; -@use "../../common/mixins" as *; -@use "../button/common" as *; +@import "../../common/variables"; +@import "@blueprintjs/icons/lib/scss/variables"; +@import "../../common/mixins"; +@import "../button/common"; @mixin slider-orientation($size, $vertical: false) { $slider-min-size: $pt-grid-size * 15; diff --git a/packages/core/src/components/slider/_slider.scss b/packages/core/src/components/slider/_slider.scss index d9688b0627..be50f6a05f 100644 --- a/packages/core/src/components/slider/_slider.scss +++ b/packages/core/src/components/slider/_slider.scss @@ -1,13 +1,8 @@ // Copyright 2016 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "@blueprintjs/colors/lib/scss/colors" as *; -@use "../../common/mixins" as *; -@use "../../common/variables" as *; -@use "../button/common" as *; -@use "../tooltip/common" as *; -@use "../tooltip/tooltip" as *; -@use "./common" as *; +@import "../tooltip/tooltip"; +@import "./common"; $handle-size: $pt-icon-size-standard !default; $track-size: $handle-size - $pt-grid-size !default; diff --git a/packages/core/src/components/spinner/_spinner.scss b/packages/core/src/components/spinner/_spinner.scss index 1fee4ffae7..864fdcb07c 100644 --- a/packages/core/src/components/spinner/_spinner.scss +++ b/packages/core/src/components/spinner/_spinner.scss @@ -1,9 +1,8 @@ // Copyright 2015 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "../../common/mixins" as *; -@use "../../common/variables" as *; -@use "../progress-bar/common" as *; +@import "../../common/variables"; +@import "../progress-bar/common"; @keyframes pt-spinner-animation { from { diff --git a/packages/core/src/components/tabs/_tabs.scss b/packages/core/src/components/tabs/_tabs.scss index 807916a35f..1fbf3edc85 100644 --- a/packages/core/src/components/tabs/_tabs.scss +++ b/packages/core/src/components/tabs/_tabs.scss @@ -1,10 +1,8 @@ // Copyright 2015 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "@blueprintjs/colors/lib/scss/colors" as *; -@use "../../common/color-aliases" as *; -@use "../../common/mixins" as *; -@use "../../common/variables" as *; +@import "../../common/variables"; +@import "../../common/mixins"; /* Tabs diff --git a/packages/core/src/components/tag-input/_resizable-input.scss b/packages/core/src/components/tag-input/_resizable-input.scss index 56958d360d..98b02cc363 100644 --- a/packages/core/src/components/tag-input/_resizable-input.scss +++ b/packages/core/src/components/tag-input/_resizable-input.scss @@ -1,5 +1,5 @@ -@use "../../common/variables" as *; -@use "../tag/common" as *; +@import "../../common/variables"; +@import "../tag/common"; .#{$ns}-resizable-input-span { max-height: 0; diff --git a/packages/core/src/components/tag-input/_tag-input.scss b/packages/core/src/components/tag-input/_tag-input.scss index bd004ccd31..061cf51957 100644 --- a/packages/core/src/components/tag-input/_tag-input.scss +++ b/packages/core/src/components/tag-input/_tag-input.scss @@ -1,13 +1,9 @@ // Copyright 2017 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "../../common/color-aliases" as *; -@use "../../common/flex" as *; -@use "../../common/mixins" as *; -@use "../../common/variables" as *; -@use "../button/common" as *; -@use "../forms/common" as *; -@use "../tag/common" as *; +@import "../../common/variables"; +@import "../forms/common"; +@import "../tag/common"; $tag-input-padding: ($pt-input-height - $tag-height) * 0.5 !default; diff --git a/packages/core/src/components/tag/_common.scss b/packages/core/src/components/tag/_common.scss index b8183ef14b..737aba9a4c 100644 --- a/packages/core/src/components/tag/_common.scss +++ b/packages/core/src/components/tag/_common.scss @@ -1,14 +1,8 @@ // Copyright 2015 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "@blueprintjs/colors/lib/scss/colors" as *; -@use "@blueprintjs/icons/lib/scss/variables" as *; -@use "../../common/color-aliases" as *; -@use "../../common/flex" as *; -@use "../../common/mixins" as *; -@use "../../common/variables" as *; -@use "../../common/variables-extended" as *; -@use "../icon/icon-mixins" as *; +@import "../../common/variables"; +@import "../../common/variables-extended"; // Variables // --------------------------------------------------------------------------------------------------------------------- diff --git a/packages/core/src/components/tag/_compound-tag.scss b/packages/core/src/components/tag/_compound-tag.scss index 182e0f2af1..fb56a707a7 100644 --- a/packages/core/src/components/tag/_compound-tag.scss +++ b/packages/core/src/components/tag/_compound-tag.scss @@ -1,11 +1,10 @@ // Copyright 2024 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "@blueprintjs/colors/lib/scss/colors" as *; -@use "../../common/mixins" as *; -@use "../../common/variables" as *; -@use "../../common/variables-extended" as *; -@use "./common" as *; +@import "../../common/variables"; +@import "../../common/variables-extended"; +@import "../../common/mixins"; +@import "./common"; /* Compound Tags diff --git a/packages/core/src/components/tag/_tag.scss b/packages/core/src/components/tag/_tag.scss index a959912a17..8ec8ea2cfa 100644 --- a/packages/core/src/components/tag/_tag.scss +++ b/packages/core/src/components/tag/_tag.scss @@ -1,9 +1,9 @@ // Copyright 2015 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "../../common/variables" as *; -@use "../../common/variables-extended" as *; -@use "./common" as *; +@import "../../common/variables"; +@import "../../common/variables-extended"; +@import "./common"; /* Tags diff --git a/packages/core/src/components/toast/_toast.scss b/packages/core/src/components/toast/_toast.scss index 0f32cc5639..a1cd06138c 100644 --- a/packages/core/src/components/toast/_toast.scss +++ b/packages/core/src/components/toast/_toast.scss @@ -1,10 +1,8 @@ // Copyright 2016 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "@blueprintjs/colors/lib/scss/colors" as *; -@use "../../common/color-aliases" as *; -@use "../../common/react-transition" as *; -@use "../../common/variables" as *; +@import "../../common/variables"; +@import "../../common/react-transition"; $toast-height: $pt-button-height-large !default; $toast-min-width: $pt-grid-size * 30 !default; diff --git a/packages/core/src/components/tooltip/_common.scss b/packages/core/src/components/tooltip/_common.scss index 12b9a25852..d663af8515 100644 --- a/packages/core/src/components/tooltip/_common.scss +++ b/packages/core/src/components/tooltip/_common.scss @@ -1,9 +1,6 @@ // Copyright 2021 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "@blueprintjs/colors/lib/scss/colors" as *; -@use "../../common/variables" as *; - $tooltip-background-color: $dark-gray5 !default; $tooltip-text-color: $light-gray5 !default; diff --git a/packages/core/src/components/tooltip/_tooltip.scss b/packages/core/src/components/tooltip/_tooltip.scss index d6ec53df95..89902e4bd0 100644 --- a/packages/core/src/components/tooltip/_tooltip.scss +++ b/packages/core/src/components/tooltip/_tooltip.scss @@ -1,13 +1,10 @@ // Copyright 2021 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "@blueprintjs/colors/lib/scss/colors" as *; -@use "../../common/mixins" as *; -@use "../../common/react-transition" as *; -@use "../../common/variables" as *; -@use "../../common/typography-colors" as *; -@use "../popover/common" as *; -@use "./common" as *; +@import "../../common/variables"; +@import "../../common/typography-colors"; +@import "../popover/common"; +@import "./common"; $tooltip-arrow-box-shadow: 1px 1px 6px rgba($black, $pt-drop-shadow-opacity) !default; $dark-tooltip-arrow-box-shadow: 1px 1px 6px rgba($black, $pt-dark-drop-shadow-opacity) !default; diff --git a/packages/core/src/components/tree/_tree.scss b/packages/core/src/components/tree/_tree.scss index 4596e1061f..017e067d27 100644 --- a/packages/core/src/components/tree/_tree.scss +++ b/packages/core/src/components/tree/_tree.scss @@ -1,13 +1,10 @@ // Copyright 2015 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "@blueprintjs/colors/lib/scss/colors" as *; -@use "@blueprintjs/icons/lib/scss/variables" as *; -@use "../../common/color-aliases" as *; -@use "../../common/mixins" as *; -@use "../../common/variables" as *; -@use "../../common/variables-extended" as *; -@use "../icon/icon-mixins" as *; +@import "@blueprintjs/icons/lib/scss/variables"; +@import "../../common/variables"; +@import "../../common/variables-extended"; +@import "../../common/mixins"; /* Trees diff --git a/packages/core/src/docs/variables.md b/packages/core/src/docs/variables.md index 8ec38075e4..0b1228623d 100644 --- a/packages/core/src/docs/variables.md +++ b/packages/core/src/docs/variables.md @@ -42,7 +42,7 @@ variables in Sass as a map and in TypeScript as an object (see the [Icons sectio full list of identifiers): ```scss -@use "@blueprintjs/icons/lib/scss/variables" as *; +@import "@blueprintjs/icons/lib/scss/variables"; .my-custom-icon { content: map-get($blueprint-icon-codepoints, "tick"); diff --git a/packages/core/test/overlay2/overlay2-test-debugging.scss b/packages/core/test/overlay2/overlay2-test-debugging.scss index d9a19b6d16..ec47250b9c 100644 --- a/packages/core/test/overlay2/overlay2-test-debugging.scss +++ b/packages/core/test/overlay2/overlay2-test-debugging.scss @@ -1,8 +1,8 @@ // Copyright 2024 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "@blueprintjs/colors/lib/scss/colors" as *; -@use "@blueprintjs/core/src/common/variables" as *; +@import "@blueprintjs/colors/lib/scss/colors"; +@import "@blueprintjs/core/src/common/variables"; body { min-width: 500px; diff --git a/packages/datetime/src/_common.scss b/packages/datetime/src/_common.scss index bb6084b876..5919f48c6a 100644 --- a/packages/datetime/src/_common.scss +++ b/packages/datetime/src/_common.scss @@ -1,9 +1,9 @@ // Copyright 2017 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "@blueprintjs/colors/lib/scss/colors" as *; -@use "@blueprintjs/core/src/common/variables" as *; -@use "@blueprintjs/icons/lib/scss/variables" as *; +@import "@blueprintjs/colors/lib/scss/colors"; +@import "@blueprintjs/core/src/common/variables"; +@import "@blueprintjs/icons/lib/scss/variables"; $datepicker-padding: $pt-grid-size * 0.5 !default; diff --git a/packages/datetime/src/blueprint-datetime.scss b/packages/datetime/src/blueprint-datetime.scss index 5e33fbeed0..5adaa610c1 100644 --- a/packages/datetime/src/blueprint-datetime.scss +++ b/packages/datetime/src/blueprint-datetime.scss @@ -1,7 +1,7 @@ // Copyright 2015 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@forward "components/date-input/dateinput"; -@forward "components/date-picker/datepicker"; -@forward "components/date-range-picker/daterangepicker"; -@forward "components/time-picker/timepicker"; +@import "components/date-input/dateinput"; +@import "components/date-picker/datepicker"; +@import "components/date-range-picker/daterangepicker"; +@import "components/time-picker/timepicker"; diff --git a/packages/datetime/src/components/date-input/_dateinput.scss b/packages/datetime/src/components/date-input/_dateinput.scss index e4511a112e..484040af15 100644 --- a/packages/datetime/src/components/date-input/_dateinput.scss +++ b/packages/datetime/src/components/date-input/_dateinput.scss @@ -1,7 +1,7 @@ // Copyright 2016 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "@blueprintjs/core/src/common/variables" as *; +@import "../../common"; .#{$ns}-date-input { .#{$ns}-input-action { diff --git a/packages/datetime/src/components/date-picker/_datepicker.scss b/packages/datetime/src/components/date-picker/_datepicker.scss index e07126b222..c66aa1c62c 100644 --- a/packages/datetime/src/components/date-picker/_datepicker.scss +++ b/packages/datetime/src/components/date-picker/_datepicker.scss @@ -1,12 +1,9 @@ // Copyright 2015 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "@blueprintjs/colors/lib/scss/colors" as *; -@use "@blueprintjs/core/src/common/color-aliases" as *; -@use "@blueprintjs/core/src/common/flex" as *; -@use "@blueprintjs/core/src/common/variables" as *; -@use "@blueprintjs/core/src/components/popover/common" as *; -@use "../../common" as *; +@import "@blueprintjs/colors/lib/scss/colors"; +@import "@blueprintjs/core/src/components/popover/common"; +@import "../../common"; $cell-size: $pt-grid-size * 3 !default; $header-height: $pt-grid-size * 4 !default; diff --git a/packages/datetime/src/components/date-range-picker/_daterangepicker.scss b/packages/datetime/src/components/date-range-picker/_daterangepicker.scss index 63406813dd..5627d8d17d 100644 --- a/packages/datetime/src/components/date-range-picker/_daterangepicker.scss +++ b/packages/datetime/src/components/date-range-picker/_daterangepicker.scss @@ -1,9 +1,7 @@ // Copyright 2016 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "@blueprintjs/colors/lib/scss/colors" as *; -@use "@blueprintjs/core/src/common/variables" as *; -@use "../../common" as *; +@import "../../common"; // react-day-picker does not conform to our naming scheme /* stylelint-disable selector-class-pattern */ diff --git a/packages/datetime/src/components/time-picker/_timepicker.scss b/packages/datetime/src/components/time-picker/_timepicker.scss index 193f96f26a..efa97722b5 100644 --- a/packages/datetime/src/components/time-picker/_timepicker.scss +++ b/packages/datetime/src/components/time-picker/_timepicker.scss @@ -1,12 +1,9 @@ // Copyright 2015 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "@blueprintjs/core/src/common/color-aliases" as *; -@use "@blueprintjs/core/src/common/mixins" as *; -@use "@blueprintjs/core/src/common/variables" as *; -@use "@blueprintjs/core/src/components/forms/common" as *; -@use "@blueprintjs/core/src/components/icon/icon-mixins" as *; -@use "../../common" as *; +@import "@blueprintjs/core/src/components/forms/common"; +@import "@blueprintjs/core/src/components/icon/icon-mixins"; +@import "../../common"; $timepicker-input-row-height: $pt-grid-size * 3 !default; // subtract two because of inset shadow diff --git a/packages/datetime/test/test-debugging-styles.scss b/packages/datetime/test/test-debugging-styles.scss index 2874759908..229a45b244 100644 --- a/packages/datetime/test/test-debugging-styles.scss +++ b/packages/datetime/test/test-debugging-styles.scss @@ -1,8 +1,8 @@ // Copyright 2022 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "@blueprintjs/colors/lib/scss/colors" as *; -@use "@blueprintjs/core/src/common/variables" as *; +@import "@blueprintjs/colors/lib/scss/colors"; +@import "@blueprintjs/core/src/common/variables"; .#{$ns}-date-range-input-popover { // popover does not position itself corectly in tests sometimes... we add this margin so that we can see diff --git a/packages/datetime2/src/blueprint-datetime2.scss b/packages/datetime2/src/blueprint-datetime2.scss index 7004ad4f4c..712c2908c1 100644 --- a/packages/datetime2/src/blueprint-datetime2.scss +++ b/packages/datetime2/src/blueprint-datetime2.scss @@ -1,7 +1,7 @@ // Copyright 2022 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@forward "common/react-day-picker-overrides"; -@forward "components/date-picker3/date-picker3"; -@forward "components/date-picker3/date-picker3-caption"; -@forward "components/date-range-picker3/date-range-picker3"; +@import "common/react-day-picker-overrides"; +@import "components/date-picker3/date-picker3"; +@import "components/date-picker3/date-picker3-caption"; +@import "components/date-range-picker3/date-range-picker3"; diff --git a/packages/datetime2/src/common/_react-day-picker-overrides.scss b/packages/datetime2/src/common/_react-day-picker-overrides.scss index 463c3339c6..2404c93539 100644 --- a/packages/datetime2/src/common/_react-day-picker-overrides.scss +++ b/packages/datetime2/src/common/_react-day-picker-overrides.scss @@ -1,11 +1,11 @@ // Copyright 2023 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "@blueprintjs/colors/lib/scss/colors" as *; -@use "@blueprintjs/core/src/common/variables" as *; +@import "@blueprintjs/colors/lib/scss/colors"; +@import "@blueprintjs/core/src/common/variables"; // omit file extension, otherwise this will emit a `@import url()` rule -@forward "react-day-picker/dist/style"; +@import "react-day-picker/dist/style"; .#{$ns}-datepicker-content .rdp { --rdp-cell-size: #{$pt-grid-size * 3}; diff --git a/packages/datetime2/src/components/date-picker3/_date-picker3-caption.scss b/packages/datetime2/src/components/date-picker3/_date-picker3-caption.scss index f1cad6f8b5..e2bc15b194 100644 --- a/packages/datetime2/src/components/date-picker3/_date-picker3-caption.scss +++ b/packages/datetime2/src/components/date-picker3/_date-picker3-caption.scss @@ -1,10 +1,8 @@ // Copyright 2023 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "@blueprintjs/colors/lib/scss/colors" as *; -@use "@blueprintjs/core/src/common/flex" as *; -@use "@blueprintjs/core/src/common/variables" as *; -@use "@blueprintjs/datetime/src/common" as *; +@import "@blueprintjs/colors/lib/scss/colors"; +@import "@blueprintjs/datetime/src/common"; // react-day-picker does not conform to our naming scheme /* stylelint-disable selector-class-pattern */ diff --git a/packages/datetime2/src/components/date-picker3/_date-picker3.scss b/packages/datetime2/src/components/date-picker3/_date-picker3.scss index 566e0aed98..69465a97b1 100644 --- a/packages/datetime2/src/components/date-picker3/_date-picker3.scss +++ b/packages/datetime2/src/components/date-picker3/_date-picker3.scss @@ -1,11 +1,9 @@ // Copyright 2023 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "@blueprintjs/colors/lib/scss/colors" as *; -@use "@blueprintjs/core/src/common/color-aliases" as *; -@use "@blueprintjs/core/src/common/variables" as *; -@use "@blueprintjs/core/src/components/popover/common" as *; -@use "@blueprintjs/datetime/src/common" as *; +@import "@blueprintjs/colors/lib/scss/colors"; +@import "@blueprintjs/core/src/components/popover/common"; +@import "@blueprintjs/datetime/src/common"; // react-day-picker does not conform to our naming scheme /* stylelint-disable selector-class-pattern */ diff --git a/packages/datetime2/src/components/date-range-picker3/_date-range-picker3.scss b/packages/datetime2/src/components/date-range-picker3/_date-range-picker3.scss index b947878d8d..59663bdb00 100644 --- a/packages/datetime2/src/components/date-range-picker3/_date-range-picker3.scss +++ b/packages/datetime2/src/components/date-range-picker3/_date-range-picker3.scss @@ -1,12 +1,11 @@ // Copyright 2023 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "@blueprintjs/colors/lib/scss/colors" as *; -@use "@blueprintjs/core/src/common/color-aliases" as *; -@use "@blueprintjs/core/src/common/flex" as *; -@use "@blueprintjs/core/src/common/variables" as *; -@use "@blueprintjs/core/src/components/button/common" as *; -@use "@blueprintjs/datetime/src/common" as *; +@import "@blueprintjs/colors/lib/scss/colors"; +@import "@blueprintjs/core/src/common/variables"; +@import "@blueprintjs/core/src/common/flex"; +@import "@blueprintjs/core/src/components/button/common"; +@import "@blueprintjs/datetime/src/common"; // react-day-picker does not conform to our naming scheme /* stylelint-disable selector-class-pattern */ diff --git a/packages/demo-app/src/index.scss b/packages/demo-app/src/index.scss index d68ae7185e..81436c006b 100644 --- a/packages/demo-app/src/index.scss +++ b/packages/demo-app/src/index.scss @@ -1,10 +1,10 @@ -@forward "./styles/examples"; - @import "@blueprintjs/core/lib/css/blueprint.css"; @import "@blueprintjs/datetime/lib/css/blueprint-datetime.css"; @import "@blueprintjs/datetime2/lib/css/blueprint-datetime2.css"; @import "@blueprintjs/table/lib/css/table.css"; +@import "./styles/examples"; + body { margin: 0; overflow-y: scroll; diff --git a/packages/demo-app/src/styles/_examples.scss b/packages/demo-app/src/styles/_examples.scss index d213c913ad..d02ebf0aaa 100644 --- a/packages/demo-app/src/styles/_examples.scss +++ b/packages/demo-app/src/styles/_examples.scss @@ -1,4 +1,4 @@ -@use "@blueprintjs/core/lib/scss/variables" as *; +@import "@blueprintjs/core/lib/scss/variables"; $intent-primary-text: $blue1; $intent-success-text: $green1; diff --git a/packages/docs-app/src/_main.scss b/packages/docs-app/src/_main.scss deleted file mode 100644 index 570b1ebc20..0000000000 --- a/packages/docs-app/src/_main.scss +++ /dev/null @@ -1,48 +0,0 @@ -/* - -Copyright 2015-present Palantir Technologies, Inc. All rights reserved. -Licensed under the Apache License, Version 2.0. - -*/ - -@forward "styles/colors"; -@forward "styles/examples"; -@forward "styles/icons"; -@forward "styles/nav"; -@forward "styles/resources"; -@forward "styles/welcome"; -@use "@blueprintjs/core/src/common/variables" as *; -@use "@blueprintjs/docs-theme/src/styles/variables" as *; - -.docs-releases-menu .#{$ns}-menu { - min-width: 270px; -} - -// remove padding on left side of tables in documentation -.docs-section .#{$ns}-running-text table { - margin: $content-padding 0; - - th { - padding-top: 0; - } - - th:first-child, - td:first-child { - padding-left: 0; - padding-right: 0; - } -} - -.docs-root, -.docs-nav, -.docs-content-wrapper, -.docs-example, -.docs-example-options, -.editor, -code { - transition: background-color $pt-transition-duration $pt-transition-ease; -} - -.docs-root { - isolation: isolate; -} diff --git a/packages/docs-app/src/index.scss b/packages/docs-app/src/index.scss index 9bc1f8d269..bf715152b5 100644 --- a/packages/docs-app/src/index.scss +++ b/packages/docs-app/src/index.scss @@ -17,6 +17,45 @@ Licensed under the Apache License, Version 2.0. // then the docs theme styles @import "@blueprintjs/docs-theme/lib/css/docs-theme.css"; +@import "@blueprintjs/docs-theme/src/styles/variables"; // then our own styles -@import "./main"; +@import "styles/colors"; +@import "styles/examples"; +@import "styles/icons"; +@import "styles/nav"; +@import "styles/resources"; +@import "styles/welcome"; + +.docs-releases-menu .#{$ns}-menu { + min-width: 270px; +} + +// remove padding on left side of tables in documentation +.docs-section .#{$ns}-running-text table { + margin: $content-padding 0; + + th { + padding-top: 0; + } + + th:first-child, + td:first-child { + padding-left: 0; + padding-right: 0; + } +} + +.docs-root, +.docs-nav, +.docs-content-wrapper, +.docs-example, +.docs-example-options, +.editor, +code { + transition: background-color $pt-transition-duration $pt-transition-ease; +} + +.docs-root { + isolation: isolate; +} diff --git a/packages/docs-app/src/styles/_colors.scss b/packages/docs-app/src/styles/_colors.scss index 1291e4edc4..9cf1762f7a 100644 --- a/packages/docs-app/src/styles/_colors.scss +++ b/packages/docs-app/src/styles/_colors.scss @@ -2,12 +2,7 @@ // Licensed under the Apache License, Version 2.0. @use "sass:math"; -@use "@blueprintjs/colors/lib/scss/colors" as *; -@use "@blueprintjs/icons/lib/scss/variables" as *; -@use "@blueprintjs/icons/lib/scss/blueprint-icons-16" as *; -@use "@blueprintjs/core/src/common/color-aliases" as *; -@use "@blueprintjs/core/src/common/mixins" as *; -@use "@blueprintjs/core/src/common/variables" as *; +@import "@blueprintjs/icons/lib/scss/variables"; $palette-spacing: $pt-grid-size * 2; $palette-border-radius: 4px; diff --git a/packages/docs-app/src/styles/_examples.scss b/packages/docs-app/src/styles/_examples.scss index 4127d4654b..eed9430555 100644 --- a/packages/docs-app/src/styles/_examples.scss +++ b/packages/docs-app/src/styles/_examples.scss @@ -1,15 +1,10 @@ // Copyright 2016 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "@blueprintjs/colors/lib/scss/colors" as *; -@use "@blueprintjs/core/src/common/color-aliases" as *; -@use "@blueprintjs/core/src/common/flex" as *; -@use "@blueprintjs/core/src/common/mixins" as *; -@use "@blueprintjs/core/src/common/react-transition" as *; -@use "@blueprintjs/core/src/common/variables" as *; -@use "@blueprintjs/core/src/common/variables-extended" as *; -@use "@blueprintjs/core/src/components/icon/icon-mixins" as *; -@use "@blueprintjs/icons/lib/scss/variables" as *; +@import "@blueprintjs/core/src/common/react-transition"; +@import "@blueprintjs/core/src/common/variables-extended"; +@import "@blueprintjs/core/src/components/icon/icon-mixins"; +@import "@blueprintjs/icons/lib/scss/variables"; // Generate a selector for a page ID by reference @function page($ref, $comparator: "$=") { diff --git a/packages/docs-app/src/styles/_icons.scss b/packages/docs-app/src/styles/_icons.scss index a9ffff25ed..1437863d22 100644 --- a/packages/docs-app/src/styles/_icons.scss +++ b/packages/docs-app/src/styles/_icons.scss @@ -2,10 +2,7 @@ // Licensed under the Apache License, Version 2.0. @use "sass:math"; -@use "@blueprintjs/colors/lib/scss/colors" as *; -@use "@blueprintjs/core/src/common/color-aliases" as *; -@use "@blueprintjs/core/src/common/mixins" as *; -@use "@blueprintjs/core/src/common/variables" as *; +@import "@blueprintjs/core/src/common/variables"; $svg-icon-size: 36px; diff --git a/packages/docs-app/src/styles/_nav.scss b/packages/docs-app/src/styles/_nav.scss index dc56a2c954..15f67d6eeb 100644 --- a/packages/docs-app/src/styles/_nav.scss +++ b/packages/docs-app/src/styles/_nav.scss @@ -1,11 +1,6 @@ // Copyright 2018 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "@blueprintjs/colors/lib/scss/colors" as *; -@use "@blueprintjs/core/src/common/flex" as *; -@use "@blueprintjs/core/src/common/variables" as *; -@use "@blueprintjs/docs-theme/src/styles/variables" as *; - $pkg-icon-width: 24px; $package-colors: ( diff --git a/packages/docs-app/src/styles/_resources.scss b/packages/docs-app/src/styles/_resources.scss index 803d9e520a..d5c6a04d97 100644 --- a/packages/docs-app/src/styles/_resources.scss +++ b/packages/docs-app/src/styles/_resources.scss @@ -1,10 +1,5 @@ // Copyright 2017 Palantir Technologies, Inc. All rights reserved. -@use "@blueprintjs/colors/lib/scss/colors" as *; -@use "@blueprintjs/core/src/common/color-aliases" as *; -@use "@blueprintjs/core/src/common/flex" as *; -@use "@blueprintjs/core/src/common/variables" as *; - $resources-path: "./assets"; $asset-padding: $pt-grid-size; diff --git a/packages/docs-app/src/styles/_welcome.scss b/packages/docs-app/src/styles/_welcome.scss index e03f7bcd75..cbc76b847f 100644 --- a/packages/docs-app/src/styles/_welcome.scss +++ b/packages/docs-app/src/styles/_welcome.scss @@ -1,10 +1,5 @@ // Copyright 2017 Palantir Technologies, Inc. All rights reserved. -@use "@blueprintjs/core/src/common/color-aliases" as *; -@use "@blueprintjs/core/src/common/flex" as *; -@use "@blueprintjs/core/src/common/variables" as *; -@use "@blueprintjs/docs-theme/src/styles/variables" as *; - .blueprint-welcome { @include pt-flex-container(row, $content-padding); justify-content: space-between; diff --git a/packages/docs-theme/src/docs-theme.scss b/packages/docs-theme/src/docs-theme.scss index be638f3a6d..80fb772cd1 100644 --- a/packages/docs-theme/src/docs-theme.scss +++ b/packages/docs-theme/src/docs-theme.scss @@ -5,14 +5,14 @@ Licensed under the Apache License, Version 2.0. */ -@forward "styles/api"; -@forward "styles/banner"; -@forward "styles/code-block"; -@forward "styles/code-example"; -@forward "styles/content"; -@forward "styles/examples"; -@forward "styles/layout"; -@forward "styles/navbar"; -@forward "styles/navigator"; -@forward "styles/overrides"; -@forward "styles/props"; +@import "styles/api"; +@import "styles/banner"; +@import "styles/code-block"; +@import "styles/code-example"; +@import "styles/content"; +@import "styles/examples"; +@import "styles/layout"; +@import "styles/navbar"; +@import "styles/navigator"; +@import "styles/overrides"; +@import "styles/props"; diff --git a/packages/docs-theme/src/styles/_api.scss b/packages/docs-theme/src/styles/_api.scss index 636786debc..46f9810130 100644 --- a/packages/docs-theme/src/styles/_api.scss +++ b/packages/docs-theme/src/styles/_api.scss @@ -1,9 +1,8 @@ // Copyright 2017 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "@blueprintjs/core/src/common/react-transition" as *; -@use "@blueprintjs/core/src/common/variables" as *; -@use "./variables" as *; +@import "@blueprintjs/core/src/common/react-transition"; +@import "variables"; .docs-api-drawer { .docs-modifiers { diff --git a/packages/docs-theme/src/styles/_banner.scss b/packages/docs-theme/src/styles/_banner.scss index dc2f56ba25..13e7bef3b5 100644 --- a/packages/docs-theme/src/styles/_banner.scss +++ b/packages/docs-theme/src/styles/_banner.scss @@ -1,13 +1,8 @@ // Copyright 2017 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "@blueprintjs/colors/lib/scss/colors" as *; -@use "@blueprintjs/core/src/common/color-aliases" as *; -@use "@blueprintjs/core/src/common/flex" as *; -@use "@blueprintjs/core/src/common/mixins" as *; -@use "@blueprintjs/core/src/common/variables" as *; -@use "@blueprintjs/core/src/components/button/common" as *; -@use "./variables" as *; +@import "@blueprintjs/core/src/common/variables"; +@import "@blueprintjs/core/src/components/button/common"; $banner-height: $pt-grid-size * 4; diff --git a/packages/docs-theme/src/styles/_code-block.scss b/packages/docs-theme/src/styles/_code-block.scss index 053c4a3c33..38cb96d38d 100644 --- a/packages/docs-theme/src/styles/_code-block.scss +++ b/packages/docs-theme/src/styles/_code-block.scss @@ -1,7 +1,7 @@ // Copyright 2023 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "@blueprintjs/core/src/common/variables" as *; +@import "variables"; .#{$ns}-docs-code-block { overflow: auto; diff --git a/packages/docs-theme/src/styles/_code-example.scss b/packages/docs-theme/src/styles/_code-example.scss index 6f3cdac5bb..a09df1d425 100644 --- a/packages/docs-theme/src/styles/_code-example.scss +++ b/packages/docs-theme/src/styles/_code-example.scss @@ -1,6 +1,3 @@ -@use "@blueprintjs/core/src/common/color-aliases" as *; -@use "@blueprintjs/core/src/common/variables" as *; - .docs-code-example-frame { display: flex; flex-direction: column; diff --git a/packages/docs-theme/src/styles/_content.scss b/packages/docs-theme/src/styles/_content.scss index 5541ef622b..06c0202fd7 100644 --- a/packages/docs-theme/src/styles/_content.scss +++ b/packages/docs-theme/src/styles/_content.scss @@ -1,11 +1,9 @@ // Copyright 2017 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "@blueprintjs/colors/lib/scss/colors" as *; -@use "@blueprintjs/icons/lib/scss/variables" as *; -@use "@blueprintjs/core/src/common/variables" as *; -@use "@blueprintjs/core/src/components/icon/icon-mixins" as *; -@use "./variables" as *; +@import "@blueprintjs/core/src/components/icon/icon-mixins"; +@import "@blueprintjs/icons/lib/scss/variables"; +@import "variables"; $heading-margin: $pt-grid-size * 4; $link-icon-padding: $pt-grid-size; diff --git a/packages/docs-theme/src/styles/_examples.scss b/packages/docs-theme/src/styles/_examples.scss index 221e2718e7..a85deec9d4 100644 --- a/packages/docs-theme/src/styles/_examples.scss +++ b/packages/docs-theme/src/styles/_examples.scss @@ -1,12 +1,6 @@ // Copyright 2017 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "@blueprintjs/core/src/common/color-aliases" as *; -@use "@blueprintjs/core/src/common/flex" as *; -@use "@blueprintjs/core/src/common/variables" as *; -@use "./content" as *; -@use "./variables" as *; - // Base styles for all examples $example-frame-spacing: $pt-grid-size; diff --git a/packages/docs-theme/src/styles/_layout.scss b/packages/docs-theme/src/styles/_layout.scss index 43f196d656..da03681aaf 100644 --- a/packages/docs-theme/src/styles/_layout.scss +++ b/packages/docs-theme/src/styles/_layout.scss @@ -1,12 +1,9 @@ // Copyright 2017 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "@blueprintjs/core/src/common/color-aliases" as *; -@use "@blueprintjs/core/src/common/flex" as *; -@use "@blueprintjs/core/src/common/variables" as *; -@use "@blueprintjs/core/src/components/button/common" as *; -@use "@blueprintjs/core/src/components/forms/common" as *; -@use "./variables" as *; +@import "@blueprintjs/core/src/common/flex"; +@import "@blueprintjs/core/src/components/forms/common"; +@import "variables"; $nav-item-indent: $pt-grid-size * 2; diff --git a/packages/docs-theme/src/styles/_navbar.scss b/packages/docs-theme/src/styles/_navbar.scss index 7cb430215e..9957c51c07 100644 --- a/packages/docs-theme/src/styles/_navbar.scss +++ b/packages/docs-theme/src/styles/_navbar.scss @@ -1,11 +1,8 @@ // Copyright 2017 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "@blueprintjs/colors/lib/scss/colors" as *; -@use "@blueprintjs/core/src/common/color-aliases" as *; -@use "@blueprintjs/core/src/common/flex" as *; -@use "@blueprintjs/core/src/common/variables" as *; -@use "./variables" as *; +@import "variables"; +@import "../../../core/src/components/button/common"; $nav-divider-offset: $pt-grid-size * 5; diff --git a/packages/docs-theme/src/styles/_navigator.scss b/packages/docs-theme/src/styles/_navigator.scss index 975e7e174b..4277929f96 100644 --- a/packages/docs-theme/src/styles/_navigator.scss +++ b/packages/docs-theme/src/styles/_navigator.scss @@ -1,8 +1,6 @@ // Copyright 2017 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "@blueprintjs/core/src/common/variables" as *; - $navigator-width: $pt-grid-size * 40; .docs-navigator-menu { diff --git a/packages/docs-theme/src/styles/_overrides.scss b/packages/docs-theme/src/styles/_overrides.scss index 3528cb760f..10e9c8b5ea 100644 --- a/packages/docs-theme/src/styles/_overrides.scss +++ b/packages/docs-theme/src/styles/_overrides.scss @@ -1,8 +1,6 @@ // Copyright 2017 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "@blueprintjs/core/src/common/variables" as *; - table { width: 100%; } diff --git a/packages/docs-theme/src/styles/_props.scss b/packages/docs-theme/src/styles/_props.scss index a4f1408a13..d0f2bfc760 100644 --- a/packages/docs-theme/src/styles/_props.scss +++ b/packages/docs-theme/src/styles/_props.scss @@ -1,13 +1,6 @@ // Copyright 2017 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "@blueprintjs/colors/lib/scss/colors" as *; -@use "@blueprintjs/icons/lib/scss/variables" as *; -@use "@blueprintjs/core/src/common/color-aliases" as *; -@use "@blueprintjs/core/src/common/variables" as *; -@use "@blueprintjs/core/src/components/icon/icon-mixins" as *; -@use "./content" as *; - .docs-prop-details code { /* stylelint-disable declaration-no-important */ background: none !important; diff --git a/packages/docs-theme/src/styles/_variables.scss b/packages/docs-theme/src/styles/_variables.scss index 3cc9dab707..37974a0cd8 100644 --- a/packages/docs-theme/src/styles/_variables.scss +++ b/packages/docs-theme/src/styles/_variables.scss @@ -1,8 +1,9 @@ // Copyright 2017 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "@blueprintjs/colors/lib/scss/colors" as *; -@use "@blueprintjs/core/src/common/variables" as *; +@import "@blueprintjs/colors/lib/scss/colors"; +@import "@blueprintjs/core/src/common/variables"; +@import "@blueprintjs/core/src/common/mixins"; $container-width: $pt-grid-size * 110; $container-padding: $pt-grid-size * 0.5; diff --git a/packages/icons/src/blueprint-icons.scss b/packages/icons/src/blueprint-icons.scss index 9abb25183a..cffa457e1a 100644 --- a/packages/icons/src/blueprint-icons.scss +++ b/packages/icons/src/blueprint-icons.scss @@ -3,5 +3,5 @@ Copyright 2017-present Palantir Technologies, Inc. All rights reserved. Licensed under the Apache License, Version 2.0. */ -@forward "generated/16px/blueprint-icons-16"; -@forward "generated/20px/blueprint-icons-20"; +@import "generated/16px/blueprint-icons-16"; +@import "generated/20px/blueprint-icons-20"; diff --git a/packages/icons/src/templates/_lib_variables.scss b/packages/icons/src/templates/_lib_variables.scss index eaf0cb38c9..becd75131f 100644 --- a/packages/icons/src/templates/_lib_variables.scss +++ b/packages/icons/src/templates/_lib_variables.scss @@ -1,7 +1,7 @@ // Copyright 2021 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "blueprint-icons-16" as *; -@use "blueprint-icons-20" as *; +@import "blueprint-icons-16"; +@import "blueprint-icons-20"; $blueprint-icon-codepoints: $blueprint-icons-16-codepoints; diff --git a/packages/landing-app/src/_main.scss b/packages/landing-app/src/_main.scss deleted file mode 100644 index 7ee2ed8ef5..0000000000 --- a/packages/landing-app/src/_main.scss +++ /dev/null @@ -1,179 +0,0 @@ -/* - -Copyright 2015-present Palantir Technologies, Inc. All rights reserved. -Licensed under the Apache License, Version 2.0. - -*/ -@use "@blueprintjs/colors/lib/scss/colors" as *; -@use "@blueprintjs/core/src/common/flex" as *; -@use "@blueprintjs/core/src/common/mixins" as *; -@use "@blueprintjs/core/src/common/variables" as *; -@forward "./svgs"; - -$body-background-color: $black; - -$canvas-height: 630px; -$container-width: 760px; - -$mobile-breakpoint: 425px; -$tablet-breakpoint: 768px; - -html { - background-color: $body-background-color; - text-size-adjust: 100%; -} - -body { - background-color: $body-background-color; - margin: 0; - padding: 0; -} - -.landing-container { - margin: 0 auto; - max-width: $container-width; - padding: 0 $pt-grid-size * 2; -} - -header { - background-color: transparent; - height: $canvas-height; - margin: 0; - overflow: hidden; - position: relative; - text-align: center; - user-select: none; - - .landing-container { - @include position-all(absolute, 0); - pointer-events: none; - z-index: $pt-z-index-base; - } - - h1 { - clear: both; - color: $white; - font-weight: 400; - line-height: 1.2; - margin: 0 auto; - margin-top: $pt-grid-size * 33; - } - - h3 { - color: $white; - font-weight: 400; - margin-bottom: $pt-grid-size * 3; - margin-top: $pt-grid-size * 3; - opacity: 0.8; - } - - .#{$ns}-button.landing-button { - color: rgba($white, 0.7); - pointer-events: all; - position: relative; - - &:hover { - background-color: rgba($white, 0.2); - color: rgba($white, 0.7); - } - - &:active { - background-color: rgba($white, 0.4); - color: $white; - } - } - - .#{$ns}-icon-dot { - color: rgba($white, 0.5); - margin: $pt-grid-size * 0.5; - } - - canvas { - @include position-all(absolute, 0); - } -} - -footer { - background-color: transparent; -} - -.landing-about { - .landing-container { - @include pt-flex-container(column, $pt-grid-size * 3); - align-items: center; - padding-bottom: $pt-grid-size * 6; - padding-top: $pt-grid-size * 6; - text-align: center; - } - - img { - width: $pt-grid-size * 6; - } - - p:first-of-type { - font-size: $pt-font-size-large; - } - - p:last-of-type { - font-weight: 300; - } - - .landing-separator { - background-color: $dark-gray5; - height: 2px; - width: $pt-grid-size * 4; - } -} - -.landing-copyright { - &::before { - background-image: linear-gradient( - 90deg, - rgba($white, 0) 0%, - rgba($white, 0.3) 50%, - rgba($white, 0) 100% - ); - content: ""; - display: block; - height: 1px; - } - - .landing-container { - align-items: center; - display: flex; - justify-content: space-between; - min-height: $pt-navbar-height; - padding: $pt-grid-size * 0.5; - } -} - -@media (max-width: $mobile-breakpoint) { - header { - height: $pt-grid-size * 80; - - h1 { - font-size: $pt-grid-size * 3.6; - } - - h3 { - font-size: $pt-grid-size * 1.8; - margin-bottom: $pt-grid-size * 2.5; - } - - .#{$ns}-icon-dot { - display: block; - } - } -} - -@media (max-width: $tablet-breakpoint) { - .landing-copyright { - .landing-container { - flex-direction: column; - } - - .landing-button { - margin: $pt-grid-size * 0.5; - } - } -} diff --git a/packages/landing-app/src/index.scss b/packages/landing-app/src/index.scss index fc43d49464..d992ded66f 100644 --- a/packages/landing-app/src/index.scss +++ b/packages/landing-app/src/index.scss @@ -7,4 +7,174 @@ Licensed under the Apache License, Version 2.0. @import "@blueprintjs/core/lib/css/blueprint.css"; @import "@blueprintjs/icons/lib/css/blueprint-icons.css"; -@import "./main"; +@import "@blueprintjs/colors/lib/scss/colors"; +@import "@blueprintjs/core/src/common/variables"; +@import "svgs"; + +$body-background-color: $black; + +$canvas-height: 630px; +$container-width: 760px; + +$mobile-breakpoint: 425px; +$tablet-breakpoint: 768px; + +html { + background-color: $body-background-color; + text-size-adjust: 100%; +} + +body { + background-color: $body-background-color; + margin: 0; + padding: 0; +} + +.landing-container { + margin: 0 auto; + max-width: $container-width; + padding: 0 $pt-grid-size * 2; +} + +header { + background-color: transparent; + height: $canvas-height; + margin: 0; + overflow: hidden; + position: relative; + text-align: center; + user-select: none; + + .landing-container { + @include position-all(absolute, 0); + pointer-events: none; + z-index: $pt-z-index-base; + } + + h1 { + clear: both; + color: $white; + font-weight: 400; + line-height: 1.2; + margin: 0 auto; + margin-top: $pt-grid-size * 33; + } + + h3 { + color: $white; + font-weight: 400; + margin-bottom: $pt-grid-size * 3; + margin-top: $pt-grid-size * 3; + opacity: 0.8; + } + + .#{$ns}-button.landing-button { + color: rgba($white, 0.7); + pointer-events: all; + position: relative; + + &:hover { + background-color: rgba($white, 0.2); + color: rgba($white, 0.7); + } + + &:active { + background-color: rgba($white, 0.4); + color: $white; + } + } + + .#{$ns}-icon-dot { + color: rgba($white, 0.5); + margin: $pt-grid-size * 0.5; + } + + canvas { + @include position-all(absolute, 0); + } +} + +footer { + background-color: transparent; +} + +.landing-about { + .landing-container { + @include pt-flex-container(column, $pt-grid-size * 3); + align-items: center; + padding-bottom: $pt-grid-size * 6; + padding-top: $pt-grid-size * 6; + text-align: center; + } + + img { + width: $pt-grid-size * 6; + } + + p:first-of-type { + font-size: $pt-font-size-large; + } + + p:last-of-type { + font-weight: 300; + } + + .landing-separator { + background-color: $dark-gray5; + height: 2px; + width: $pt-grid-size * 4; + } +} + +.landing-copyright { + &::before { + background-image: linear-gradient( + 90deg, + rgba($white, 0) 0%, + rgba($white, 0.3) 50%, + rgba($white, 0) 100% + ); + content: ""; + display: block; + height: 1px; + } + + .landing-container { + align-items: center; + display: flex; + justify-content: space-between; + min-height: $pt-navbar-height; + padding: $pt-grid-size * 0.5; + } +} + +@media (max-width: $mobile-breakpoint) { + header { + height: $pt-grid-size * 80; + + h1 { + font-size: $pt-grid-size * 3.6; + } + + h3 { + font-size: $pt-grid-size * 1.8; + margin-bottom: $pt-grid-size * 2.5; + } + + .#{$ns}-icon-dot { + display: block; + } + } +} + +@media (max-width: $tablet-breakpoint) { + .landing-copyright { + .landing-container { + flex-direction: column; + } + + .landing-button { + margin: $pt-grid-size * 0.5; + } + } +} diff --git a/packages/select/src/blueprint-select.scss b/packages/select/src/blueprint-select.scss index d421e910e1..2a95f483a2 100644 --- a/packages/select/src/blueprint-select.scss +++ b/packages/select/src/blueprint-select.scss @@ -5,4 +5,4 @@ Licensed under the Apache License, Version 2.0. */ -@forward "./components/index"; +@import "./components/index"; diff --git a/packages/select/src/common/_variables.scss b/packages/select/src/common/_variables.scss index 834ff40f6f..2b9f8e2834 100644 --- a/packages/select/src/common/_variables.scss +++ b/packages/select/src/common/_variables.scss @@ -4,10 +4,8 @@ // HACKHACK(https://github.com/palantir/blueprint/issues/5331): weird imports here because // core/lib/scss/variables is not available until after the 'dist' task, but at this point // we are only guaranteed 'compile' -@use "@blueprintjs/colors/lib/scss/colors" as *; -@use "@blueprintjs/core/src/common/variables" as *; +@import "@blueprintjs/colors/lib/scss/colors"; +@import "@blueprintjs/core/src/common/variables"; $select-popover-max-height: $pt-grid-size * 30 !default; $select-popover-max-width: $pt-grid-size * 40 !default; - -$select-padding: $pt-grid-size * 0.5; diff --git a/packages/select/src/components/_index.scss b/packages/select/src/components/_index.scss index 4e86681f33..8f7cc1a563 100644 --- a/packages/select/src/components/_index.scss +++ b/packages/select/src/components/_index.scss @@ -1,7 +1,7 @@ // Copyright 2017 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@forward "multi-select/multi-select"; -@forward "omnibar/omnibar"; -@forward "select/select"; -@forward "suggest/suggest"; +@import "multi-select/multi-select"; +@import "omnibar/omnibar"; +@import "select/select"; +@import "suggest/suggest"; diff --git a/packages/select/src/components/multi-select/_multi-select.scss b/packages/select/src/components/multi-select/_multi-select.scss index 4681661523..e7f3d3ff2e 100644 --- a/packages/select/src/components/multi-select/_multi-select.scss +++ b/packages/select/src/components/multi-select/_multi-select.scss @@ -1,8 +1,9 @@ // Copyright 2017 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "@blueprintjs/core/src/common/variables" as *; -@use "../../common/variables" as *; +@import "../../common/variables"; + +$select-padding: $pt-grid-size * 0.5; .#{$ns}-multi-select { min-width: $pt-grid-size * 15; diff --git a/packages/select/src/components/omnibar/_omnibar.scss b/packages/select/src/components/omnibar/_omnibar.scss index 9c522d04a7..c16c7d4bdd 100644 --- a/packages/select/src/components/omnibar/_omnibar.scss +++ b/packages/select/src/components/omnibar/_omnibar.scss @@ -4,10 +4,9 @@ // HACKHACK(https://github.com/palantir/blueprint/issues/5331): weird imports here because // core/lib/scss/variables is not available until after the 'dist' task, but at this point // we are only guaranteed 'compile' -@use "@blueprintjs/colors/lib/scss/colors" as *; -@use "@blueprintjs/core/src/common/color-aliases" as *; -@use "@blueprintjs/core/src/common/variables" as *; -@use "@blueprintjs/core/src/common/react-transition" as *; +@import "@blueprintjs/colors/lib/scss/colors"; +@import "@blueprintjs/core/src/common/variables"; +@import "@blueprintjs/core/src/common/react-transition"; $omnibar-height: 60vh !default; $omnibar-width: $pt-grid-size * 50 !default; diff --git a/packages/select/src/components/select/_select.scss b/packages/select/src/components/select/_select.scss index fa98eb75cd..a4aa659ba2 100644 --- a/packages/select/src/components/select/_select.scss +++ b/packages/select/src/components/select/_select.scss @@ -1,8 +1,9 @@ // Copyright 2017 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "@blueprintjs/core/src/common/variables" as *; -@use "../../common/variables" as *; +@import "../../common/variables"; + +$select-padding: $pt-grid-size * 0.5; .#{$ns}-select-popover { .#{$ns}-popover-content { diff --git a/packages/select/src/components/suggest/_suggest.scss b/packages/select/src/components/suggest/_suggest.scss index 62eb7d1e62..ac51c675d9 100644 --- a/packages/select/src/components/suggest/_suggest.scss +++ b/packages/select/src/components/suggest/_suggest.scss @@ -1,8 +1,7 @@ // Copyright 2022 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "@blueprintjs/core/src/common/variables" as *; -@use "../../common/variables" as *; +@import "../../common/variables"; .#{$ns}-suggest-popover { .#{$ns}-menu { diff --git a/packages/table-dev-app/src/_main.scss b/packages/table-dev-app/src/_main.scss deleted file mode 100644 index 5d6bc6181a..0000000000 --- a/packages/table-dev-app/src/_main.scss +++ /dev/null @@ -1,173 +0,0 @@ -// Copyright 2017 Palantir Technologies, Inc. All rights reserved. -// Licensed under the Apache License, Version 2.0. - -@use "@blueprintjs/colors/lib/scss/colors" as *; -@use "@blueprintjs/core/src/common/color-aliases" as *; -@use "@blueprintjs/core/src/common/variables" as *; - -body { - background-color: $pt-app-background-color; - inset: 0; - - margin: 0; - padding: 0; - position: absolute; - - .#{$ns}-dark { - background-color: $pt-dark-app-background-color; - } -} - -/* stylelint-disable-next-line selector-max-id */ -#page-content { - inset: $pt-navbar-height 0 0; - position: absolute; -} - -/** - * A simple filling layout that DOES NOT create a layout boundary (due to `display: inline-block`) - */ -.layout-passthrough-fill { - display: inline-block; - height: 100%; - position: relative; - width: 100%; -} - -/** - * A simple filling layout that DOES create a layout boundary. - * See: http://wilsonpage.co.uk/introducing-layout-boundaries/ - */ -.layout-boundary { - display: block; - inset: 0; - overflow: hidden; - position: absolute; -} - -.container { - display: flex; - height: 100%; - overflow: hidden; -} - -.table { - flex: 1 1 auto; - order: 2; - overflow: hidden; - position: relative; - z-index: 2; - - &.is-inline { - margin-left: -12.5%; - max-height: 50%; - max-width: 50%; - transform: translateX(50%) translateY(50%); - } -} - -.sidebar { - background-color: $light-gray4; - flex: 0 0 300px; - height: 100%; - order: 1; - overflow-y: auto; - padding: 15px; - z-index: 3; - - h4.#{$ns}-heading { - margin-top: $pt-grid-size * 2; - - &:first-child { - margin-top: 0; - } - } - - h6.#{$ns}-heading { - color: $pt-text-color-muted; - padding: 10px 0 3px; - } - - .#{$ns}-divider { - margin: 15px 5px; - } - - .#{$ns}-label, - .#{$ns}-control { - padding-left: $pt-grid-size; - } - - .tbl-select-label { - margin-bottom: 7px; - margin-top: -3px; - - .#{$ns}-html-select { - float: right; - } - - &.#{$ns}-disabled { - cursor: not-allowed; - } - } - - > .#{$ns}-button + .#{$ns}-button { - margin-top: 3px; - } - - .#{$ns}-dark & { - background-color: $dark-gray2; - color: $dark-gray2; - z-index: 1; - - h6.#{$ns}-heading { - color: $pt-dark-text-color-muted; - } - } -} - -.sidebar-indented-group { - margin-left: $pt-grid-size; -} - -.tbl-zebra-stripe { - background-color: $light-gray5; - - .#{$ns}-dark & { - background-color: $dark-gray5; - } -} - -.tbl-styled-region-success { - background-color: rgba($pt-intent-success, 0.1); - border: 1px solid $pt-intent-success; -} - -.tbl-styled-region-warning { - background-color: rgba($pt-intent-warning, 0.1); - border: 1px solid $pt-intent-warning; -} - -.tbl-styled-region-danger { - background-color: rgba($pt-intent-danger, 0.1); - border: 1px solid $pt-intent-danger; -} - -.tbl-custom-column-header { - line-height: 1; - padding: 7px 0; -} - -.tbl-custom-column-header-name { - font-weight: 600; -} - -.tbl-custom-column-header-type { - color: $gray1; - font-family: "Courier", monospace; - font-size: 12px; - margin-top: 3px; - - .#{$ns}-dark & { - color: $gray5; - } -} diff --git a/packages/table-dev-app/src/index.scss b/packages/table-dev-app/src/index.scss index b725f8734c..86fff92398 100644 --- a/packages/table-dev-app/src/index.scss +++ b/packages/table-dev-app/src/index.scss @@ -2,9 +2,173 @@ // Licensed under the Apache License, Version 2.0. @import "normalize.css/normalize.css"; - @import "@blueprintjs/core/lib/css/blueprint.css"; @import "@blueprintjs/icons/lib/css/blueprint-icons.css"; -@import "@blueprintjs/table/lib/css/table.css"; +@import "@blueprintjs/table/src/table"; + +body { + background-color: $pt-app-background-color; + inset: 0; + + margin: 0; + padding: 0; + position: absolute; + + .#{$ns}-dark { + background-color: $pt-dark-app-background-color; + } +} + +/* stylelint-disable-next-line selector-max-id */ +#page-content { + inset: $pt-navbar-height 0 0; + position: absolute; +} + +/** + * A simple filling layout that DOES NOT create a layout boundary (due to `display: inline-block`) + */ +.layout-passthrough-fill { + display: inline-block; + height: 100%; + position: relative; + width: 100%; +} + +/** + * A simple filling layout that DOES create a layout boundary. + * See: http://wilsonpage.co.uk/introducing-layout-boundaries/ + */ +.layout-boundary { + display: block; + inset: 0; + overflow: hidden; + position: absolute; +} + +.container { + display: flex; + height: 100%; + overflow: hidden; +} + +.table { + flex: 1 1 auto; + order: 2; + overflow: hidden; + position: relative; + z-index: 2; + + &.is-inline { + margin-left: -12.5%; + max-height: 50%; + max-width: 50%; + transform: translateX(50%) translateY(50%); + } +} + +.sidebar { + background-color: $light-gray4; + flex: 0 0 300px; + height: 100%; + order: 1; + overflow-y: auto; + padding: 15px; + z-index: 3; + + h4.#{$ns}-heading { + margin-top: $pt-grid-size * 2; + + &:first-child { + margin-top: 0; + } + } + + h6.#{$ns}-heading { + color: $pt-text-color-muted; + padding: 10px 0 3px; + } + + .#{$ns}-divider { + margin: 15px 5px; + } + + .#{$ns}-label, + .#{$ns}-control { + padding-left: $pt-grid-size; + } + + .tbl-select-label { + margin-bottom: 7px; + margin-top: -3px; + + .#{$ns}-html-select { + float: right; + } + + &.#{$ns}-disabled { + cursor: not-allowed; + } + } + + > .#{$ns}-button + .#{$ns}-button { + margin-top: 3px; + } + + .#{$ns}-dark & { + background-color: $dark-gray2; + color: $dark-gray2; + z-index: 1; + + h6.#{$ns}-heading { + color: $pt-dark-text-color-muted; + } + } +} + +.sidebar-indented-group { + margin-left: $pt-grid-size; +} + +.tbl-zebra-stripe { + background-color: $light-gray5; + + .#{$ns}-dark & { + background-color: $dark-gray5; + } +} + +.tbl-styled-region-success { + background-color: rgba($pt-intent-success, 0.1); + border: 1px solid $pt-intent-success; +} + +.tbl-styled-region-warning { + background-color: rgba($pt-intent-warning, 0.1); + border: 1px solid $pt-intent-warning; +} + +.tbl-styled-region-danger { + background-color: rgba($pt-intent-danger, 0.1); + border: 1px solid $pt-intent-danger; +} + +.tbl-custom-column-header { + line-height: 1; + padding: 7px 0; +} + +.tbl-custom-column-header-name { + font-weight: 600; +} + +.tbl-custom-column-header-type { + color: $gray1; + font-family: "Courier", monospace; + font-size: 12px; + margin-top: 3px; -@import "./main"; + .#{$ns}-dark & { + color: $gray5; + } +} diff --git a/packages/table/src/cell/_borders.scss b/packages/table/src/cell/_borders.scss index 171acfcfce..62a94fb334 100644 --- a/packages/table/src/cell/_borders.scss +++ b/packages/table/src/cell/_borders.scss @@ -1,9 +1,8 @@ // Copyright 2016 Palantir Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. -@use "@blueprintjs/core/src/common/variables" as *; -@use "../common/variables" as *; -@use "./common" as *; +@import "../common/variables"; +@import "./common"; /* We use box shadows instead of borders since it makes the size and position diff --git a/packages/table/src/cell/_cell.scss b/packages/table/src/cell/_cell.scss index 90b43f9157..2fd137b8f6 100644 --- a/packages/table/src/cell/_cell.scss +++ b/packages/table/src/cell/_cell.scss @@ -1,11 +1,8 @@ // Copyright 2016 Palantir Technologies, Inc. All rights reserved. -@use "@blueprintjs/colors/lib/scss/colors" as *; -@use "@blueprintjs/core/src/common/color-aliases" as *; -@use "@blueprintjs/core/src/common/variables" as *; -@use "../common/loading" as *; -@use "../common/variables" as *; -@use "./common" as *; +@import "../common/loading"; +@import "../common/variables"; +@import "./common"; .#{$ns}-table-cell { @include cell(); diff --git a/packages/table/src/cell/_common.scss b/packages/table/src/cell/_common.scss index 00afaddcbb..22725d81d1 100644 --- a/packages/table/src/cell/_common.scss +++ b/packages/table/src/cell/_common.scss @@ -1,9 +1,6 @@ // Copyright 2016 Palantir Technologies, Inc. All rights reserved. -@use "@blueprintjs/colors/lib/scss/colors" as *; -@use "@blueprintjs/core/src/common/color-aliases" as *; -@use "@blueprintjs/core/src/common/variables" as *; -@use "../common/variables" as *; +@import "../common/variables"; $cell-border-width: 1px !default; $frozen-cell-border-width: 3px !default; diff --git a/packages/table/src/cell/formats/_formats.scss b/packages/table/src/cell/formats/_formats.scss index ee3d270ba6..7698e393d8 100644 --- a/packages/table/src/cell/formats/_formats.scss +++ b/packages/table/src/cell/formats/_formats.scss @@ -1,9 +1,7 @@ // Copyright 2016 Palantir Technologies, Inc. All rights reserved. -@use "@blueprintjs/core/src/common/color-aliases" as *; -@use "@blueprintjs/core/src/common/variables" as *; -@use "../../common/variables" as *; -@use "../common" as *; +@import "../../common/variables"; +@import "../common"; .#{$ns}-table-null { color: $pt-text-color-disabled; diff --git a/packages/table/src/common/_loading.scss b/packages/table/src/common/_loading.scss index 96609e8e80..e6c2c88229 100644 --- a/packages/table/src/common/_loading.scss +++ b/packages/table/src/common/_loading.scss @@ -1,8 +1,8 @@ // Copyright 2017 Palantir Technologies, Inc. All rights reserved. -@use "@blueprintjs/core/src/common/variables" as *; -@use "@blueprintjs/core/src/components/skeleton/common" as *; -@use "../cell/common" as *; +@import "@blueprintjs/core/src/common/variables"; +@import "@blueprintjs/core/src/components/skeleton/common"; +@import "../cell/common"; @keyframes skeleton-fade-in { 0% { diff --git a/packages/table/src/common/_variables.scss b/packages/table/src/common/_variables.scss index 52e4ac6ce2..2cfc8d3762 100644 --- a/packages/table/src/common/_variables.scss +++ b/packages/table/src/common/_variables.scss @@ -1,8 +1,7 @@ // Copyright 2016 Palantir Technologies, Inc. All rights reserved. -@use "@blueprintjs/colors/lib/scss/colors" as *; -@use "@blueprintjs/core/src/common/color-aliases" as *; -@use "@blueprintjs/core/src/common/variables" as *; +@import "@blueprintjs/colors/lib/scss/colors"; +@import "@blueprintjs/core/src/common/variables"; // TODO: use Blueprint intents instead of duplicating... $pt-intent-colors: ( diff --git a/packages/table/src/headers/_common.scss b/packages/table/src/headers/_common.scss index 22b0dd32ff..aa7c92267e 100644 --- a/packages/table/src/headers/_common.scss +++ b/packages/table/src/headers/_common.scss @@ -1,10 +1,5 @@ // Copyright 2016 Palantir Technologies, Inc. All rights reserved. -@use "@blueprintjs/colors/lib/scss/colors" as *; -@use "@blueprintjs/core/src/common/color-aliases" as *; -@use "@blueprintjs/core/src/common/variables" as *; -@use "../common/variables" as *; - $column-header-min-height: $pt-grid-size * 3 !default; $row-header-min-width: $column-header-min-height !default; $row-header-padding: 0 $pt-grid-size * 0.5 !default; diff --git a/packages/table/src/headers/_headers.scss b/packages/table/src/headers/_headers.scss index bfa4fabea8..5934ccf6d9 100644 --- a/packages/table/src/headers/_headers.scss +++ b/packages/table/src/headers/_headers.scss @@ -1,12 +1,9 @@ // Copyright 2016 Palantir Technologies, Inc. All rights reserved. -@use "@blueprintjs/colors/lib/scss/colors" as *; -@use "@blueprintjs/core/src/common/color-aliases" as *; -@use "@blueprintjs/core/src/common/variables" as *; -@use "../common/loading" as *; -@use "../common/variables" as *; -@use "../cell/common" as *; -@use "./common" as *; +@import "../common/loading"; +@import "../common/variables"; +@import "../cell/common"; +@import "./common"; @function menu-background($color) { @return linear-gradient(90deg, rgba($color, 0) 0%, $color 50%); diff --git a/packages/table/src/interactions/_interactions.scss b/packages/table/src/interactions/_interactions.scss index d2b0ddc5a6..dfa0293513 100644 --- a/packages/table/src/interactions/_interactions.scss +++ b/packages/table/src/interactions/_interactions.scss @@ -1,8 +1,6 @@ // Copyright 2016 Palantir Technologies, Inc. All rights reserved. -@use "@blueprintjs/core/src/common/color-aliases" as *; -@use "@blueprintjs/core/src/common/variables" as *; -@use "../common/variables" as *; +@import "../common/variables"; $resize-handle-target-width: 5px !default; $resize-handle-width: 3px !default; diff --git a/packages/table/src/layers/_layers.scss b/packages/table/src/layers/_layers.scss index 925066db45..dfefd4c87b 100644 --- a/packages/table/src/layers/_layers.scss +++ b/packages/table/src/layers/_layers.scss @@ -1,10 +1,7 @@ // Copyright 2016 Palantir Technologies, Inc. All rights reserved. -@use "@blueprintjs/colors/lib/scss/colors" as *; -@use "@blueprintjs/core/src/common/color-aliases" as *; -@use "@blueprintjs/core/src/common/variables" as *; -@use "../common/variables" as *; -@use "../cell/common" as *; +@import "../common/variables"; +@import "../cell/common"; $region-default-color: $gray3 !default; $region-selected-color: $pt-intent-primary !default; diff --git a/packages/table/src/quadrants/_quadrants.scss b/packages/table/src/quadrants/_quadrants.scss index 6f0e4a5b41..5b793715d4 100644 --- a/packages/table/src/quadrants/_quadrants.scss +++ b/packages/table/src/quadrants/_quadrants.scss @@ -1,7 +1,5 @@ -@use "@blueprintjs/colors/lib/scss/colors" as *; -@use "@blueprintjs/core/src/common/mixins" as *; -@use "@blueprintjs/core/src/common/variables" as *; -@use "../common/variables" as *; +@import "@blueprintjs/core/src/common/mixins"; +@import "../common/variables"; $table-quadrant-z-index-main: 0; $table-quadrant-z-index-top: $table-quadrant-z-index-main + 1; diff --git a/packages/table/src/table.scss b/packages/table/src/table.scss index 0b2c593320..b651130857 100644 --- a/packages/table/src/table.scss +++ b/packages/table/src/table.scss @@ -5,20 +5,18 @@ Licensed under the Apache License, Version 2.0. */ -@use "@blueprintjs/colors/lib/scss/colors" as *; -@use "@blueprintjs/core/src/common/mixins" as *; -@use "@blueprintjs/core/src/common/variables" as *; -@use "./common/loading" as *; -@use "./common/variables" as *; -@use "./cell/common" as *; -@use "./headers/common" as *; -@forward "./cell/cell"; -@forward "./cell/formats/formats"; -@forward "./cell/borders"; -@forward "./headers/headers"; -@forward "./interactions/interactions"; -@forward "./layers/layers"; -@forward "./quadrants/quadrants"; +@import "@blueprintjs/colors/lib/scss/colors"; +@import "@blueprintjs/core/src/common/variables"; +@import "@blueprintjs/core/src/common/mixins"; +@import "./common/loading"; +@import "./common/variables"; +@import "./cell/cell"; +@import "./cell/formats/formats"; +@import "./cell/borders"; +@import "./headers/headers"; +@import "./interactions/interactions"; +@import "./layers/layers"; +@import "./quadrants/quadrants"; $body-z-index: $pt-z-index-content !default; $column-z-index: $body-z-index + 1 !default;