From ad5eacc3b0df5e1785e8483bcd735c7027e48ded Mon Sep 17 00:00:00 2001
From: Donielle Berg <donielle.berg@gmail.com>
Date: Tue, 3 Nov 2015 11:30:03 -0800
Subject: [PATCH 1/2] Add notifications, base variant

---
 components/SLDSNotification/index.js        | 56 +++++++++++++++++++++
 demo/pages/HomePage/NotificationSection.jsx | 45 +++++++++++++++++
 demo/pages/HomePage/index.jsx               |  4 ++
 3 files changed, 105 insertions(+)
 create mode 100644 components/SLDSNotification/index.js
 create mode 100644 demo/pages/HomePage/NotificationSection.jsx

diff --git a/components/SLDSNotification/index.js b/components/SLDSNotification/index.js
new file mode 100644
index 0000000000..eded06917d
--- /dev/null
+++ b/components/SLDSNotification/index.js
@@ -0,0 +1,56 @@
+/*
+Copyright (c) 2015, salesforce.com, inc. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+Neither the name of salesforce.com, inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+import React from 'react';
+const classNames = require('classnames');
+import SLDSButton from '../SLDSButton';
+
+class Notification extends React.Component {
+  constructor(props){
+    super(props);
+    this.state = {};
+  }
+
+  getClassName() {
+    return classNames(this.props.className, 'slds-notify ', {
+      [`slds-notify--${this.props.variant}`]: this.props.variant,
+      [`slds-theme--${this.props.theme}`]: this.props.theme,
+      [`slds-theme--alert-texture`]: this.props.texture,
+    });
+  }
+
+  render(){
+    return(
+      <div className="slds-notify-container">
+        <div className={this.getClassName()} role="alert">
+          <SLDSButton
+            label='Close'
+            variant='icon'
+            iconName='close'
+            inverse={true}
+            className='slds-button slds-button--icon-inverse slds-notify__close'
+            onClick={this.props.onDismiss}
+          />
+          <span className="slds-assistive-text">Info</span>
+          <div className="notify__content">
+            <h2 className="slds-text-heading--small">
+            {this.props.content}
+            </h2>
+          </div>
+        </div>
+      </div>
+    );
+  }
+}
+Notification.propTypes = {
+};
+module.exports = Notification;
+
diff --git a/demo/pages/HomePage/NotificationSection.jsx b/demo/pages/HomePage/NotificationSection.jsx
new file mode 100644
index 0000000000..c5bd2c87f9
--- /dev/null
+++ b/demo/pages/HomePage/NotificationSection.jsx
@@ -0,0 +1,45 @@
+/*
+Copyright (c) 2015, salesforce.com, inc. All rights reserved.
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+Neither the name of salesforce.com, inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+'use strict';
+
+import React from 'react';
+import SLDSNotification from '../../../components/SLDSNotification';
+import {default as PrismCode} from "react-prism/lib/PrismCode";
+
+module.exports = React.createClass( {
+
+  getDefaultProps () {
+    return {};
+  },
+
+  getInitialState () {
+    return {};
+  },
+
+  render() {
+    let message = ['Your new contact, ', <a href="#">Sara Smith</a>, ', has been created.'];
+    return (
+
+            <div className='slds-p-around--medium'>
+              <h3 className='slds-text-heading--medium slds-truncate'>
+                Notification
+              </h3>
+              <div className='slds-p-vertical--large'>
+                <div className='slds-input-has-icon slds-input-has-icon--left'>
+                  <SLDSNotification variant='alert' theme='success' icon='notification' texture={true} content={message} animated={true} />
+                </div>
+              </div>
+            </div>
+
+
+    );
+  }
+});
+
diff --git a/demo/pages/HomePage/index.jsx b/demo/pages/HomePage/index.jsx
index 1831fe1b4c..7c83674c23 100644
--- a/demo/pages/HomePage/index.jsx
+++ b/demo/pages/HomePage/index.jsx
@@ -19,6 +19,8 @@ import {ButtonIcon, Icon} from "./../../../components/SLDSIcons";
 import ButtonSection from './ButtonSection';
 import ButtonGroupSection from './ButtonGroupSection';
 
+import NotificationSection from './NotificationSection';
+
 import LookupBaseSection from './LookupBaseSection';
 import LookupBaseDynamicSection from './LookupBaseDynamicSection';
 
@@ -70,6 +72,8 @@ module.exports = React.createClass( {
         <main className='stage-main slds-grid slds-wrap slds-grow' role='main'>
           <div className='region region--main slds-grow slds-size--1-of-1 slds-medium-size--1-of-2 slds-large-size--8-of-12 slds-col-rule--right slds-p-around--large'>
 
+            <NotificationSection/>
+
             <ButtonSection/>
 
             <ButtonGroupSection />

From 70930cd7be21ce3d5f9c842ca06805cb294aa839 Mon Sep 17 00:00:00 2001
From: Donielle Berg <donielle.berg@gmail.com>
Date: Tue, 3 Nov 2015 15:07:05 -0800
Subject: [PATCH 2/2] Add notifications:toast variant

---
 components/SLDSButton/index.js                |  1 +
 components/SLDSNotification/index.js          | 25 +++++---
 ...esforce-lightning-design-system-scoped.css |  3 +
 demo/pages/HomePage/NotificationSection.jsx   | 61 +++++++++++++++++--
 4 files changed, 76 insertions(+), 14 deletions(-)

diff --git a/components/SLDSButton/index.js b/components/SLDSButton/index.js
index 359572c9cc..004d7bd039 100644
--- a/components/SLDSButton/index.js
+++ b/components/SLDSButton/index.js
@@ -47,6 +47,7 @@ class Button extends React.Component {
       ['slds-max-small-button--stretch']: this.props.responsive,
       ['slds-not-selected']: notSelected,
       ['slds-is-selected']: isSelected,
+      ['slds-button--icon-inverse']: this.props.inverse,
     });
   }
 
diff --git a/components/SLDSNotification/index.js b/components/SLDSNotification/index.js
index eded06917d..9ee9c8c213 100644
--- a/components/SLDSNotification/index.js
+++ b/components/SLDSNotification/index.js
@@ -12,8 +12,9 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 import React from 'react';
 const classNames = require('classnames');
 import SLDSButton from '../SLDSButton';
+import {Icon} from '../SLDSIcons';
 
-class Notification extends React.Component {
+class SLDSNotification extends React.Component {
   constructor(props){
     super(props);
     this.state = {};
@@ -35,22 +36,26 @@ class Notification extends React.Component {
             label='Close'
             variant='icon'
             iconName='close'
+            iconSize='large'
             inverse={true}
-            className='slds-button slds-button--icon-inverse slds-notify__close'
+            className='slds-button slds-notify__close'
             onClick={this.props.onDismiss}
           />
-          <span className="slds-assistive-text">Info</span>
-          <div className="notify__content">
-            <h2 className="slds-text-heading--small">
-            {this.props.content}
-            </h2>
-          </div>
+
+          <span className="slds-assistive-text">{this.props.theme}</span>
+
+          <section className="notify__content slds-grid">
+            <Icon category='utility' name={this.props.icon} size='small' className='slds-m-right--x-small slds-col slds-no-flex' />
+            <h2 className="slds-col slds-align-middle slds-text-heading--small"> {this.props.content} </h2>
+          </section>
+
         </div>
       </div>
+
     );
   }
 }
-Notification.propTypes = {
+SLDSNotification.propTypes = {
 };
-module.exports = Notification;
+module.exports = SLDSNotification;
 
diff --git a/demo/assets/styles/salesforce-lightning-design-system-scoped.css b/demo/assets/styles/salesforce-lightning-design-system-scoped.css
index abca201a4a..0daa7ca78b 100644
--- a/demo/assets/styles/salesforce-lightning-design-system-scoped.css
+++ b/demo/assets/styles/salesforce-lightning-design-system-scoped.css
@@ -2624,6 +2624,9 @@ body {
     top: 0;
     z-index: 10000;
     text-align: center; }
+  .demo-only .slds-notify-container {
+    position: relative;
+  }
   .slds .slds-notify {
     color: white;
     position: relative;
diff --git a/demo/pages/HomePage/NotificationSection.jsx b/demo/pages/HomePage/NotificationSection.jsx
index c5bd2c87f9..0e63773183 100644
--- a/demo/pages/HomePage/NotificationSection.jsx
+++ b/demo/pages/HomePage/NotificationSection.jsx
@@ -11,6 +11,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 
 import React from 'react';
 import SLDSNotification from '../../../components/SLDSNotification';
+import {SLDSButton, SLDSModal} from '../../../components';
 import {default as PrismCode} from "react-prism/lib/PrismCode";
 
 module.exports = React.createClass( {
@@ -20,11 +21,60 @@ module.exports = React.createClass( {
   },
 
   getInitialState () {
-    return {};
+    return {
+      modalIsOpen: false
+    };
+  },
+
+  getModalContent(){
+    return (
+      <div>
+        <p> wjefiowjefio wejoif wejiof jfiowejfo ijw </p>
+        <p> wjefiowjefio wejoif wejiof jfiowejfo ijw </p>
+        <p> wjefiowjefio wejoif wejiof jfiowejfo ijw </p>
+        <p> wjefiowjefio wejoif wejiof jfiowejfo ijw </p>
+        <p> wjefiowjefio wejoif wejiof jfiowejfo ijw </p>
+        <p> wjefiowjefio wejoif wejiof jfiowejfo ijw </p>
+        <p> wjefiowjefio wejoif wejiof jfiowejfo ijw </p>
+        <p> wjefiowjefio wejoif wejiof jfiowejfo ijw </p>
+        <p> wjefiowjefio wejoif wejiof jfiowejfo ijw </p>
+        <p> wjefiowjefio wejoif wejiof jfiowejfo ijw </p>
+        <p> wjefiowjefio wejoif wejiof jfiowejfo ijw </p>
+        <p> wjefiowjefio wejoif wejiof jfiowejfo ijw </p>
+        <p> wjefiowjefio wejoif wejiof jfiowejfo ijw </p>
+        <p> wjefiowjefio wejoif wejiof jfiowejfo ijw </p>
+        <p> wjefiowjefio wejoif wejiof jfiowejfo ijw </p>
+        <p> wjefiowjefio wejoif wejiof jfiowejfo ijw </p>
+        <p> wjefiowjefio wejoif wejiof jfiowejfo ijw </p>
+        <p> wjefiowjefio wejoif wejiof jfiowejfo ijw </p>
+        <p> wjefiowjefio wejoif wejiof jfiowejfo ijw </p>
+        <p> wjefiowjefio wejoif wejiof jfiowejfo ijw </p>
+        <p> wjefiowjefio wejoif wejiof jfiowejfo ijw </p>
+        <p> wjefiowjefio wejoif wejiof jfiowejfo ijw </p>
+        <p> wjefiowjefio wejoif wejiof jfiowejfo ijw </p>
+        <p> wjefiowjefio wejoif wejiof jfiowejfo ijw </p>
+        <p> wjefiowjefio wejoif wejiof jfiowejfo ijw </p>
+        <p> wjefiowjefio wejoif wejiof jfiowejfo ijw </p>
+        <p> wjefiowjefio wejoif wejiof jfiowejfo ijw </p>
+      </div>
+    )
+  },
+
+  openModal () {
+    this.setState({modalIsOpen: true});
+  },
+
+  closeModal () {
+    this.setState({modalIsOpen: false});
+  },
+
+  handleSubmitModal () {
+    this.closeModal();
   },
 
   render() {
-    let message = ['Your new contact, ', <a href="#">Sara Smith</a>, ', has been created.'];
+    let message = ['New contact added ', <a href="#" key="0123">Sara Smith</a>];
+    let errorMessage = 'Error';
     return (
 
             <div className='slds-p-around--medium'>
@@ -32,9 +82,12 @@ module.exports = React.createClass( {
                 Notification
               </h3>
               <div className='slds-p-vertical--large'>
-                <div className='slds-input-has-icon slds-input-has-icon--left'>
-                  <SLDSNotification variant='alert' theme='success' icon='notification' texture={true} content={message} animated={true} />
+                1. Toasts
+                <div className="demo-only">
+                  <SLDSNotification variant='toast' theme='success' icon='notification' texture={true} content={message} animated={true} />
                 </div>
+
+                2. Modal Toasts
               </div>
             </div>