From 4c8a528e382287005b2118611005bb84ab78598b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E9=A1=BA=E5=BC=BA?= <ysq9207@126.com>
Date: Tue, 12 Feb 2019 10:50:02 +0800
Subject: [PATCH] modify sf-font to op-target (#2932)

---
 frontend/src/components/dialog/add-related-file-dialog.js   | 2 +-
 frontend/src/components/dialog/copy-dirent-dialog.js        | 2 +-
 frontend/src/components/dialog/delete-repo-dialog.js        | 2 +-
 .../src/components/dialog/lib-history-setting-dialog.js     | 2 +-
 frontend/src/components/dialog/move-dirent-dialog.js        | 2 +-
 frontend/src/components/dialog/share-dialog.js              | 2 +-
 frontend/src/components/dialog/transfer-dialog.js           | 2 +-
 frontend/src/components/file-uploader/upload-list-item.js   | 4 ++--
 frontend/src/css/file-uploader.css                          | 5 +++++
 media/css/seahub_react.css                                  | 6 ------
 10 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/frontend/src/components/dialog/add-related-file-dialog.js b/frontend/src/components/dialog/add-related-file-dialog.js
index 8e35d6b805..18d58de12c 100644
--- a/frontend/src/components/dialog/add-related-file-dialog.js
+++ b/frontend/src/components/dialog/add-related-file-dialog.js
@@ -84,7 +84,7 @@ class AddRelatedFileDialog extends React.Component {
 
   render() {
     let subtitle = gettext('Select related file for {placeholder}');
-    subtitle = subtitle.replace('{placeholder}', '<span class="sf-font">' + Utils.HTMLescape(this.props.dirent.name) + '</span>');
+    subtitle = subtitle.replace('{placeholder}', '<span class="op-target">' + Utils.HTMLescape(this.props.dirent.name) + '</span>');
     return (
       <Modal isOpen={true} className="sf-add-related-file" toggle={this.toggle} >
         <ModalHeader toggle={this.toggle}>{gettext('Select File')}</ModalHeader>
diff --git a/frontend/src/components/dialog/copy-dirent-dialog.js b/frontend/src/components/dialog/copy-dirent-dialog.js
index f04fb465a1..d5bffded6a 100644
--- a/frontend/src/components/dialog/copy-dirent-dialog.js
+++ b/frontend/src/components/dialog/copy-dirent-dialog.js
@@ -152,7 +152,7 @@ class CopyDirent extends React.Component {
   render() {
     let title = gettext('Copy {placeholder} to:');
     if (!this.props.isMutipleOperation) {
-      title = title.replace('{placeholder}', '<span class="sf-font">' + Utils.HTMLescape(this.props.dirent.name) + '</span>');
+      title = title.replace('{placeholder}', '<span class="op-target">' + Utils.HTMLescape(this.props.dirent.name) + '</span>');
     } else {
       title = gettext('Copy selected item(s) to:');
     }
diff --git a/frontend/src/components/dialog/delete-repo-dialog.js b/frontend/src/components/dialog/delete-repo-dialog.js
index af8c492528..24dc14b1ba 100644
--- a/frontend/src/components/dialog/delete-repo-dialog.js
+++ b/frontend/src/components/dialog/delete-repo-dialog.js
@@ -26,7 +26,7 @@ class DeleteRepoDialog extends Component {
   render() {
 
     const data = this.props.data;
-    const repoName = data ? '<span class="sf-font">' + Utils.HTMLescape(data.repoName) + '</span>' : null;
+    const repoName = data ? '<span class="op-target">' + Utils.HTMLescape(data.repoName) + '</span>' : null;
     let message = gettext('Are you sure you want to delete %s ?');
     message = message.replace('%s', repoName);
     const popup = (
diff --git a/frontend/src/components/dialog/lib-history-setting-dialog.js b/frontend/src/components/dialog/lib-history-setting-dialog.js
index eb87853939..cee6c125d1 100644
--- a/frontend/src/components/dialog/lib-history-setting-dialog.js
+++ b/frontend/src/components/dialog/lib-history-setting-dialog.js
@@ -96,7 +96,7 @@ class LibHistorySetting extends React.Component {
     return (
       <Modal isOpen={true} centered={true}>
         <ModalHeader toggle={this.props.toggleDialog}>
-          <span className="sf-font" title={itemName}>{itemName}</span>{' '}
+          <span className="op-target" title={itemName}>{itemName}</span>{' '}
           {gettext('History Setting')}
         </ModalHeader>
         <ModalBody>
diff --git a/frontend/src/components/dialog/move-dirent-dialog.js b/frontend/src/components/dialog/move-dirent-dialog.js
index 517904699c..b7f40a3844 100644
--- a/frontend/src/components/dialog/move-dirent-dialog.js
+++ b/frontend/src/components/dialog/move-dirent-dialog.js
@@ -152,7 +152,7 @@ class MoveDirent extends React.Component {
   render() {
     let title = gettext('Move {placeholder} to:');
     if (!this.props.isMutipleOperation) {
-      title = title.replace('{placeholder}', '<span class="sf-font">' + Utils.HTMLescape(this.props.dirent.name) + '</span>');
+      title = title.replace('{placeholder}', '<span class="op-target">' + Utils.HTMLescape(this.props.dirent.name) + '</span>');
     } else {
       title = gettext('Move selected item(s) to:');
     }
diff --git a/frontend/src/components/dialog/share-dialog.js b/frontend/src/components/dialog/share-dialog.js
index 6b185922e6..efc1b1b831 100644
--- a/frontend/src/components/dialog/share-dialog.js
+++ b/frontend/src/components/dialog/share-dialog.js
@@ -156,7 +156,7 @@ class ShareDialog extends React.Component {
     return (
       <div>
         <Modal isOpen={true} style={{maxWidth: '720px'}} className="share-dialog">
-          <ModalHeader toggle={this.props.toggleDialog}>{gettext('Share')} <span className="sf-font" title={itemName}>{itemName}</span></ModalHeader>
+          <ModalHeader toggle={this.props.toggleDialog}>{gettext('Share')} <span className="op-target" title={itemName}>{itemName}</span></ModalHeader>
           <ModalBody className="dialog-list-container share-dialog-content">
             {(itemType === 'library' || itemType === 'dir') && this.renderDirContent()}
             {(itemType === 'file' && enableShareLink) && this.renderFileContent()}
diff --git a/frontend/src/components/dialog/transfer-dialog.js b/frontend/src/components/dialog/transfer-dialog.js
index 0c64a4c652..8c0b7c1ba0 100644
--- a/frontend/src/components/dialog/transfer-dialog.js
+++ b/frontend/src/components/dialog/transfer-dialog.js
@@ -66,7 +66,7 @@ class TransferDialog extends React.Component {
 
   render() {
     const itemName = this.props.itemName;
-    const innerSpan = '<span class="sf-font" title=' + itemName + '>' + itemName +'</span>';
+    const innerSpan = '<span class="op-target" title=' + itemName + '>' + itemName +'</span>';
     let msg = gettext('Transfer Library {library_name} To');
     let message = msg.replace('{library_name}', innerSpan);
     return (
diff --git a/frontend/src/components/file-uploader/upload-list-item.js b/frontend/src/components/file-uploader/upload-list-item.js
index 4a45ad26e3..ac4dfd1b16 100644
--- a/frontend/src/components/file-uploader/upload-list-item.js
+++ b/frontend/src/components/file-uploader/upload-list-item.js
@@ -49,10 +49,10 @@ class UploadListItem extends React.Component {
             <a href="#" onClick={this.onUploadCancel}>{gettext('cancel')}</a>
           )}
           {(!item.isSaved && progress === 100) && (
-            <span className="sf-font">{gettext('saving...')}</span>
+            <span className="saving">{gettext('saving...')}</span>
           )}
           {item.isSaved && (
-            <span>{gettext('uploaded')}</span>
+            <span className="uploaded">{gettext('uploaded')}</span>
           )}
         </td>
       </tr>
diff --git a/frontend/src/css/file-uploader.css b/frontend/src/css/file-uploader.css
index 264bb27169..a2f23f2bb7 100644
--- a/frontend/src/css/file-uploader.css
+++ b/frontend/src/css/file-uploader.css
@@ -54,4 +54,9 @@
 
 .file-upload-item .progress .progress-bar {
   color: #e83;
+}
+
+.file-upload-item .saving {
+  color: #ee8204;
+  word-wrap: break-word;
 }
\ No newline at end of file
diff --git a/media/css/seahub_react.css b/media/css/seahub_react.css
index 8d3caece5e..ae1e8e1a82 100644
--- a/media/css/seahub_react.css
+++ b/media/css/seahub_react.css
@@ -145,12 +145,6 @@ ul,ol,li {
     text-decoration: underline;
 }
 
-.sf-font {
-    color: #eb8205 !important;
-    text-decoration: none;
-    font-weight: normal;
-}
-
 .cursor-pointer {
     cursor: pointer;
 }