diff --git a/frontend/src/components/dir-view-mode/markdown-viewer-dialog.css b/frontend/src/components/dir-view-mode/markdown-viewer-dialog.css index f897e3f003..4c62b48a6d 100644 --- a/frontend/src/components/dir-view-mode/markdown-viewer-dialog.css +++ b/frontend/src/components/dir-view-mode/markdown-viewer-dialog.css @@ -16,18 +16,18 @@ height: 48px; } -.seafile-markdown-viewer-modal-header .seafile-markdown-viewer-modal-header-left-name > span { +.seafile-markdown-viewer-modal-header .seafile-markdown-viewer-modal-header-left-name img { margin-right: 6px; } -.seafile-markdown-viewer-modal-header .seafile-markdown-viewer-modal-header-right-tool > span { +.seafile-markdown-viewer-modal-header .seafile-markdown-viewer-modal-header-right-tool>span { margin-left: 10px; cursor: pointer; color: #000; opacity: 0.5; } -.seafile-markdown-viewer-modal-header .seafile-markdown-viewer-modal-header-right-tool > span:hover { +.seafile-markdown-viewer-modal-header .seafile-markdown-viewer-modal-header-right-tool>span:hover { opacity: 0.75; } diff --git a/frontend/src/components/dir-view-mode/markdown-viewer-dialog.js b/frontend/src/components/dir-view-mode/markdown-viewer-dialog.js index 8dcc7ab3b1..df25e28b57 100644 --- a/frontend/src/components/dir-view-mode/markdown-viewer-dialog.js +++ b/frontend/src/components/dir-view-mode/markdown-viewer-dialog.js @@ -3,6 +3,8 @@ import PropTypes from 'prop-types'; import { Modal, ModalBody } from 'reactstrap'; import { mediaUrl } from '../../utils/constants'; import SeafileMarkdownViewer from '../seafile-markdown-viewer'; +import InternalLinkOperation from '../operations/internal-link-operation'; +import { Utils } from '../../utils/utils'; import './markdown-viewer-dialog.css'; @@ -22,6 +24,7 @@ const propTypes = { class MarkdownViewerDialog extends React.Component { render() { + const { repoID, filePath, fileName } = this.props; return (
- {this.props.fileName} + {fileName} +
@@ -48,8 +52,8 @@ class MarkdownViewerDialog extends React.Component { lastModified = {this.props.lastModified} latestContributor={this.props.latestContributor} onLinkClick={this.props.onLinkClick} - repoID={this.props.repoID} - path={this.props.filePath} + repoID={repoID} + path={filePath} > diff --git a/frontend/src/components/file-view/file-info.js b/frontend/src/components/file-view/file-info.js index 07dcf928a3..ec6c22c2c8 100644 --- a/frontend/src/components/file-view/file-info.js +++ b/frontend/src/components/file-view/file-info.js @@ -2,7 +2,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import moment from 'moment'; import { isPro, gettext, mediaUrl, siteRoot } from '../../utils/constants'; -import { InternalLinkOperation } from '../operations'; +import InternalLinkOperation from '../operations/internal-link-operation'; const propTypes = { toggleStar: PropTypes.func.isRequired, diff --git a/frontend/src/components/operations/index.js b/frontend/src/components/operations/index.js deleted file mode 100644 index b77a8d5d01..0000000000 --- a/frontend/src/components/operations/index.js +++ /dev/null @@ -1,6 +0,0 @@ -import InternalLinkOperation from './internal-link-operation'; -import './style.css'; - -export { - InternalLinkOperation, -}; diff --git a/frontend/src/components/operations/style.css b/frontend/src/components/operations/internal-link-operation.css similarity index 91% rename from frontend/src/components/operations/style.css rename to frontend/src/components/operations/internal-link-operation.css index 40777f36d0..a259a2faf9 100644 --- a/frontend/src/components/operations/style.css +++ b/frontend/src/components/operations/internal-link-operation.css @@ -1,5 +1,5 @@ .dialog-operation { - display: flex; + display: inline-flex; align-items: center; } diff --git a/frontend/src/components/operations/internal-link-operation/index.js b/frontend/src/components/operations/internal-link-operation.js similarity index 88% rename from frontend/src/components/operations/internal-link-operation/index.js rename to frontend/src/components/operations/internal-link-operation.js index dae8f8dfa1..667764ce98 100644 --- a/frontend/src/components/operations/internal-link-operation/index.js +++ b/frontend/src/components/operations/internal-link-operation.js @@ -1,7 +1,8 @@ import React, { Fragment } from 'react'; import PropTypes from 'prop-types'; -import { gettext } from '../../../utils/constants'; -import InternalLinkDialog from '../../dialog/internal-link-dialog'; +import { gettext } from '../../utils/constants'; +import InternalLinkDialog from '../dialog/internal-link-dialog'; +import './internal-link-operation.css'; const propTypes = { repoID: PropTypes.string.isRequired, diff --git a/frontend/src/pages/markdown-editor/header-toolbar/file-info.js b/frontend/src/pages/markdown-editor/header-toolbar/file-info.js index 37c5183f82..aee7d97e46 100644 --- a/frontend/src/pages/markdown-editor/header-toolbar/file-info.js +++ b/frontend/src/pages/markdown-editor/header-toolbar/file-info.js @@ -2,7 +2,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import moment from 'moment'; import { gettext } from '../../../utils/constants'; -import { InternalLinkOperation } from '../../../components/operations'; +import InternalLinkOperation from '../../../components/operations/internal-link-operation'; const { repoID, filePath } = window.app.pageOptions;