Merge branch 'master' into text-input-height-variations

carbon-design-system · Jan 21, 2020 · c1fe65a · c1fe65a
2 parents 4ec8c07 + d36f6ba
commit c1fe65a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/packages/components/src/components/list/_list.scss b/packages/components/src/components/list/_list.scss
@@ -46,8 +46,21 @@
     margin-top: 0;
   }
 
-  .#{$prefix}--list--ordered {
-    list-style-type: decimal;
+  .#{$prefix}--list--ordered:not(.#{$prefix}--list--nested) {
+    counter-reset: item;
+  }
+
+  .#{$prefix}--list--ordered:not(.#{$prefix}--list--nested)
+    > .#{$prefix}--list__item {
+    position: relative;
+  }
+
+  .#{$prefix}--list--ordered:not(.#{$prefix}--list--nested)
+    > .#{$prefix}--list__item::before {
+    content: counter(item) '.';
+    counter-increment: item;
+    position: absolute;
+    left: rem(-24px);
   }
 
   .#{$prefix}--list--ordered.#{$prefix}--list--nested {

diff --git a/packages/react/src/components/Tabs/Tabs-story.js b/packages/react/src/components/Tabs/Tabs-story.js
@@ -58,7 +58,7 @@ const TabContentRenderedOnlyWhenSelected = ({
   ...other
 }) =>
   !selected ? (
-    <div {...other} ciassName="bx--visually-hidden" />
+    <div {...other} className={`${prefix}--visually-hidden`} />
   ) : (
     <div
       {...other}