From 25ae5dee08d55bd8a0686ef63f3a60967cb39357 Mon Sep 17 00:00:00 2001 From: Aaron Casanova <32409546+aaronccasanova@users.noreply.github.com> Date: Mon, 31 Jan 2022 15:57:08 -0800 Subject: [PATCH] feat: Collocate SCSS mixins with ResourceList component --- src/components/BulkActions/BulkActions.scss | 1 + src/components/CheckableButton/CheckableButton.scss | 1 + src/components/ResourceList/_variables.scss | 12 ++++++++++++ src/styles/_common.scss | 1 - src/styles/shared/_private-breakpoints.scss | 13 ------------- 5 files changed, 14 insertions(+), 14 deletions(-) delete mode 100644 src/styles/shared/_private-breakpoints.scss diff --git a/src/components/BulkActions/BulkActions.scss b/src/components/BulkActions/BulkActions.scss index e59f2fe0c28..0ee46459f9a 100644 --- a/src/components/BulkActions/BulkActions.scss +++ b/src/components/BulkActions/BulkActions.scss @@ -1,4 +1,5 @@ @import '../../styles/common'; +@import '../ResourceList/variables'; $bulk-actions-button-stacking-order: ( focused: 20, diff --git a/src/components/CheckableButton/CheckableButton.scss b/src/components/CheckableButton/CheckableButton.scss index 9b7e6411e44..588942c0df0 100644 --- a/src/components/CheckableButton/CheckableButton.scss +++ b/src/components/CheckableButton/CheckableButton.scss @@ -1,4 +1,5 @@ @import '../../styles/common'; +@import '../ResourceList/variables'; $button-vertical-padding: calc( (var(--p-line-height-6) - var(--p-line-height-2) - 2px) / 2 diff --git a/src/components/ResourceList/_variables.scss b/src/components/ResourceList/_variables.scss index 4506fdbdbd6..5b2775410bd 100644 --- a/src/components/ResourceList/_variables.scss +++ b/src/components/ResourceList/_variables.scss @@ -17,3 +17,15 @@ $resource-list-variables: ( @function resource-list($variable) { @return map-get($resource-list-variables, $variable); } + +@mixin page-before-resource-list-small() { + @include breakpoint-before(resource-list(breakpoint-small)) { + @content; + } +} + +@mixin page-after-resource-list-small() { + @include breakpoint-after(resource-list(breakpoint-small)) { + @content; + } +} diff --git a/src/styles/_common.scss b/src/styles/_common.scss index 20b70a3d932..c2d4db86609 100644 --- a/src/styles/_common.scss +++ b/src/styles/_common.scss @@ -9,7 +9,6 @@ @import './shared/accessibility'; @import './shared/breakpoints'; -@import './shared/private-breakpoints'; @import './shared/buttons'; @import './shared/controls'; @import './shared/forms'; diff --git a/src/styles/shared/_private-breakpoints.scss b/src/styles/shared/_private-breakpoints.scss deleted file mode 100644 index 7daf7c1b37c..00000000000 --- a/src/styles/shared/_private-breakpoints.scss +++ /dev/null @@ -1,13 +0,0 @@ -$resource-list-small: 458px; - -@mixin page-before-resource-list-small() { - @include breakpoint-before($resource-list-small) { - @content; - } -} - -@mixin page-after-resource-list-small() { - @include breakpoint-after($resource-list-small) { - @content; - } -}