haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-22 11:57:34 +00:00
Code Issues Releases Wiki Activity

Merge branch '7.0'

Browse Source
This commit is contained in:
plt
2019-06-25 13:49:34 +08:00
parent 7f930237ec 99c6671a0f
commit 23eb209738
5 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
frontend/package-lock.json generated
View File

@@ -433,9 +433,9 @@
"integrity": "sha512-YsAX+gnnf1ytv7asZgJP7T56DALQniKtRVtlz0f11PljLV19I1Av+Oz3QcYaRiKhCCB+EMnVKI9Yc14sYKp6lA==" "integrity": "sha512-YsAX+gnnf1ytv7asZgJP7T56DALQniKtRVtlz0f11PljLV19I1Av+Oz3QcYaRiKhCCB+EMnVKI9Yc14sYKp6lA=="
}, },
"@seafile/seafile-editor": { "@seafile/seafile-editor": {
"version": "0.2.41", "version": "0.2.42",
"resolved": "https://registry.npmjs.org/@seafile/seafile-editor/-/seafile-editor-0.2.41.tgz", "resolved": "https://registry.npmjs.org/@seafile/seafile-editor/-/seafile-editor-0.2.42.tgz",
"integrity": "sha512-avaxxHbnJugB4c6PI/Ov2rOUn+D5XnhMC4M72LK/HKT4MTMsYhvnf2LU/ZMdXX5y0YkLyoqCPFJZnsN0B4oucw==", "integrity": "sha512-8tuLzdj75O4soDp67Am3TofrlTx08fG91ExDNSeKJsQvUhnJWSDBLlrBtUhNLlU+iSr2+NtxE5C+ZRnui+xJOA==",
"requires": { "requires": {
"@seafile/slate-react": "^0.1.8", "@seafile/slate-react": "^0.1.8",
"autoprefixer": "7.1.6", "autoprefixer": "7.1.6",
@@ -14546,9 +14546,9 @@
} }
}, },
"rc-calendar": { "rc-calendar": {
"version": "9.15.0", "version": "9.15.1",
"resolved": "https://registry.npmjs.org/rc-calendar/-/rc-calendar-9.15.0.tgz", "resolved": "https://registry.npmjs.org/rc-calendar/-/rc-calendar-9.15.1.tgz",
"integrity": "sha512-jmyiSG2QWIwB6Po2PySwB+kwpodWMxLVIJ0G2VJKu3jPQL0hNbsV47U28bhQzHkm5o0B3rJ3Tm+lk2VLcKbkaA==", "integrity": "sha512-cJcq3DnNYrYvDi0CvoguRf2eBGN/E+svs1Dm3cPEsi4yVhxMjNGdq/5Iyxa84dCOWOJHV5NcecUIasfwvaTuoQ==",
"requires": { "requires": {
"babel-runtime": "6.x", "babel-runtime": "6.x",
"classnames": "2.x", "classnames": "2.x",

2
frontend/package.json
View File

@@ -6,7 +6,7 @@
"@reach/router": "^1.2.0", "@reach/router": "^1.2.0",
"@seafile/dtable": "0.0.37", "@seafile/dtable": "0.0.37",
"@seafile/resumablejs": "^1.1.9", "@seafile/resumablejs": "^1.1.9",
"@seafile/seafile-editor": "^0.2.41", "@seafile/seafile-editor": "^0.2.42",
"MD5": "^1.3.0", "MD5": "^1.3.0",
"autoprefixer": "7.1.6", "autoprefixer": "7.1.6",
"classnames": "^2.2.6", "classnames": "^2.2.6",

4
frontend/src/components/dialog/add-related-file-dialog.js
View File

@@ -87,7 +87,7 @@ class AddRelatedFileDialog extends React.Component {
let subtitle = gettext('Select related file for {placeholder}'); let subtitle = gettext('Select related file for {placeholder}');
subtitle = subtitle.replace('{placeholder}', '<span class="op-target">' + Utils.HTMLescape(this.props.dirent.name) + '</span>'); subtitle = subtitle.replace('{placeholder}', '<span class="op-target">' + Utils.HTMLescape(this.props.dirent.name) + '</span>');
return ( return (
<Fragment> <div className="sf-add-related-file">
<ModalHeader toggle={this.props.onClose}> <ModalHeader toggle={this.props.onClose}>
<span className="tag-dialog-back fas fa-sm fa-arrow-left" onClick={this.toggle} aria-label={gettext('Back')}></span> <span className="tag-dialog-back fas fa-sm fa-arrow-left" onClick={this.toggle} aria-label={gettext('Back')}></span>
{gettext('Select File')} {gettext('Select File')}
@@ -111,7 +111,7 @@ class AddRelatedFileDialog extends React.Component {
<Button color="primary" disabled>{gettext('Submit')}</Button> <Button color="primary" disabled>{gettext('Submit')}</Button>
} }
</ModalFooter> </ModalFooter>
</Fragment> </div>
); );
} }
} }

3
frontend/src/css/dirent-detail.css
View File

@@ -167,7 +167,8 @@
} }
.sf-add-related-file .related-file-subtitle { .sf-add-related-file .related-file-subtitle {
margin-bottom: 4px; display: inline-block;
margin-bottom: 0.5rem;
} }
.detail-container .tab-content { .detail-container .tab-content {

4
frontend/src/css/file-chooser.css
View File

@@ -1,7 +1,9 @@
.file-chooser-container { .file-chooser-container {
padding: 0.5rem; padding: 0.5rem;
height: 20rem; height: 20rem;
border: 1px solid #eee; border: 1px solid rgba(0, 40, 100, 0.12);
border-radius: 3px;
transition: border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
overflow: auto; overflow: auto;
font-size: 1rem; font-size: 1rem;
} }