diff --git a/integration/__tests__/cluster-pages.tests.ts b/integration/__tests__/cluster-pages.tests.ts index 41d1655314..1a9927f13e 100644 --- a/integration/__tests__/cluster-pages.tests.ts +++ b/integration/__tests__/cluster-pages.tests.ts @@ -337,7 +337,6 @@ utils.describeIf(minikubeReady(TEST_NAMESPACE))("Minikube based tests", () => { await frame.waitForSelector(`.Menu >> text="Settings"`); await frame.waitForSelector(`.Menu >> text="Disconnect"`); await frame.waitForSelector(`.Menu >> text="Delete"`); - await frame.click(`[data-testid="sidebar-cluster-dropdown"]`); }); it("should navigate around common cluster pages", async () => { diff --git a/src/renderer/components/animate/animate.scss b/src/renderer/components/animate/animate.scss index 8b6260c2d6..0b60dd45ac 100644 --- a/src/renderer/components/animate/animate.scss +++ b/src/renderer/components/animate/animate.scss @@ -21,43 +21,43 @@ // Animations -@mixin animate-opacity() { +@mixin animate-opacity($enterDuration: var(--enter-duration), $leaveDuration: var(--leave-duration)) { opacity: 0; &.enter { transition-property: opacity; - transition-duration: var(--enter-duration); + transition-duration: $enterDuration; opacity: 1; } &.leave { - transition-duration: var(--leave-duration); + transition-duration: $leaveDuration; transition-timing-function: ease-out; opacity: 0; } } -@mixin animate-slide-right() { +@mixin animate-slide-right($enterDuration: var(--enter-duration), $leaveDuration: var(--leave-duration)) { transform: translateX(100%); will-change: transform; &.enter { transform: translateX(0); - transition: transform var(--enter-duration); + transition: transform $enterDuration; transition-timing-function: ease-in-out; } &.leave { transform: translateX(100%); - transition: transform var(--leave-duration); + transition: transform $leaveDuration; } } -@mixin animate-opacity-scale() { +@mixin animate-opacity-scale($enterDuration: var(--enter-duration), $leaveDuration: var(--leave-duration)) { opacity: 0; &.enter { - transition: opacity var(--enter-duration); + transition: opacity $enterDuration; opacity: 1; } @@ -65,7 +65,7 @@ will-change: opacity, transform; opacity: 0; transform: scale(1.25); - transition: transform var(--leave-duration) ease-in, opacity var(--leave-duration) ease-out; + transition: transform $leaveDuration ease-in, opacity $leaveDuration ease-out; } } diff --git a/src/renderer/components/dialog/dialog.tsx b/src/renderer/components/dialog/dialog.tsx index 6c34c5eb0c..be28789eff 100644 --- a/src/renderer/components/dialog/dialog.tsx +++ b/src/renderer/components/dialog/dialog.tsx @@ -167,7 +167,7 @@ export class Dialog extends React.PureComponent { if (animated) { dialog = ( - + {dialog} );