Skip to content
This repository has been archived by the owner on Sep 5, 2024. It is now read-only.

Commit

Permalink
fix(tabs): resolves issue where md-no-bar was throwing errors witho…
Browse files Browse the repository at this point in the history
…ut `md-no-ink`

Closes #1182.

fix(subheader): fixes a z-index issue for fixed subheader

Closes #1034.

fix(styles): replaces css selector that was too general

Closes #1194.

feat(button): adds `md-mini` class for mini fab buttons

Closes #1173.
  • Loading branch information
robertmesserle authored and Robert Messerle committed Jan 23, 2015
1 parent 299e155 commit f463787
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 3 deletions.
10 changes: 10 additions & 0 deletions src/components/button/button.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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]) {
Expand Down
2 changes: 1 addition & 1 deletion src/components/dialog/dialog.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
Expand Down
3 changes: 3 additions & 0 deletions src/components/subheader/subheader.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
4 changes: 2 additions & 2 deletions src/components/tabs/js/inkBarDirective.js
Original file line number Diff line number Diff line change
Expand Up @@ -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.debounce(updateBar);
Expand All @@ -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');

Expand Down

0 comments on commit f463787

Please sign in to comment.