Merge branch 'main' into sstrubberg-patch-1-1

carbon-design-system · Sep 20, 2021 · 6e292fa · 6e292fa
2 parents e6053a9 + aa4f2b9
commit 6e292fa
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/packages/components/src/components/progress-indicator/_progress-indicator.scss b/packages/components/src/components/progress-indicator/_progress-indicator.scss
@@ -102,7 +102,7 @@
     margin-right: 0.75rem;
   }
 
-  .#{$prefix}--progress-label:active {
+  .#{$prefix}--tooltip__label.#{$prefix}--progress-label:active {
     box-shadow: 0 rem(3px) 0 0 $interactive-01;
     color: $interactive-01;
   }

diff --git a/packages/components/src/components/slider/_slider.scss b/packages/components/src/components/slider/_slider.scss
@@ -31,7 +31,9 @@
     width: 100%;
     min-width: rem(200px);
     max-width: rem(640px);
+    padding: $spacing-05 0;
     margin: 0 $carbon--spacing-05;
+    cursor: pointer;
   }
 
   .#{$prefix}--slider__range-label {
@@ -50,7 +52,6 @@
     width: 100%;
     height: rem(2px);
     background: $ui-03;
-    cursor: pointer;
     transform: translate(0%, -50%);
   }
 
@@ -80,13 +81,11 @@
   .#{$prefix}--slider__thumb {
     position: absolute;
     z-index: 3;
-    top: 0;
     width: rem(14px);
     height: rem(14px);
     background: $ui-05;
     border-radius: 50%;
     box-shadow: inset 0 0 0 1px transparent, inset 0 0 0 2px transparent;
-    cursor: pointer;
     outline: none;
     transform: translate(-50%, -50%);
     transition: transform $duration--fast-02 motion(standard, productive),
@@ -143,6 +142,10 @@
     color: $disabled-02;
   }
 
+  .#{$prefix}--slider--disabled.#{$prefix}--slider {
+    cursor: not-allowed;
+  }
+
   .#{$prefix}--slider--disabled .#{$prefix}--slider__thumb {
     background-color: $ui-03;
 
@@ -170,7 +173,6 @@
     .#{$prefix}--slider__thumb:focus
     ~ .#{$prefix}--slider__filled-track {
     background-color: $ui-03;
-    cursor: not-allowed;
   }
 
   .#{$prefix}--slider--disabled