Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions demos/app/app.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ import { Component } from "@angular/core";
template:`
<h1 style="text-align: center">Zero Blocks Samples</h1>
<nav style="width: 100%; display: flex; justify-content: center;">
<ig-button type="flat" routerLink="/inputs">Inputs</ig-button>
<ig-button type="flat" routerLink="/carousel">Carousel</ig-button>
<ig-button type="flat" routerLink="/tabbar">TabBar</ig-button>
<ig-button type="flat" routerLink="/list">List</ig-button>
<ig-button type="flat" routerLink="/buttons">Buttons</ig-button>
<ig-button type="flat" routerLink="/avatar">Avatar</ig-button>
<ig-button type="flat" routerLink="/navigation-drawer">Navigation Drawer</ig-button>
<span igButton routerLink="/inputs">Inputs</span>
<span igButton routerLink="/carousel">Carousel</span>
<span igButton routerLink="/tabbar">TabBar</span>
<span igButton routerLink="/list">List</span>
<span igButton routerLink="/buttons">Buttons</span>
<span igButton routerLink="/avatar">Avatar</span>
<span igButton routerLink="/navigation-drawer">Navigation Drawer</span>
</nav>
<router-outlet></router-outlet>
`
Expand Down
2 changes: 1 addition & 1 deletion demos/app/avatarsample.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ import { AvatarModule, Avatar } from "../../src/avatar/avatar";
</tr>
</table>
</div>
<ig-button type="raised" (click)="changeLink()">Change Image</ig-button>
<span igButton="raised" (click)="changeLink()">Change Image</span>
`
})
export class AvatarSampleComponent {
Expand Down
12 changes: 6 additions & 6 deletions demos/app/buttonssample.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,25 @@ import { ButtonModule } from "../../src/button/button";
template: `
<h3>Buttons</h3>
<div>
<ig-button type="flat">Flat</ig-button>
<span igButton="flat">Flat</span>
</div>
<br>
<div>
<ig-button type="raised">Raised</ig-button>
<span igButton="raised">Raised</span>
</div>
<br>
<div>
<ig-button type="gradient">Gradient</ig-button>
<span igButton="gradient">Gradient</span>
</div>
<br>
<div>
<ig-button type="raised" disabled>Disabled</ig-button>
<span igButton="raised" disabled>Disabled</span>
</div>
<br>
<div>
<ig-button type="fab">
<a igButton="fab">
<i class="material-icons">alarm_add</i>
</ig-button>
</a>
</div>
`
})
Expand Down
4 changes: 2 additions & 2 deletions dist/zero-blocks.css

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/zero-blocks.material.css

Large diffs are not rendered by default.

5 changes: 0 additions & 5 deletions src/button/button.html

This file was deleted.

42 changes: 32 additions & 10 deletions src/button/button.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,30 @@
import { Directive, Component, Input, Output, ElementRef, ViewChild, NgModule } from '@angular/core';
import { Directive, ElementRef, HostListener, Input, Renderer, NgModule } from '@angular/core';

import { CommonModule } from '@angular/common';

@Component({
selector: 'ig-button',
moduleId: module.id, // commonJS standard
templateUrl: 'button.html'
@Directive({
selector: '[igButton]',
host: {'role': 'button'}
})
export class IgButton {
@ViewChild('igButton') _button: ElementRef;
private _type: string = 'flat';
private _cssClass: string = 'ig-button';
private _el: ElementRef;
private _renderer: Renderer;

constructor(private el: ElementRef, private renderer: Renderer) {
this._el = el;
this._renderer = renderer;
}

@Input('igButton') set type(value: string) {
this._type = value || this._type;
}

get type() {
return this._type;
}

@Input() type: string = "flat";
@Input() disabled: boolean;

get isDisabled() {
Expand All @@ -19,13 +34,20 @@ export class IgButton {
set isDisabled(value: boolean) {
this.disabled = value;
}

setButtonStyles(el: ElementRef, renderer: Renderer) {
renderer.setElementClass(el.nativeElement, `${this._cssClass}--${this._type}`, true);
renderer.setElementClass(el.nativeElement, `${this._cssClass}--disabled`, this.isDisabled);
}

ngAfterContentInit() {
this.setButtonStyles(this._el, this._renderer);
}
}

@NgModule({
declarations: [IgButton],
imports: [CommonModule],
exports: [IgButton]
})
export class ButtonModule {

}
export class ButtonModule {}
1 change: 1 addition & 0 deletions src/themes/material/extends/_buttons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
text-transform: uppercase;
cursor: pointer;
user-select: none;
outline: none;
-webkit-tap-highlight-color: transparent;
transition: $button-transition;
}
Expand Down