Merge branch 'master' into instantiate-modal-ie11

carbon-design-system · Mar 22, 2019 · 75c9327 · 75c9327
2 parents 3aa3d20 + a357196
commit 75c9327
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/components/link/link.hbs b/src/components/link/link.hbs
@@ -6,8 +6,8 @@
 -->
 
 <a href="#" class="{{@root.prefix}}--link">Link</a>
-<a class="{{@root.prefix}}--link">Placeholder link</a>
+<a class="{{@root.prefix}}--link" aria-disabled="true">Placeholder link</a>
 <p class="{{@root.prefix}}--link--disabled">Disabled Link</p>
-<a href="#" class="{{@root.prefix}}--link">Lorem ipsum dolor sit amet consectetur adipisicing elit. Corrupti explicabo
-  nobis consequatur quod qui quam laboriosam placeat repudiandae. Ducimus ea aut omnis asperiores mollitia
-  necessitatibus architecto temporibus provident quo? Repellat!</a>
+<div style="width:200px">
+  <a href="#" class="{{@root.prefix}}--link">Text wrap example for hover, focus, and active state testing.</a>
+</div>
diff --git a/src/components/tabs/_tabs.scss b/src/components/tabs/_tabs.scss
@@ -428,7 +428,6 @@
       width: rem(160px);
       margin: 0;
       line-height: inherit;
-      overflow: visible;
 
       &:focus,
       &:active {