fix(tabs): remove flex; bring ink into same parent as links (#3331)

angular · Mar 1, 2017 · 00de2d7 · 00de2d7
1 parent e3ba1e1
commit 00de2d7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/lib/tabs/tab-nav-bar/tab-nav-bar.html b/src/lib/tabs/tab-nav-bar/tab-nav-bar.html
@@ -1,5 +1,5 @@
 <div class="mat-tab-links">
   <ng-content></ng-content>
+  <md-ink-bar></md-ink-bar>
 </div>
 
-<md-ink-bar></md-ink-bar>
diff --git a/src/lib/tabs/tab-nav-bar/tab-nav-bar.scss b/src/lib/tabs/tab-nav-bar/tab-nav-bar.scss
@@ -7,13 +7,14 @@
 }
 
 .mat-tab-links {
-  display: flex;
   position: relative;
 }
 
 // Wraps each link in the header
 .mat-tab-link {
   @include tab-label;
+  display: inline-block;
+  vertical-align: top;
   text-decoration: none;  // Removes anchor underline styling
   position: relative;
   overflow: hidden;  // Keeps the ripple from extending outside the element bounds