From 73e2bb22ca4bd1207e73ce5a9fa127c1de426372 Mon Sep 17 00:00:00 2001
From: anika-ahluwalia <anika.ahluwalia@gmail.com>
Date: Wed, 12 Aug 2020 19:55:19 -0500
Subject: all deletes to close

---
 src/client/views/DocumentDecorations.tsx | 2 +-
 src/client/views/PropertiesButtons.tsx   | 6 +++---
 src/client/views/nodes/DocumentView.tsx  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/client/views/DocumentDecorations.tsx b/src/client/views/DocumentDecorations.tsx
index fdf802c6a..c5e3e6752 100644
--- a/src/client/views/DocumentDecorations.tsx
+++ b/src/client/views/DocumentDecorations.tsx
@@ -616,7 +616,7 @@ export class DocumentDecorations extends React.Component<{}, { value: string }>
                 <div className="documentDecorations-contextMenu" onPointerDown={this.onSettingsDown}>
                     <FontAwesomeIcon size="lg" icon="cog" />
                 </div></Tooltip>) : canDelete ? (
-                    <Tooltip title={<><div className="dash-tooltip">Delete</div></>} placement="top">
+                    <Tooltip title={<><div className="dash-tooltip">Close</div></>} placement="top">
                         <div className="documentDecorations-closeButton" onClick={this.onCloseClick}>
                             {/* Currently, this is set to be enabled if there is no ink selected. It might be interesting to think about minimizing ink if it's useful? -syip2*/}
                             <FontAwesomeIcon className="documentdecorations-times" icon={faTimes} size="lg" />
diff --git a/src/client/views/PropertiesButtons.tsx b/src/client/views/PropertiesButtons.tsx
index 2451ff55a..1790acfcb 100644
--- a/src/client/views/PropertiesButtons.tsx
+++ b/src/client/views/PropertiesButtons.tsx
@@ -416,14 +416,14 @@ export class PropertiesButtons extends React.Component<{}, {}> {
     get deleteButton() {
         const targetDoc = this.selectedDoc;
         return !targetDoc ? (null) : <Tooltip
-            title={<><div className="dash-tooltip">{"Delete Document"}</div></>} placement="top">
+            title={<><div className="dash-tooltip">Close Document</div></>} placement="top">
             <div>
                 <div className={"propertiesButtons-linkButton-empty"}
                     onPointerDown={this.deleteDocument}>
                     {<FontAwesomeIcon className="propertiesButtons-icon"
-                        icon="trash-alt" size="lg" />}
+                        icon="times" size="lg" />}
                 </div>
-                <div className="propertiesButtons-title"> delete </div>
+                <div className="propertiesButtons-title"> close </div>
             </div>
         </Tooltip>;
     }
diff --git a/src/client/views/nodes/DocumentView.tsx b/src/client/views/nodes/DocumentView.tsx
index a1c934e81..c877e2054 100644
--- a/src/client/views/nodes/DocumentView.tsx
+++ b/src/client/views/nodes/DocumentView.tsx
@@ -767,7 +767,7 @@ export class DocumentView extends DocComponent<DocumentViewProps, Document>(Docu
             Doc.AreProtosEqual(this.props.Document, Doc.UserDoc()) && moreItems.push({ description: "Toggle Always Show Link End", event: () => Doc.UserDoc()["documentLinksButton-hideEnd"] = !Doc.UserDoc()["documentLinksButton-hideEnd"], icon: "eye" });
         }
 
-        moreItems.push({ description: "Close", event: this.deleteClicked, icon: "trash" });
+        moreItems.push({ description: "Close", event: this.deleteClicked, icon: "times" });
 
         !more && cm.addItem({ description: "More...", subitems: moreItems, icon: "hand-point-right" });
         cm.moveAfter(cm.findByDescription("More...")!, cm.findByDescription("OnClick...")!);
-- 
cgit v1.2.3-70-g09d2


From 712448a2a9abef831bed8701a87c02ee96a354c1 Mon Sep 17 00:00:00 2001
From: anika-ahluwalia <anika.ahluwalia@gmail.com>
Date: Wed, 12 Aug 2020 23:29:04 -0500
Subject: default to private

---
 src/client/util/CurrentUserUtils.ts  | 1 +
 src/client/util/SettingsManager.scss | 6 ++++++
 2 files changed, 7 insertions(+)

(limited to 'src')

diff --git a/src/client/util/CurrentUserUtils.ts b/src/client/util/CurrentUserUtils.ts
index e06dec663..dddef33b3 100644
--- a/src/client/util/CurrentUserUtils.ts
+++ b/src/client/util/CurrentUserUtils.ts
@@ -909,6 +909,7 @@ export class CurrentUserUtils {
         doc.fontFamily = StrCast(doc.fontFamily, "Arial");
         doc.fontColor = StrCast(doc.fontColor, "black");
         doc.fontHighlight = StrCast(doc.fontHighlight, "");
+        doc.defaultAclPrivate = BoolCast(doc.defaultAclPrivate, true);
         doc.activeCollectionBackground = StrCast(doc.activeCollectionBackground, "white");
         doc.activeCollectionNestedBackground = Cast(doc.activeCollectionNestedBackground, "string", null);
         doc.noviceMode = BoolCast(doc.noviceMode, true);
diff --git a/src/client/util/SettingsManager.scss b/src/client/util/SettingsManager.scss
index 560786400..ec513e5d5 100644
--- a/src/client/util/SettingsManager.scss
+++ b/src/client/util/SettingsManager.scss
@@ -97,6 +97,8 @@
 
 .modes-content {
     display: flex;
+    margin-left: 10px;
+    font-size: 12;
 
     .modes-select {
         // width: 170px;
@@ -112,6 +114,8 @@
     .modes-playground,
     .default-acl {
         display: flex;
+        margin-left: 10px;
+        font-size: 12;
 
         .playground-check,
         .acl-check {
@@ -125,10 +129,12 @@
         .playground-text {
             color: black;
             margin-right: 10px;
+            margin-top: 2;
         }
 
         .acl-text {
             color: black;
+            margin-top: 2;
         }
 
     }
-- 
cgit v1.2.3-70-g09d2