Merge pull request #230 from cal-smith/deprecate

last minute breaking fixes

Author: cal-smith

src/modal/alert-modal.component.ts

@@ -48,7 +48,7 @@ import { BaseModal } from "./base-modal.class";
 @Component({
 	selector: "ibm-alert-modal",
 	template: `
-		<ibm-modal [modalType]="modalType" [modalLabel]="modalTitle">
+		<ibm-modal [theme]="modalType" [modalLabel]="modalTitle">
 			<ibm-modal-header (closeSelect)="closeModal()">
 				<p class="bx--modal-header__label bx--type-delta">{{modalLabel}}</p>
       			<p class="bx--modal-header__heading bx--type-beta">{{modalTitle}}</p>

src/modal/modal-header.component.ts

@@ -9,7 +9,7 @@ import { I18n } from "./../i18n/i18n.module";
 /**
  * ***Inputs***
  * ```html
- * <ibm-modal-header [modalType]="default">Header text</ibm-modal-header>
+ * <ibm-modal-header>Header text</ibm-modal-header>
  * ```
  *
  * ***Outputs***
@@ -23,7 +23,7 @@ import { I18n } from "./../i18n/i18n.module";
 @Component({
 	selector: "ibm-modal-header",
 	template: `
-		<header class="{{modalType}} bx--modal-header">
+		<header class="{{theme}} bx--modal-header">
 			<div class="bx--modal-header">
 				<ng-content></ng-content>
 			</div>
@@ -54,7 +54,7 @@ export class ModalHeader {
 	 * @type {"default" | "warning" | "error"}
 	 * @memberof ModalHeader
 	 */
-	@Input() modalType = "default";
+	@Input() theme = "default";
 	/**
 	 * Accessible label for the header close button.
 	 * Defaults to the `MODAL.CLOSE` value from the i18n service.

src/notification/toast.component.ts

@@ -6,7 +6,7 @@ import {
 } from "@angular/core";
 
 import { NotificationService } from "./notification.service";
-import { NotificationContent } from "./notification-content.interface";
+import { NotificationContent, ToastContent } from "./notification-content.interface";
 import { Notification } from "./notification.component";
 
 /**
@@ -49,7 +49,7 @@ export class Toast extends Notification implements OnInit {
 	 * `message` is message for notification to display
 	 *
 	 */
-	@Input() notificationObj: NotificationContent;
+	@Input() notificationObj: ToastContent;
 
 	@HostBinding("attr.id") toastID = "notification";
 	@HostBinding("class.bx--toast-notification") toastClass = true;