From 53bcf6cf1115673791406d51edc1913a43ab9bc3 Mon Sep 17 00:00:00 2001
From: srichman333 <sarah_n_richman@brown.edu>
Date: Mon, 20 Feb 2023 00:51:34 -0500
Subject: merge

---
 src/.DS_Store | Bin 10244 -> 10244 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

(limited to 'src')

diff --git a/src/.DS_Store b/src/.DS_Store
index 4ed785983..717b68f3e 100644
Binary files a/src/.DS_Store and b/src/.DS_Store differ
-- 
cgit v1.2.3-70-g09d2


From 560d1d972b3dedb03f8af117f38b8bd836e9eccb Mon Sep 17 00:00:00 2001
From: srichman333 <sarah_n_richman@brown.edu>
Date: Mon, 20 Feb 2023 02:01:00 -0500
Subject: view all and snap lines button icons

---
 package-lock.json                      | 6 +++---
 src/client/views/PropertiesButtons.tsx | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/package-lock.json b/package-lock.json
index d1ee7f9e3..c0c4e362d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4998,9 +4998,9 @@
             }
         },
         "core-js": {
-            "version": "1.2.7",
-            "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz",
-            "integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY="
+            "version": "3.28.0",
+            "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.28.0.tgz",
+            "integrity": "sha512-GiZn9D4Z/rSYvTeg1ljAIsEqFm0LaN9gVtwDCrKL80zHtS31p9BAjmTxVqTQDMpwlMolJZOFntUG2uwyj7DAqw=="
         },
         "core-js-pure": {
             "version": "3.28.0",
diff --git a/src/client/views/PropertiesButtons.tsx b/src/client/views/PropertiesButtons.tsx
index 65a950711..9bb21a662 100644
--- a/src/client/views/PropertiesButtons.tsx
+++ b/src/client/views/PropertiesButtons.tsx
@@ -114,7 +114,7 @@ export class PropertiesButtons extends React.Component<{}, {}> {
             'View All',
             '_fitContentsToBox',
             on => `${on ? "Don't" : 'Do'} fit content to container visible area`,
-            on => 'eye'
+            on => 'object-group'
         );
     }
     // this implments a container pattern by marking the targetDoc (collection) as an inPlace container,
@@ -242,7 +242,7 @@ export class PropertiesButtons extends React.Component<{}, {}> {
             'Snap\xA0Lines',
             'showSnapLines',
             on => `Display snapping lines when objects are dragged`,
-            on => 'border-all',
+            on => 'th',
             undefined,
             true
         );
-- 
cgit v1.2.3-70-g09d2


From 7cd43c51fe13b3fb0f76d026a16caee5bc320f4e Mon Sep 17 00:00:00 2001
From: srichman333 <sarah_n_richman@brown.edu>
Date: Mon, 20 Feb 2023 11:32:38 -0500
Subject: freeze icon

---
 src/client/views/PropertiesButtons.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/client/views/PropertiesButtons.tsx b/src/client/views/PropertiesButtons.tsx
index 9bb21a662..a152b4948 100644
--- a/src/client/views/PropertiesButtons.tsx
+++ b/src/client/views/PropertiesButtons.tsx
@@ -222,7 +222,7 @@ export class PropertiesButtons extends React.Component<{}, {}> {
             'FreezeThumb',
             '_thumb-frozen',
             on => `${on ? 'Freeze' : 'Unfreeze'} thumbnail`,
-            on => 'arrows-alt-h',
+            on => 'snowflake',
             (dv, doc) => {
                 if (doc['thumb-frozen']) doc['thumb-frozen'] = undefined;
                 else {
-- 
cgit v1.2.3-70-g09d2