Merge branch 'master' into update-prop-types

carbon-design-system · Mar 25, 2020 · 81c1c33 · 81c1c33
2 parents 4ded705 + b558e58
commit 81c1c33
Show file tree

Hide file tree

Showing 5 changed files with 346 additions and 286 deletions.
diff --git a/packages/components/src/components/select/_select.scss b/packages/components/src/components/select/_select.scss
@@ -140,9 +140,11 @@
   }
 
   .#{$prefix}--select__arrow {
-    fill: $ui-05;
     position: absolute;
+    top: 0;
     right: $spacing-05;
+    height: 100%;
+    fill: $ui-05;
     pointer-events: none;
   }
 

diff --git a/packages/type/examples/preview/index.js b/packages/type/examples/preview/index.js
@@ -79,6 +79,35 @@ function FontFaces() {
           </tr>
         </tbody>
       </table>
+      <table>
+        <caption>IBM Plex Sans Condensed</caption>
+        <thead>
+          <tr>
+            <td>Weight</td>
+            <td>Sample</td>
+          </tr>
+        </thead>
+        <tbody>
+          <tr>
+            <td>Light</td>
+            <td className="bx--type-sans-condensed bx--type-light">Light</td>
+          </tr>
+          <tr>
+            <td>Regular</td>
+            <td className="bx--type-sans-condensed">Regular</td>
+          </tr>
+          <tr>
+            <td>Regular Italic</td>
+            <td className="bx--type-sans-condensed bx--type-italic">Regular</td>
+          </tr>
+          <tr>
+            <td>Semibold</td>
+            <td className="bx--type-sans-condensed bx--type-semibold">
+              Semibold
+            </td>
+          </tr>
+        </tbody>
+      </table>
       <table>
         <caption>IBM Plex Serif</caption>
         <thead>

diff --git a/packages/type/examples/preview/styles.scss b/packages/type/examples/preview/styles.scss
@@ -1,5 +1,6 @@
 @import '../../scss/type';
 @import '../../scss/font-face/sans';
+@import '../../scss/font-face/sans-condensed';
 @import '../../scss/font-face/serif';
 @import '../../scss/font-face/mono';
 @import '../../scss/classes';
@@ -8,13 +9,15 @@
 @include carbon--type-classes();
 
 @include carbon--font-face-sans();
+@include carbon--font-face-sans-condensed();
 @include carbon--font-face-serif();
 @include carbon--font-face-mono();
 
 //------------------------------------------------------------------------------
 // Font-face
 //------------------------------------------------------------------------------
 .bx--type-sans,
+.bx--type-sans-condensed,
 .bx--type-serif,
 .bx--type-mono {
   @include carbon--font-size(8);