Merge branch 'master' into feat/importer

CHANGES.md

@@ -3,7 +3,7 @@ CHANGES
 
 ## 3.2.0-RC
 
-* Feature: HackMD integration so that user can simultaneously edit with multiple people
+* Feature: HackMD integration so that user will be able to simultaneously edit with multiple people
 * Feature: Login with Twitter Account
 * Fix: The Initial scroll position is wrong when reloading the page
 

resource/js/components/PageEditorByHackmd.jsx

@@ -250,14 +250,17 @@ export default class PageEditorByHackmd extends React.PureComponent {
               </MenuItem>
             </SplitButton>
           </div>
-          <p className="text-center">Click to edit from the previous continuation<br />or <span className="text-danger">Discard changes</span> from pull down.</p>
+          <p className="text-center">
+            Click to edit from the previous continuation<br />
+            or <button className="btn btn-link text-danger p-0 hackmd-discard-button" onClick={() => this.discardChanges()}>Discard changes</button>.
+          </p>
           { isHackmdDocumentOutdated &&
             <div className="panel panel-warning mt-5">
               <div className="panel-heading"><i className="icon-fw icon-info"></i> DRAFT MAY BE OUTDATED</div>
               <div className="panel-body text-center">
                 The current draft on HackMD is based on&nbsp;
                 <a href={`?revision=${revisionIdHackmdSynced}`}><span className="label label-default">{revisionIdHackmdSynced.substr(-8)}</span></a>.<br />
-                <span className="text-danger">Discard it</span> to start to edit with current revision.
+                <button className="btn btn-link text-danger p-0 hackmd-discard-button" onClick={() => this.discardChanges()}>Discard it</button> to start to edit with current revision.
               </div>
             </div>
           }

resource/styles/scss/_on-edit.scss

@@ -309,6 +309,10 @@ body.on-edit {
         right: 0;
       }
     }
+    .hackmd-discard-button {
+      vertical-align: unset;
+      text-decoration: underline;
+    }
 
   }