Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/red-clocks-battle.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@shopify/polaris': patch
---

Removed comments after stylelint rule changes that are breaking the rules
15 changes: 0 additions & 15 deletions polaris-react/src/components/Navigation/Navigation.scss
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,6 @@ $disabled-fade: 0.6;
.Badge {
margin-left: var(--p-space-2);
display: inline-flex;
// stylelint-disable-next-line -- ensures badges are the same height as the text
height: var(--p-font-line-height-2);
margin-top: calc(var(--p-space-2) + var(--p-space-05));
margin-right: var(--p-space-4);
Expand Down Expand Up @@ -214,7 +213,6 @@ $disabled-fade: 0.6;
}

.ItemInnerWrapper {
// stylelint-disable-next-line -- required for absolute positioning of actions
position: relative;
display: flex;
flex-wrap: nowrap;
Expand Down Expand Up @@ -255,25 +253,20 @@ $disabled-fade: 0.6;
}

.SecondaryActions {
// stylelint-disable-next-line -- horizontal action icons layout
display: flex;
// stylelint-disable-next-line -- ensures correct height of actions
height: nav(mobile-height);

&:last-child {
margin-right: calc(var(--p-space-2) + var(--p-space-05));
}

@media #{$p-breakpoints-md-up} {
// stylelint-disable-next-line -- ensures correct height of actions
height: nav(desktop-height);
}
}

.ItemWithFloatingActions {
// stylelint-disable-next-line -- required for absolute positioning of actions
position: relative;
// stylelint-disable-next-line -- position actions to to the right of label
display: flex;
flex-wrap: nowrap;

Expand All @@ -285,11 +278,8 @@ $disabled-fade: 0.6;
.ItemInnerWrapper-display-actions-on-hover {
@media #{$p-breakpoints-md-up} {
.SecondaryActions {
// stylelint-disable-next-line -- position floating actions at top right
position: absolute;
// stylelint-disable-next-line -- position floating actions at top right
top: 0;
// stylelint-disable-next-line -- position floating actions at top right
right: 0;
background: var(--p-background-hovered);
visibility: hidden;
Expand All @@ -300,15 +290,10 @@ $disabled-fade: 0.6;
&::before {
content: '';
pointer-events: none;
// stylelint-disable-next-line -- required for fade effect
position: absolute;
// stylelint-disable-next-line -- required for fade effect
right: 100%;
// stylelint-disable-next-line -- required for fade effect
display: block;
// stylelint-disable-next-line -- required for fade effect
height: 100%;
// stylelint-disable-next-line -- required for fade effect
width: var(--p-space-8);
// stylelint-disable-next-line -- required for fade effect
background: linear-gradient(
Expand Down
1 change: 0 additions & 1 deletion polaris-react/src/components/Tooltip/Tooltip.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
.TooltipContainer {
// stylelint-disable-next-line -- The rule "property-disallowed-list" is not applicable since there does not exist a layout component that only sets the display property
display: flex;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,13 @@

&::after {
content: '';
// stylelint-disable-next-line -- No Polaris layout component offers this
position: absolute;
// stylelint-disable-next-line -- No Polaris layout component offers this
top: calc(var(--p-space-4) * -1);
// stylelint-disable-next-line -- No Polaris layout component offers this
left: calc(
var(--pc-tooltip-chevron-x-pos) - var(--p-space-2) - var(--p-space-4)
);
// stylelint-disable-next-line -- No Polaris layout component offers this
height: 0;
// stylelint-disable-next-line -- No Polaris layout component offers this
width: 0;
border-width: var(--p-space-2);
border-style: solid;
Expand All @@ -40,9 +36,7 @@

&.positionedAbove {
&::after {
// stylelint-disable-next-line -- No Polaris layout component offers this
top: auto;
// stylelint-disable-next-line -- No Polaris layout component offers this
bottom: calc(var(--p-space-4) * -1);
border-color: var(--p-surface) transparent transparent transparent;
}
Expand Down