Merge branch 'master' into james-text-icons

1 files changed, 13 insertions, 3 deletions

diff --git a/src/client/views/PropertiesButtons.tsx b/src/client/views/PropertiesButtons.tsx
index 66c3ed439..a152b4948 100644
--- a/src/client/views/PropertiesButtons.tsx
+++ b/src/client/views/PropertiesButtons.tsx
@@ -77,6 +77,14 @@ export class PropertiesButtons extends React.Component<{}, {}> {
             (dv, doc) => InkingStroke.toggleMask(dv?.layoutDoc || doc)
         );
     }
+    @computed get hideImageButton() {
+        return this.propertyToggleBtn(
+            'Background',
+            '_hideImage',
+            on => (on ? 'Show Image' : 'Show Background'),
+            on => 'portrait'
+        );
+    }
     @computed get clustersButton() {
         return this.propertyToggleBtn(
             'Clusters',
@@ -106,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,
@@ -214,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 {
@@ -234,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
         );
@@ -383,6 +391,7 @@ export class PropertiesButtons extends React.Component<{}, {}> {
         const layoutField = this.selectedDoc?.[Doc.LayoutFieldKey(this.selectedDoc)];
         const isText = layoutField instanceof RichTextField;
         const isInk = layoutField instanceof InkField;
+        const isImage = layoutField instanceof ImageField;
         const isMap = this.selectedDoc?.type === DocumentType.MAP;
         const isCollection = this.selectedDoc?.type === DocumentType.COL;
         //TODO: will likely need to create separate note-taking view type here
@@ -410,6 +419,7 @@ export class PropertiesButtons extends React.Component<{}, {}> {
                 {toggle(this.inPlaceContainerButton, { display: !isFreeForm && !isMap ? 'none' : '' })}
                 {toggle(this.autoHeightButton, { display: !isText && !isStacking && !isTree ? 'none' : '' })}
                 {toggle(this.maskButton, { display: !isInk ? 'none' : '' })}
+                {toggle(this.hideImageButton, { display: !isImage ? 'none' : '' })}
                 {toggle(this.chromeButton, { display: !isCollection || isNovice ? 'none' : '' })}
                 {toggle(this.gridButton, { display: !isCollection ? 'none' : '' })}
                 {toggle(this.groupButton, { display: isTabView || !isCollection ? 'none' : '' })}