Merge branch 'newDocs' of https://github.com/browngraphicslab/Dash-Web into newDocs

3 files changed, 18 insertions, 15 deletions

diff --git a/src/client/views/nodes/LinkBox.scss b/src/client/views/nodes/LinkBox.scss
index 8bc70b48f..639f83b38 100644
--- a/src/client/views/nodes/LinkBox.scss
+++ b/src/client/views/nodes/LinkBox.scss
@@ -1,14 +1,14 @@
 @import "../globalCssVariables";
 .link-container {
     width: 100%;
-    height: 35px;
+    height: 50px;
     display: flex;
     flex-direction: row;
     border-top: 0.5px solid #bababa;
 }
 
 .info-container {
-    width: 55%;
+    width: 65%;
     padding-top: 5px;
     padding-left: 5px;
     display: flex;
@@ -24,7 +24,8 @@
 }
 
 .button-container {
-    width: 45%;
+    width: 35%;
+    padding-top: 8px;
     display: flex;
     flex-direction: row;
 }
@@ -49,17 +50,17 @@
     cursor: pointer;
 }
 
-.fa-icon-view {
-    margin-left: 3px;
-    margin-top: 5px;
-}
+// .fa-icon-view {
+//     margin-left: 3px;
+//     margin-top: 5px;
+// }
 
 .fa-icon-edit {
-    margin-left: 5px;
-    margin-top: 5px;
+    margin-left: 6px;
+    margin-top: 6px;
 }
 
 .fa-icon-delete {
-    margin-left: 6px;
-    margin-top: 5px;
+    margin-left: 7px;
+    margin-top: 6px;
 }
\ No newline at end of file
diff --git a/src/client/views/nodes/LinkBox.tsx b/src/client/views/nodes/LinkBox.tsx
index 9bb90de0d..b1e7fd6d7 100644
--- a/src/client/views/nodes/LinkBox.tsx
+++ b/src/client/views/nodes/LinkBox.tsx
@@ -10,6 +10,7 @@ import React = require("react");
 import { Doc } from '../../../new_fields/Doc';
 import { Cast, NumCast } from '../../../new_fields/Types';
 import { listSpec } from '../../../new_fields/Schema';
+import { action } from 'mobx';
 
 
 library.add(faEye);
@@ -45,6 +46,7 @@ export class LinkBox extends React.Component<Props> {
                 }
                 let contextView = DocumentManager.Instance.getDocumentView(contextDoc);
                 if (contextView) {
+                    contextDoc.panTransformType = "Ease";
                     contextView.props.focus(contextDoc);
                 } else {
                     CollectionDockingView.Instance.AddRightSplit(contextDoc);
@@ -59,6 +61,7 @@ export class LinkBox extends React.Component<Props> {
         this.props.showEditor();
     }
 
+    @action
     onDeleteButtonPressed = async (e: React.PointerEvent): Promise<void> => {
         e.stopPropagation();
         const [linkedFrom, linkedTo] = await Promise.all([Cast(this.props.linkDoc.linkedFrom, Doc), Cast(this.props.linkDoc.linkedTo, Doc)]);
@@ -91,8 +94,8 @@ export class LinkBox extends React.Component<Props> {
                 </div>
 
                 <div className="button-container">
-                    <div title="Follow Link" className="button" onPointerDown={this.onViewButtonPressed}>
-                        <FontAwesomeIcon className="fa-icon-view" icon="eye" size="sm" /></div>
+                    {/* <div title="Follow Link" className="button" onPointerDown={this.onViewButtonPressed}>
+                        <FontAwesomeIcon className="fa-icon-view" icon="eye" size="sm" /></div> */}
                     <div title="Edit Link" className="button" onPointerDown={this.onEditButtonPressed}>
                         <FontAwesomeIcon className="fa-icon-edit" icon="edit" size="sm" /></div>
                     <div title="Delete Link" className="button" onPointerDown={this.onDeleteButtonPressed}>
diff --git a/src/client/views/nodes/LinkEditor.scss b/src/client/views/nodes/LinkEditor.scss
index ea2e7289c..9629585d7 100644
--- a/src/client/views/nodes/LinkEditor.scss
+++ b/src/client/views/nodes/LinkEditor.scss
@@ -22,7 +22,7 @@
 
 .save-button {
     width: 50px;
-    height: 20px;
+    height: 22px;
     pointer-events: auto;
     background-color: $dark-color;
     color: $light-color;
@@ -38,6 +38,5 @@
 
 .save-button:hover {
     background: $main-accent;
-    transform: scale(1.05);
     cursor: pointer;
 }
\ No newline at end of file