update(tabs): fixes tab styles, reduces size of getLabel method

angular · Mar 27, 2015 · 0e1820c · 0e1820c
1 parent 76f627c
commit 0e1820c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/src/components/tabs/js/tabDirective.js b/src/components/tabs/js/tabDirective.js
@@ -92,13 +92,7 @@
       scope.$on('$destroy', function () { ctrl.removeTab(data); });
 
       function getLabel () {
-        //-- if label provided, then send label
-        if (attr.label) return attr.label;
-        //-- otherwise, we have to search for the `md-tab-label` element
-        var label = element.find('md-tab-label');
-        if (label.length) return label.html();
-        //-- otherwise, we have no label.
-        return element.html();
+        return attr.label || (element.find('md-tab-label')[0] || element[0]).innerHTML;
       }
 
       function getTemplate () {

diff --git a/src/components/tabs/tabs.scss b/src/components/tabs/tabs.scss
@@ -17,7 +17,7 @@ md-tabs {
   border-radius: 2px;
   overflow: hidden;
   position: relative;
-  &:not('.md-no-tab-content') {
+  &:not(.md-no-tab-content) {
     min-height: 200 + $tabs-header-height;
   }
   &[md-align-tabs="bottom"] {