diff --git a/frontend/src/components/toolbar/groups-toolbar.js b/frontend/src/components/toolbar/groups-toolbar.js index a3720d2bd3..bc236b1d1f 100644 --- a/frontend/src/components/toolbar/groups-toolbar.js +++ b/frontend/src/components/toolbar/groups-toolbar.js @@ -1,5 +1,6 @@ import React from 'react'; import PropTypes from 'prop-types'; +import MediaQuery from 'react-responsive'; import CommonToolbar from './common-toolbar'; import { Button } from 'reactstrap'; import { gettext } from '../../utils/constants'; @@ -24,9 +25,16 @@ class GroupsToolbar extends React.Component {
- + + + + + +
diff --git a/frontend/src/components/wiki-markdown-viewer.js b/frontend/src/components/wiki-markdown-viewer.js index ac391851f4..a6cc0c4103 100644 --- a/frontend/src/components/wiki-markdown-viewer.js +++ b/frontend/src/components/wiki-markdown-viewer.js @@ -234,9 +234,11 @@ class WikiMarkdownViewer extends React.Component { if (this.props.isFileLoading) { return ; } + // In dir-column-file repoID is one of props, width is 100%; In wiki-viewer repoID is not props, width isn't 100% + let contentClassName = `${this.props.repoID ? contentClass + ' w-100' : contentClass}` return (
-
+
{this.props.children} {this.renderMarkdown()} {this.props.isWiki && this.renderRelatedFiles()} diff --git a/frontend/src/css/wiki.css b/frontend/src/css/wiki.css index 3a2d4c8921..240cf9f2d6 100644 --- a/frontend/src/css/wiki.css +++ b/frontend/src/css/wiki.css @@ -101,7 +101,7 @@ img[src=""] { width: 100%; padding-right: 0; } - .cur-view-content .markdown-outline { + .cur-view-content .seafile-markdown-outline { display: none; } } diff --git a/frontend/src/pages/shared-with-all/public-shared-view.js b/frontend/src/pages/shared-with-all/public-shared-view.js index 63ad0f9fce..6bcaee8991 100644 --- a/frontend/src/pages/shared-with-all/public-shared-view.js +++ b/frontend/src/pages/shared-with-all/public-shared-view.js @@ -1,6 +1,7 @@ import React, { Fragment } from 'react'; import PropTypes from 'prop-types'; import cookie from 'react-cookies'; +import MediaQuery from 'react-responsive'; import { Dropdown, DropdownToggle, DropdownMenu, DropdownItem} from 'reactstrap'; import { seafileAPI } from '../../utils/seafile-api'; import { gettext, loginUrl, canAddPublicRepo } from '../../utils/constants'; @@ -174,9 +175,16 @@ class PublicSharedView extends React.Component {
- - {gettext('Add Library')} - + + + {gettext('Add Library')} + + + + + {gettext('Add Library')} + + {gettext('Share existing libraries')} {gettext('New Library')} diff --git a/frontend/src/pages/wiki/main-panel.js b/frontend/src/pages/wiki/main-panel.js index f3135d2140..e3fc05a324 100644 --- a/frontend/src/pages/wiki/main-panel.js +++ b/frontend/src/pages/wiki/main-panel.js @@ -1,5 +1,6 @@ import React, { Component, Fragment } from 'react'; import PropTypes from 'prop-types'; +import MediaQuery from 'react-responsive'; import { gettext, repoID, slug, siteRoot, username } from '../../utils/constants'; import CommonToolbar from '../../components/toolbar/common-toolbar'; import WikiMarkdownViewer from '../../components/wiki-markdown-viewer'; @@ -78,9 +79,14 @@ class MainPanel extends Component {
- {this.props.permission === 'rw' && ( - - )} + + {this.props.permission === 'rw' && + } + + + {this.props.permission === 'rw' && + } +
- {canPublishRepo && - - } + {canPublishRepo && + + + + + + + }