Merge branch 'release/1.8.0' of ssh://git.mnml.gg:40022/~/mnml into release/1.8.0

This commit is contained in:
ntr
2019-11-05 16:40:03 +11:00
7 changed files with 29 additions and 32 deletions
+1
View File
@@ -230,6 +230,7 @@
padding-left: 1em;
padding-right: 1em;
text-align: center;
font-size: 0.8em;
svg {
display: inline;
height: 1em;
+1 -1
View File
@@ -153,7 +153,7 @@ class GameConstruct extends Component {
}
const effects = construct.effects.length
? construct.effects.map(c =>
<div
<div
key={c.effect}
onMouseOver={e => hoverInfo(e, c)}
onMouseOut={e => hoverInfo(e, null)}
+3 -1
View File
@@ -224,7 +224,9 @@ function registerEvents(store) {
if (v.phase === 'Finished') {
ws.sendAccountInstances();
}
if (localStorage.getItem('tutorial-complete')) {
// instance.mobile.less hides info at @media 1000
if (localStorage.getItem('tutorial-complete') || window.innerWidth <= 1100) {
store.dispatch(actions.setTutorial(null));
} else if (v.time_control === 'Practice' && v.rounds.length === 1 && tutorial) {
tutorialVbox(player, store, tutorial);