aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoranika-ahluwalia <anika.ahluwalia@gmail.com>2020-07-25 10:27:27 -0500
committeranika-ahluwalia <anika.ahluwalia@gmail.com>2020-07-25 10:27:27 -0500
commit229e8ba914943da0d11dff00d14a8adae950d853 (patch)
tree06c61b071d3f554b225bb5ae77724834647a6af8
parentee3d12fbf6306da958ae6546260921f5fee5553b (diff)
exit button for properties
-rw-r--r--src/client/views/MainView.tsx1
-rw-r--r--src/client/views/collections/collectionFreeForm/PropertiesView.scss23
-rw-r--r--src/client/views/collections/collectionFreeForm/PropertiesView.tsx6
-rw-r--r--src/client/views/nodes/DocumentLinksButton.tsx5
4 files changed, 31 insertions, 4 deletions
diff --git a/src/client/views/MainView.tsx b/src/client/views/MainView.tsx
index c08717947..734b45dd0 100644
--- a/src/client/views/MainView.tsx
+++ b/src/client/views/MainView.tsx
@@ -621,6 +621,7 @@ export class MainView extends React.Component {
height={this._panelHeight}
renderDepth={1}
ScreenToLocalTransform={Transform.Identity}
+ onDown={this.onDown}
/>
</div>;
}
diff --git a/src/client/views/collections/collectionFreeForm/PropertiesView.scss b/src/client/views/collections/collectionFreeForm/PropertiesView.scss
index b40a08086..7b8f116b7 100644
--- a/src/client/views/collections/collectionFreeForm/PropertiesView.scss
+++ b/src/client/views/collections/collectionFreeForm/PropertiesView.scss
@@ -10,10 +10,29 @@
.propertiesView-title {
background-color: rgb(159, 159, 159);
text-align: center;
- font-size: 18px;
- font-weight: bold;
padding-top: 12px;
padding-bottom: 12px;
+ display: flex;
+
+ .propertiesView-title-name {
+ font-size: 18px;
+ font-weight: bold;
+ padding-left: 45px;
+ }
+
+ .propertiesView-title-icon {
+ width: 20px;
+ height: 20px;
+ padding-left: 32px;
+ margin-top: -5px;
+
+ &:hover {
+ color: grey;
+ cursor: pointer;
+ }
+
+ }
+
}
.propertiesView-name {
diff --git a/src/client/views/collections/collectionFreeForm/PropertiesView.tsx b/src/client/views/collections/collectionFreeForm/PropertiesView.tsx
index e911c7a9f..a75ad13e5 100644
--- a/src/client/views/collections/collectionFreeForm/PropertiesView.tsx
+++ b/src/client/views/collections/collectionFreeForm/PropertiesView.tsx
@@ -25,6 +25,7 @@ interface PropertiesViewProps {
height: number;
renderDepth: number;
ScreenToLocalTransform: () => Transform;
+ onDown: (event: any) => void;
}
@observer
@@ -225,7 +226,10 @@ export class PropertiesView extends React.Component<PropertiesViewProps> {
return <div className="propertiesView" >
<div className="propertiesView-title">
- Properties
+ <div className="propertiesView-title-name">Properties </div>
+ <div className="propertiesView-title-icon" onPointerDown={this.props.onDown}>
+ <FontAwesomeIcon icon="times" color="black" size="sm" />
+ </div>
</div>
<div className="propertiesView-name">
{this.selectedDoc.title}
diff --git a/src/client/views/nodes/DocumentLinksButton.tsx b/src/client/views/nodes/DocumentLinksButton.tsx
index b17accfd6..fa7fe64f3 100644
--- a/src/client/views/nodes/DocumentLinksButton.tsx
+++ b/src/client/views/nodes/DocumentLinksButton.tsx
@@ -194,8 +194,11 @@ export class DocumentLinksButton extends React.Component<DocumentLinksButtonProp
// }))}
>
+ {/* {this.props.InMenu ? this.props.StartLink ? <FontAwesomeIcon className="documentdecorations-icon" icon="link" size="sm" /> :
+ <FontAwesomeIcon className="documentdecorations-icon" icon="hand-paper" size="sm" /> : links.length} */}
+
{this.props.InMenu ? this.props.StartLink ? <FontAwesomeIcon className="documentdecorations-icon" icon="link" size="sm" /> :
- <FontAwesomeIcon className="documentdecorations-icon" icon="hand-paper" size="sm" /> : links.length}
+ link : links.length}
</div>
{DocumentLinksButton.StartLink && this.props.InMenu && !!!this.props.StartLink && DocumentLinksButton.StartLink !== this.props.View ? <div className={"documentLinksButton-endLink"}