Skip to content

Commit

Permalink
responding to feedback
Browse files Browse the repository at this point in the history
  • Loading branch information
andrewseguin committed Nov 9, 2016
1 parent 755cd7e commit 3067f8b
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 9 deletions.
2 changes: 1 addition & 1 deletion src/demo-app/tabs/tabs-demo.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
.md-tab-header {
background: #f9f9f9;
}
md-tab-body {
.md-tab-body-content {
padding: 12px;
}
}
6 changes: 4 additions & 2 deletions src/lib/tabs/_tabs-common.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

$md-tab-bar-height: 48px !default;

$md-tab-animation-duration: 500ms !default;

// Mixin styles for labels that are contained within the tab header.
@mixin tab-label {
line-height: $md-tab-bar-height;
Expand Down Expand Up @@ -36,5 +38,5 @@ $md-tab-bar-height: 48px !default;
position: absolute;
bottom: 0;
height: 2px;
transition: 500ms ease-out;
}
transition: $md-tab-animation-duration $ease-in-out-curve-function;
}
2 changes: 1 addition & 1 deletion src/lib/tabs/tab-body.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
(@position.start)="_onAnimationStarted($event)"
(@position.done)="_onAnimationComplete($event)">
<template portalHost></template>
</div>
</div>
2 changes: 1 addition & 1 deletion src/lib/tabs/tab-group.scss
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ md-ink-bar {
position: relative;
overflow: hidden;
display: flex;
transition: height 500ms $ease-in-out-curve-function;
transition: height $md-tab-animation-duration $ease-in-out-curve-function;
}

// Wraps each tab body
Expand Down
8 changes: 4 additions & 4 deletions src/lib/tabs/tabs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -300,10 +300,10 @@ export type MdTabBodyActiveState = 'left' | 'center' | 'right';
templateUrl: 'tab-body.html',
animations: [
trigger('position', [
state('left', style({transform: 'translateX(-100%)'})),
state('center', style({transform: 'translateX(0%)'})),
state('right', style({transform: 'translateX(100%)'})),
transition('* => *', animate('0.5s cubic-bezier(0.35, 0, 0.25, 1)')),
state('left', style({transform: 'translate3d(-100%, 0, 0)'})),
state('center', style({transform: 'translate3d(0, 0, 0)'})),
state('right', style({transform: 'translate3d(100%, 0, 0)'})),
transition('* => *', animate('500ms cubic-bezier(0.35, 0, 0.25, 1)')),
])
]
})
Expand Down

0 comments on commit 3067f8b

Please sign in to comment.