diff --git a/CHANGELOG.md b/CHANGELOG.md index 9f0f9eaf..fab461ad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,13 +2,12 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). -## [1.6.1] - 2019-10-?? +## [1.6.2] - 2019-10-20 ### Fixed +- Combiner bug where it would preview items for different combinations +- Skill descriptions are cleared when animations start - - Combiner bug where it would preview items for different combinations - - - Skill descriptions are cleared when animations start - +## [1.6.1] - Skipped ## [1.6.0] - 2019-10-18 ### Added diff --git a/VERSION b/VERSION index ce6a70b9..308b6faa 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.6.0 \ No newline at end of file +1.6.2 \ No newline at end of file diff --git a/acp/package.json b/acp/package.json index f7dc99f5..50e3dad7 100644 --- a/acp/package.json +++ b/acp/package.json @@ -1,6 +1,6 @@ { "name": "mnml-client", - "version": "1.6.0", + "version": "1.6.2", "description": "", "main": "index.js", "scripts": { diff --git a/client/assets/styles/controls.less b/client/assets/styles/controls.less index b2eb2337..c154e044 100644 --- a/client/assets/styles/controls.less +++ b/client/assets/styles/controls.less @@ -144,6 +144,12 @@ aside { } } +.play-ctrl { + .controls { + grid-template-rows: 1fr 1fr 1fr 3fr 1fr; + } +} + .abandon:not([disabled]) { &:hover { color: @red; diff --git a/client/package.json b/client/package.json index 6eb572dd..4bd0df9e 100644 --- a/client/package.json +++ b/client/package.json @@ -1,6 +1,6 @@ { "name": "mnml-client", - "version": "1.6.0", + "version": "1.6.2", "description": "", "main": "index.js", "scripts": { diff --git a/client/src/components/play.ctrl.jsx b/client/src/components/play.ctrl.jsx index 1f4c0d4c..e0391b32 100644 --- a/client/src/components/play.ctrl.jsx +++ b/client/src/components/play.ctrl.jsx @@ -130,16 +130,14 @@ function JoinButtons(args) {