add final updates and code cleanup

Author: kyleturco

docs/app/Examples/elements/List/Content/ListImageExample.js

@@ -4,9 +4,15 @@ import {List, ListItem} from 'stardust';
 
 export default class ListImageExample extends Component {
   render() {
+<<<<<<< HEAD
     const helenAvatar = <Image className='avatar' src={faker.image.internet.avatar()} />;
     const christianAvatar = <Image className='avatar' src={faker.image.internet.avatar()} />;
     const danielAvatar = <Image className='avatar' src={faker.image.internet.avatar()} />;
+=======
+    const helenAvatar = <img className='ui avatar image' src='http://lorempixel.com/100/100/people/1' />;
+    const christianAvatar = <img className='ui avatar image' src='http://lorempixel.com/100/100/people/2' />;
+    const danielAvatar = <img className='ui avatar image' src='http://lorempixel.com/100/100/people/3' />;
+>>>>>>> add final updates and code cleanup
     return (
       <List>
         <ListItem image={helenAvatar} header='Helen' />

docs/app/Examples/elements/List/Types/ListListExample.js

@@ -5,9 +5,9 @@ export default class ListListExample extends Component {
   render() {
     return (
       <List>
-        <ListItem>Apples</ListItem>
-        <ListItem>Pears</ListItem>
-        <ListItem>Oranges</ListItem>
+        <ListItem description='Apples' />
+        <ListItem description='Pears' />
+        <ListItem description='Oranges' />
       </List>
     );
   }

docs/app/Examples/elements/List/Types/ListOrderedExample.js

@@ -5,13 +5,24 @@ export default class ListOrderedExample extends Component {
   render() {
     return (
       <List className='ordered'>
+<<<<<<< HEAD
         <ListItem description='Apples'>
           <List>
             <ListItem description='Fuji' />
             <ListItem description='Granny Smith' />
             <ListItem description='Honeycrisp' />
           </List>
         </ListItem>
+=======
+        <ListItem description='Apples' />
+          <div>
+            <List>
+              <ListItem description='Fuji' />
+              <ListItem description='Granny Smith' />
+              <ListItem description='Honeycrisp' />
+            </List>
+          </div>
+>>>>>>> add final updates and code cleanup
         <ListItem description='Pears' />
         <ListItem description='Oranges' />
       </List>

docs/app/Examples/elements/List/Variations/ListSelectionExample.js

@@ -4,9 +4,15 @@ import {List, ListItem} from 'stardust';
 
 export default class ListSelectionExample extends Component {
   render() {
+<<<<<<< HEAD
     const avatar1 = <Image className='avatar' src={faker.internet.avatar()} />;
     const avatar2 = <Image className='avatar' src={faker.internet.avatar()} />;
     const avatar3 = <Image className='avatar' src={faker.internet.avatar()} />;
+=======
+    const avatar1 = <img className='ui avatar image' src='http://lorempixel.com/100/100/people/1' />;
+    const avatar2 = <img className='ui avatar image' src='http://lorempixel.com/100/100/people/2' />;
+    const avatar3 = <img className='ui avatar image' src='http://lorempixel.com/100/100/people/3' />;
+>>>>>>> add final updates and code cleanup
     return (
       <List className='selection'>
         <ListItem image={avatar1} header='Helen' />