diff --git a/src/components/button/button.scss b/src/components/button/button.scss index 64a70b2ff14..73762bc15cc 100644 --- a/src/components/button/button.scss +++ b/src/components/button/button.scss @@ -5,6 +5,8 @@ $button-padding: 2px 6px 3px !default; $button-fab-width: 56px !default; $button-fab-height: 56px !default; $button-fab-padding: 16px !default; +$button-fab-mini-width: 40px !default; +$button-fab-mini-height: 40px !default; $button-fab-toast-offset: $button-fab-height * 0.75; @@ -102,6 +104,14 @@ $button-fab-toast-offset: $button-fab-height * 0.75; margin-top: 0; } + &.md-mini { + width: $button-fab-mini-width; + height: $button-fab-mini-height; + md-icon { + line-height: $button-fab-mini-height; + } + } + } &:not([disabled]) { diff --git a/src/components/dialog/dialog.scss b/src/components/dialog/dialog.scss index 3a5261c5158..83138aba7cd 100644 --- a/src/components/dialog/dialog.scss +++ b/src/components/dialog/dialog.scss @@ -39,7 +39,7 @@ md-dialog { overflow: auto; -webkit-overflow-scrolling: touch; - &:not([layout=row]) *:first-child { + &:not([layout=row]) > *:first-child { margin-top: 0px; } } diff --git a/src/components/subheader/subheader.scss b/src/components/subheader/subheader.scss index aea1370e9f1..7dac7069f92 100644 --- a/src/components/subheader/subheader.scss +++ b/src/components/subheader/subheader.scss @@ -44,6 +44,9 @@ $subheader-sticky-shadow: 0px 2px 4px 0 rgba(0,0,0,0.16) !default; } transition: 0.2s ease-out margin; + &.md-sticky-clone { + z-index: 2; + } &[sticky-state="active"] { margin-top: -2px; } diff --git a/src/components/tabs/js/inkBarDirective.js b/src/components/tabs/js/inkBarDirective.js index 6e9b8c2a4df..74920ec0dea 100644 --- a/src/components/tabs/js/inkBarDirective.js +++ b/src/components/tabs/js/inkBarDirective.js @@ -20,7 +20,7 @@ function MdTabInkDirective($$rAF) { }; function postLink(scope, element, attr, ctrls) { - if (ctrls[0]) return; + var mdNoBar = !!ctrls[0]; var tabsCtrl = ctrls[1], debouncedUpdateBar = $$rAF.throttle(updateBar); @@ -31,7 +31,7 @@ function MdTabInkDirective($$rAF) { function updateBar() { var selected = tabsCtrl.getSelectedItem(); - var hideInkBar = !selected || tabsCtrl.count() < 2; + var hideInkBar = !selected || tabsCtrl.count() < 2 || mdNoBar; element.css('display', hideInkBar ? 'none' : 'block');