1 3 5 remove devtools, some styling of crib

nikfrank · Jun 10, 2017 · 580c9a8 · 580c9a8
1 parent 0d7966e
commit 580c9a8
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/canon/crib/src/Round/Round.css.js b/canon/crib/src/Round/Round.css.js
@@ -2,7 +2,7 @@ export default {
   cut: {
     borderRadius: '5px',
     position:'fixed',
-    top:'48vh',
+    top:'42vh',
     left:'0vw',
     width:'100vw',
     height:'10vh',

diff --git a/canon/crib/src/Round/Round.js b/canon/crib/src/Round/Round.js
@@ -290,7 +290,7 @@ class Round extends Component {
 
         {
           cutYet? (
-            <div style={{float:'right', width:'50vw'}}>
+            <div style={style.cut}>
               <Hand cards={[this.props.subState.get('cut')]}/>
             </div>
           ) : null

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tahini",
-  "version": "1.3.4",
+  "version": "1.3.5",
   "description": "flexible vocabulary scoping for react",
   "scripts": {
     "build": "babel -d dist/ src/",

diff --git a/src/stores.js b/src/stores.js
@@ -1,4 +1,4 @@
-import { createStore, applyMiddleware, compose } from 'redux';
+import { createStore, applyMiddleware } from 'redux';
 import { fromJS } from 'immutable';
 
 import { createReflection } from './reflection';
@@ -11,7 +11,6 @@ import {
 export const baseReducerHash = ()=>({
   global:{
     '@@redux/INIT': (state = fromJS({}), action)=> state,
-    '@@INIT': (state = fromJS({}), action)=> state,
     setSubState: (state, action)=> state.setIn(action.path, action.payload)
   }
 });
@@ -24,10 +23,8 @@ export const bootStores = function(middleware = [], reducerHash = baseReducerHas
 
   const appStore = createStore(
     isolateMutationByDataPath( consumeActionByNamespace(reducerHash) ),
-    compose(
-      applyMiddleware(...middleware),
-      window && window.__REDUX_DEVTOOLS_EXTENSION__ && window.__REDUX_DEVTOOLS_EXTENSION__()
-    ) );
+    applyMiddleware(...middleware),
+  );
 
   // boot the reflection
   const reflection = createReflection();