Merge branch 'main' into 8569-sketch-artboard-repositioning-bug

carbon-design-system · May 12, 2021 · 0cde748 · 0cde748
2 parents caae0ed + c334c5d
commit 0cde748
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 18 deletions.
diff --git a/packages/components/src/components/number-input/_number-input.scss b/packages/components/src/components/number-input/_number-input.scss
@@ -376,18 +376,18 @@
     background-color: $field-02;
   }
 
-  .#{$prefix}--number--light .#{$prefix}--number__control-btn:focus::before,
-  .#{$prefix}--number--light .#{$prefix}--number__control-btn:focus::after {
-    background-color: transparent;
-  }
-
   // V11: Possibly deprecate
   .#{$prefix}--number--light .#{$prefix}--number__control-btn:hover,
   .#{$prefix}--number--light .#{$prefix}--number__control-btn:hover::before,
   .#{$prefix}--number--light .#{$prefix}--number__control-btn:hover::after {
     background-color: $hover-light-ui;
   }
 
+  .#{$prefix}--number--light .#{$prefix}--number__control-btn:focus::before,
+  .#{$prefix}--number--light .#{$prefix}--number__control-btn:focus::after {
+    background-color: transparent;
+  }
+
   // Size Variant styles
   // TODO V11: Remove xl selector
   .#{$prefix}--number--xl input[type='number'],

diff --git a/packages/react/src/components/Tag/Tag-story.js b/packages/react/src/components/Tag/Tag-story.js
@@ -102,19 +102,6 @@ _Default.parameters = {
   },
 };
 
-export const VerticalAlignment = () => (
-  <>
-    <Tag type="gray">Tag 1</Tag>
-    <Tag type="gray" renderIcon={Compass16}>
-      Tag 2
-    </Tag>
-    <Tag type="gray" filter>
-      Tag 3
-    </Tag>
-    <Tag type="gray">Tag 3</Tag>
-  </>
-);
-
 export const Filter = () => (
   <Tag className="some-class" {...props.filter()} filter>
     {text('Content (children)', 'This is a tag')}