diff --git a/src/common/locales/en.json b/src/common/locales/en.json index 78900e1..9e9e9f1 100644 --- a/src/common/locales/en.json +++ b/src/common/locales/en.json @@ -923,12 +923,10 @@ } }, "menu": { - "personalPage": "Profile Page", "tutorial1": "Intro Tutorial", "tutorial2": "Assests Tutorial", "tutorial3": "Create New Story Tutorial", - "tutorial": "Manual", - "function": "Features" + "tutorial": "Help" }, "emptyPleaseSelect": "Welcome to the oice editor, please select/create a new story", "storiesList": { diff --git a/src/common/locales/ja.json b/src/common/locales/ja.json index b55ddf7..cb3b91a 100644 --- a/src/common/locales/ja.json +++ b/src/common/locales/ja.json @@ -923,12 +923,10 @@ } }, "menu": { - "personalPage": "マイページ", "tutorial1": "初心者のチュートリアルへ", "tutorial2": "キャラのチュートリアルへ", "tutorial3": "新規のチュートリアルへ", - "tutorial": "チュートリアル", - "function": "ツール" + "tutorial": "ヘルプ" }, "emptyPleaseSelect": "ようこそoiceエディターへ,新規ストーリーまたはマイ新規ストーリーを選択してください", "storiesList": { diff --git a/src/common/locales/zh-HK.json b/src/common/locales/zh-HK.json index d3e89d2..257f85f 100644 --- a/src/common/locales/zh-HK.json +++ b/src/common/locales/zh-HK.json @@ -924,12 +924,10 @@ } }, "menu": { - "personalPage": "個人主頁", "tutorial1": "查看教程(新手教程)", "tutorial2": "查看教程(角色教程)", "tutorial3": "查看教程(新建教程)", - "tutorial": "教程", - "function": "功能" + "tutorial": "幫助" }, "emptyPleaseSelect": "歡迎使用 oice 編輯器,請先創建/選擇你的故事。", "storiesList": { diff --git a/src/common/locales/zh-TW.json b/src/common/locales/zh-TW.json index be9d2a3..98265eb 100644 --- a/src/common/locales/zh-TW.json +++ b/src/common/locales/zh-TW.json @@ -924,12 +924,10 @@ } }, "menu": { - "personalPage": "個人主頁", "tutorial1": "查看教程(新手教程)", "tutorial2": "查看教程(角色教程)", "tutorial3": "查看教程(新建教程)", - "tutorial": "教程", - "function": "功能" + "tutorial": "幫助" }, "emptyPleaseSelect": "歡迎使用 oice 編輯器,請先創建/選擇你的故事。", "storiesList": { diff --git a/src/editor/components/EditorPanel/MacrosPanel/index.jsx b/src/editor/components/EditorPanel/MacrosPanel/index.jsx index b42bd2e..d6ad585 100644 --- a/src/editor/components/EditorPanel/MacrosPanel/index.jsx +++ b/src/editor/components/EditorPanel/MacrosPanel/index.jsx @@ -65,8 +65,8 @@ export default class MacrosPanel extends React.Component { const selectedMacroGroup = list[selectedMacroGroupIndex]; if (macros.length > 0) { return ( -
this.macrosList = ref}> - {selectedMacroGroup.map((macro) => ( +
this.macrosList = ref} className="macros-list"> + {selectedMacroGroup.map(macro => ( ))}
diff --git a/src/editor/components/EditorPanel/MacrosPanel/style.scss b/src/editor/components/EditorPanel/MacrosPanel/style.scss index 3892472..e839e2a 100644 --- a/src/editor/components/EditorPanel/MacrosPanel/style.scss +++ b/src/editor/components/EditorPanel/MacrosPanel/style.scss @@ -70,8 +70,4 @@ width: 30px; padding-right: 5px; } - - > span.macro-label { - line-height: 30px; - } } diff --git a/src/editor/components/EditorPanel/Menu.jsx b/src/editor/components/EditorPanel/Menu.jsx index 00c320c..c0cffba 100644 --- a/src/editor/components/EditorPanel/Menu.jsx +++ b/src/editor/components/EditorPanel/Menu.jsx @@ -9,9 +9,7 @@ import MoreIcon from 'common/icons/more'; import { VOLUMES } from '../InteractiveTutorial/constants'; -const handlePersonalPageClick = () => window.open('/profile'); -const handleTutorialClick = () => window.open('/tutorial/manual'); -const handleFunctionPageClick = () => window.open('/pricing'); +const handleTutorialClick = () => window.open('https://intercom.help/oice'); const EditorMenu = (props) => { const { t, tutorialState, userRole, onRequestOpenTutorial } = props; @@ -52,21 +50,12 @@ const EditorMenu = (props) => { return ( - {/* - */} {tutorialMenuItems} - ); }; diff --git a/src/editor/components/EditorPanel/index.jsx b/src/editor/components/EditorPanel/index.jsx index 4f11f1e..10f8999 100644 --- a/src/editor/components/EditorPanel/index.jsx +++ b/src/editor/components/EditorPanel/index.jsx @@ -1,18 +1,14 @@ import React from 'react'; import PropTypes from 'prop-types'; import { connect } from 'react-redux'; -import { push, replace } from 'react-router-redux'; +import { replace } from 'react-router-redux'; import { translate } from 'react-i18next'; -import { findDOMNode } from 'react-dom'; import uuid from 'uuid'; import _get from 'lodash/get'; -import FlatButton from 'ui-elements/FlatButton'; import LoadingScreen from 'ui-elements/LoadingScreen'; -import Modal from 'ui-elements/Modal'; -import RaisedButton from 'ui-elements/RaisedButton'; import InteractiveTutorial from 'editor/components/InteractiveTutorial'; @@ -36,7 +32,6 @@ import { TAB_LIST, } from 'editor/components/EditorPanel/StorySettingModal/StorySettingModal.constants'; -import Dashboard from '../Dashboard'; import EditorMenu from './Menu'; import EditorToolbar from './Toolbar/index'; import EditorWorkspace from './Workspace';