Merge branch 'master' into update-endgame

carbon-design-system · Nov 11, 2019 · 344c141 · 344c141
2 parents a2f71df + e907adf
commit 344c141
Show file tree

Hide file tree

Showing 32 changed files with 8,613 additions and 16,270 deletions.
diff --git a/packages/components/docs/sass.md b/packages/components/docs/sass.md
diff --git a/packages/components/src/components/modal/_modal.scss b/packages/components/src/components/modal/_modal.scss
@@ -107,7 +107,7 @@
 
   .#{$prefix}--modal-header {
     padding-top: 1rem;
-    margin-bottom: $carbon--spacing-05;
+    margin-bottom: $carbon--spacing-03;
   }
 
   .#{$prefix}--modal-header__label {
@@ -127,10 +127,14 @@
     @include type-style('body-long-01');
 
     overflow-y: auto;
-    margin-bottom: $carbon--spacing-09;
+    margin-bottom: $carbon--spacing-08;
     color: $text-01;
     font-weight: 400;
 
+    // Required to accommodate focus outline's negative offset:
+    padding-top: $carbon--spacing-03;
+    padding-bottom: $carbon--spacing-03;
+
     &:focus {
       @include focus-outline('outline');
     }

diff --git a/packages/components/src/components/tabs/_tabs.scss b/packages/components/src/components/tabs/_tabs.scss
@@ -42,7 +42,7 @@
     display: flex;
     align-items: center;
     justify-content: space-between;
-    padding: 0 $carbon--spacing-05;
+    padding: 0 $spacing-05;
     height: rem(40px);
     cursor: pointer;
     color: $text-01;
@@ -295,12 +295,12 @@
     color: $text-02;
     text-decoration: none;
     font-weight: 400;
-    padding: $carbon--spacing-04 0;
+    padding: $spacing-04 0;
     width: calc(100% - 32px);
     height: rem(40px);
     white-space: nowrap;
     text-overflow: ellipsis;
-    margin: 0 $carbon--spacing-05;
+    margin: 0 $spacing-05;
     line-height: rem(16px);
     border-bottom: 1px solid $ui-03;
     overflow: hidden;
@@ -317,15 +317,15 @@
 
     @include carbon--breakpoint(md) {
       border-bottom: $tab-underline-color;
-      padding: $carbon--spacing-03 $carbon--spacing-05;
+      padding: $spacing-03 $spacing-05;
       width: rem(160px);
       margin: 0;
       line-height: inherit;
 
       &:focus,
       &:active {
         width: rem(160px);
-        padding: $carbon--spacing-03 $carbon--spacing-05;
+        padding: $spacing-03 $spacing-05;
         border-bottom: 2px;
       }
     }