From b9ee0f57f7a907ec25abeb8c9120d163b0b7ad0a Mon Sep 17 00:00:00 2001
From: Joey Payne <jyapayne@gmail.com>
Date: Fri, 18 Mar 2016 07:27:25 -0600
Subject: [PATCH] Make "Styles" and "Colors" consistently named

---
 app/components/EntrySelector.jsx  | 10 ++++------
 app/components/LibraryNav.jsx     | 16 +++++++---------
 app/components/SearchBar.jsx      |  5 ++---
 app/components/SelectableList.jsx |  1 -
 4 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/app/components/EntrySelector.jsx b/app/components/EntrySelector.jsx
index ac64cee..e6a2ef0 100644
--- a/app/components/EntrySelector.jsx
+++ b/app/components/EntrySelector.jsx
@@ -20,10 +20,8 @@ import * as utils from 'utils'
 
 import glob from 'glob'
 import moment from 'moment'
-import fs from 'fs'
 import mkdirp from 'mkdirp'
 import jsfile from 'jsonfile'
-import rmdir from 'rimraf'
 
 import {
     NOTEBOOK_TYPE,
@@ -38,7 +36,7 @@ const {
     Paper
 } = mui
 
-const colors = Styles.Colors
+const Colors = Styles.Colors
 
 const DefaultRawTheme = Styles.LightRawTheme
 
@@ -184,7 +182,7 @@ export default class EntrySelector extends React.Component {
                         touch={true}
                         tooltip={note.tags.join(", ")}
                     >
-                        <Tag color={colors.grey400}/>
+                        <Tag color={Colors.grey400}/>
                     </IconButton>
                     <div className="tag-list inline">
                         {utils.trunc(note.tags.join(", "), 30)}
@@ -199,7 +197,7 @@ export default class EntrySelector extends React.Component {
             position: "absolute",
             top: 70,
             left: 20,
-            color: colors.grey400,
+            color: Colors.grey400,
             fontSize: 14
         }
 
@@ -222,7 +220,7 @@ export default class EntrySelector extends React.Component {
                             touch={true}
                             onTouchTap={this.addNoteTapped}
                             tooltip="Add New Note">
-                                <Add color={colors.grey600}/>
+                                <Add color={Colors.grey600}/>
                         </IconButton>}
                      hintText="Filter by keyword, title or tag."
                      innerTextFieldWidth={210}
diff --git a/app/components/LibraryNav.jsx b/app/components/LibraryNav.jsx
index 45e5af2..e45c41e 100644
--- a/app/components/LibraryNav.jsx
+++ b/app/components/LibraryNav.jsx
@@ -4,7 +4,6 @@ import ReactDOM from 'react-dom'
 import mui from 'material-ui'
 import getMuiTheme from 'material-ui/lib/styles/getMuiTheme'
 
-import styles from 'material-ui/lib/styles'
 import List from 'material-ui/lib/lists/list'
 import ListItem from 'material-ui/lib/lists/list-item'
 import ActionGrade from 'material-ui/lib/svg-icons/action/grade'
@@ -27,8 +26,6 @@ import mkdirp from 'mkdirp'
 import jsfile from 'jsonfile'
 import rmdir from 'rimraf'
 
-const colors = styles.Colors
-
 String.prototype.trunc = String.prototype.trunc || function(n){
           return (this.length > n) ? this.substr(0, n-1)+'...' : this;
 };
@@ -42,6 +39,7 @@ const {
     Paper
 } = mui
 
+const Colors = Styles.Colors
 const DefaultRawTheme = Styles.LightRawTheme
 
 export default class LibraryNav extends React.Component {
@@ -90,7 +88,7 @@ export default class LibraryNav extends React.Component {
 
     getChildContext() {
         return {
-            muiTheme: getMuiTheme(DefaultRawTheme)
+            muiTheme: this.context.muiTheme || getMuiTheme(DefaultRawTheme)
         }
     }
 
@@ -338,7 +336,7 @@ export default class LibraryNav extends React.Component {
                                     innerDivStyle={{'paddingBottom': 0,
                                                     'paddingTop': 0}}
                                     onTouchTap={this.noteBookTapped.bind(this, i)}
-                                    leftIcon={<NoteBook color={colors.grey500}/>}
+                                    leftIcon={<NoteBook color={Colors.grey500}/>}
                                     rightIcon={<Badge badgeContent={notebook.notes}/>}>
 
                                     
@@ -371,7 +369,7 @@ export default class LibraryNav extends React.Component {
                                                 style={{padding: 0}}
                                             >
                                                   <NoteBook
-                                                      color={colors.grey500}/>
+                                                      color={Colors.grey500}/>
                                               </IconButton>
                                               }
                                     rightIcon={<Badge 
@@ -406,7 +404,7 @@ export default class LibraryNav extends React.Component {
                     className="list"
                     initialIndex={0}
                     id="main-nav"
-                    selectedItemStyle={{backgroundColor: colors.lightBlue100}}
+                    selectedItemStyle={{backgroundColor: Colors.lightBlue100}}
                     subheader="Library">
                         {this.props.navigation.menuItems.map((item, i) => {
                             return <ListItem
@@ -424,7 +422,7 @@ export default class LibraryNav extends React.Component {
                       id="nblist"
                       className="list"
                       ref='notebookList'
-                      selectedItemStyle={{backgroundColor: colors.lightBlue100}}
+                      selectedItemStyle={{backgroundColor: Colors.lightBlue100}}
                       subheader={<div>
                                     <div className="inline">NoteBooks</div>
                                     <IconButton
@@ -435,7 +433,7 @@ export default class LibraryNav extends React.Component {
                                         style={{'zIndex': 1000}}
                                         className="right inline">
                                         <AddCircleOutline
-                                            color={colors.grey500}/>
+                                            color={Colors.grey500}/>
                                     </IconButton>
                                 </div>}>
                         {this.notebookList()}
diff --git a/app/components/SearchBar.jsx b/app/components/SearchBar.jsx
index 36ae1fc..05c63c8 100644
--- a/app/components/SearchBar.jsx
+++ b/app/components/SearchBar.jsx
@@ -13,7 +13,7 @@ const {
     Paper
 } = mui
 
-const colors = Styles.Colors
+const Colors = Styles.Colors
 
 const DefaultRawTheme = Styles.LightRawTheme
 
@@ -35,7 +35,6 @@ export default class SearchBar extends React.Component {
     }
 
     blank(){
-    
     }
 
     render(){
@@ -49,7 +48,7 @@ export default class SearchBar extends React.Component {
                     id="search-bar"
                     active={false}
                     selected={false}
-                    leftIcon={<Search color={colors.grey600}/>}
+                    leftIcon={<Search color={Colors.grey600}/>}
                     rightIconButton={this.props.rightIconButton}>
                     <TextField
                         hintText={this.props.hintText || ""}
diff --git a/app/components/SelectableList.jsx b/app/components/SelectableList.jsx
index 1a3913b..05d229e 100644
--- a/app/components/SelectableList.jsx
+++ b/app/components/SelectableList.jsx
@@ -1,6 +1,5 @@
 import React from 'react'
 
-import styles from 'material-ui/lib/styles'
 import List from 'material-ui/lib/lists/list'
 import { SelectableContainerEnhance } from '../enhance/SelectableEnhance'