Fix spell editing

d-baranowski · Dec 10, 2018 · decfc53 · decfc53
1 parent 961a115
commit decfc53
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 5 deletions.
diff --git a/app/app.global.scss b/app/app.global.scss
@@ -18,7 +18,7 @@
 }
 
 .transition-position {
-  transition: left 0.2s ease-out;
+  transition: right 0.2s ease-out;
 }
 
 .no-select {

diff --git a/app/form/CampFire.js b/app/form/CampFire.js
@@ -6,7 +6,7 @@ const CampFire = ({onClick}) => (
     <svg id="startLongRest" onClick={onClick} style={{
       position: 'fixed',
       top: 10,
-      left: 10,
+      right: 10,
       cursor: 'pointer',
       width: 50,
       height: 50,

diff --git a/app/form/CampfireContainer.js b/app/form/CampfireContainer.js
@@ -2,7 +2,6 @@ import React, {Component} from 'react';
 import CampFire from "./CampFire";
 import {Button} from "semantic-ui-react";
 import {connect} from "react-redux";
-import "./CampfireContainer.scss";
 
 class CampfireContainer extends Component {
   state = {
@@ -69,7 +68,7 @@ class CampfireContainer extends Component {
               display: 'flex',
               position: 'fixed',
               top: 75,
-              left: this.state.showConfirmation ? 10 : -400,
+              right: this.state.showConfirmation ? 10 : -400,
               zIndex: 1,
               padding: 10,
               background: 'white',

diff --git a/app/form/CampfireContainer.scss b/app/form/CampfireContainer.scss
diff --git a/app/home-page/character-sheet/spells/spellsReducer.js b/app/home-page/character-sheet/spells/spellsReducer.js
@@ -140,7 +140,7 @@ export default (state = initialState, action) => {
       ...state.chosenSpells,
       [level]: {
         ...state.chosenSpells[level],
-        [action.spell.id]: action.spell
+        [action.spell.id]: { ...state.chosenSpells[level][action.spell.id], ...action.spell }
       }
     };