Skip to content

Commit

Permalink
fix(toolbar): disable view encapsulation. (#678)
Browse files Browse the repository at this point in the history
* Disables the view encapsulation for the toolbar component.
  To be consistent with other components and simplify custom styling.

Fixes #676.
  • Loading branch information
devversion authored and jelbourn committed Jun 13, 2016
1 parent f7bf148 commit 5c4dc04
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/components/toolbar/toolbar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ $md-toolbar-padding: 16px !default;
color: md-color($palette, default-contrast);
}

:host {
md-toolbar {
display: flex;
box-sizing: border-box;

Expand Down
4 changes: 3 additions & 1 deletion src/components/toolbar/toolbar.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import {
Component,
ChangeDetectionStrategy,
Input
Input,
ViewEncapsulation
} from '@angular/core';
import {Renderer} from '@angular/core';
import {ElementRef} from '@angular/core';
Expand All @@ -12,6 +13,7 @@ import {ElementRef} from '@angular/core';
templateUrl: 'toolbar.html',
styleUrls: ['toolbar.css'],
changeDetection: ChangeDetectionStrategy.OnPush,
encapsulation: ViewEncapsulation.None
})
export class MdToolbar {

Expand Down

0 comments on commit 5c4dc04

Please sign in to comment.