diff --git a/package.json b/package.json index 75096ee5..814c1c4c 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "jsx" ], "moduleNameMapper": { - ".+\\.(bin|jpg|jpeg|png|mp3|ogg|wav|gif)$": "identity-obj-proxy", + ".+\\.(bin|jpg|jpeg|png|mp3|ogg|wav|gif|svg|css)$": "identity-obj-proxy", "^@ml(.*)$": "/src/$1", "^@public(.*)$": "/public/$1" }, diff --git a/public/images/finger-click-icon-1.svg b/public/images/finger-click-icon-1.svg new file mode 100644 index 00000000..cada4a4f --- /dev/null +++ b/public/images/finger-click-icon-1.svg @@ -0,0 +1,3 @@ + + + diff --git a/public/images/finger-click-icon-2.svg b/public/images/finger-click-icon-2.svg new file mode 100644 index 00000000..5daa8460 --- /dev/null +++ b/public/images/finger-click-icon-2.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/public/index.html b/public/index.html index d21759b6..f70748fe 100644 --- a/public/index.html +++ b/public/index.html @@ -48,7 +48,7 @@ button { padding: 1.5% 3%; } - + #pondTextMarkdown p { margin: 0 } @@ -106,6 +106,14 @@ font-size: calc(18px * 1024 / 930); } } + @media screen and (min-width: 1422px) and (min-height: 830px) { + #container { + max-width: 1280px; + } + #container-react { + font-size: calc(18px * 1280 / 930); + } + } diff --git a/src/oceans/components/common/Guide.jsx b/src/oceans/components/common/Guide.jsx index a35243a0..8ffebfe1 100644 --- a/src/oceans/components/common/Guide.jsx +++ b/src/oceans/components/common/Guide.jsx @@ -1,15 +1,19 @@ -import React from 'react' -import Radium from "radium"; -import Typist from "react-typist"; +import React from 'react'; +import Radium from 'radium'; +import Typist from 'react-typist'; -import {getState, setState} from "@ml/oceans/state"; -import guide from "@ml/oceans/models/guide"; -import soundLibrary from "@ml/oceans/models/soundLibrary"; -import styles from "@ml/oceans/styles"; -import colors from "@ml/oceans/styles/colors"; -import I18n from "@ml/oceans/i18n"; -import {Button} from "@ml/oceans/components/common"; -import arrowDownImage from "@public/images/arrow-down.png"; +import '@ml/oceans/styles/fade.css'; + +import {getState, setState} from '@ml/oceans/state'; +import guide from '@ml/oceans/models/guide'; +import soundLibrary from '@ml/oceans/models/soundLibrary'; +import styles from '@ml/oceans/styles'; +import colors from '@ml/oceans/styles/colors'; +import I18n from '@ml/oceans/i18n'; +import {Button} from '@ml/oceans/components/common'; +import arrowDownImage from '@public/images/arrow-down.png'; +import fingerClickIcon1 from '@public/images/finger-click-icon-1.svg'; +import fingerClickIcon2 from '@public/images/finger-click-icon-2.svg'; let UnwrappedGuide = class Guide extends React.Component { onShowing() { @@ -48,6 +52,12 @@ let UnwrappedGuide = class Guide extends React.Component { setState({guideTypingTimer}); } + const renderClickToContinueReminder = + state.guides === 'K5' && + state.guideShowing && + !currentGuide.noDimBackground && + currentGuide.style !== 'Info'; + return (
{currentGuide && currentGuide.image && ( @@ -98,6 +108,20 @@ let UnwrappedGuide = class Guide extends React.Component { {currentGuide.textFn(getState())}
+ {renderClickToContinueReminder && ( +
+ + +
+ )} {currentGuide.style === 'Info' && (