diff options
| author | anika-ahluwalia <anika.ahluwalia@gmail.com> | 2020-07-03 18:52:00 -0500 |
|---|---|---|
| committer | anika-ahluwalia <anika.ahluwalia@gmail.com> | 2020-07-03 18:52:00 -0500 |
| commit | 397f9811b6675dce5e770082ee68435b7e560f7f (patch) | |
| tree | 09cb1933ad5805c2df8fa32db2dadd8f85f24f51 /src/client | |
| parent | ed74b8b6d6c65a24803c4e0e68aa192a750d60fa (diff) | |
| parent | a979ebce6cf3b3aaa0fb6ea3870988b6edc6a889 (diff) | |
merge w master
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/util/CurrentUserUtils.ts | 1 | ||||
| -rw-r--r-- | src/client/views/collections/CollectionViewChromes.tsx | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/client/util/CurrentUserUtils.ts b/src/client/util/CurrentUserUtils.ts index 02c3e55ed..4276e04e4 100644 --- a/src/client/util/CurrentUserUtils.ts +++ b/src/client/util/CurrentUserUtils.ts @@ -59,7 +59,6 @@ export class CurrentUserUtils { const queryTemplate = this.mobileButton({ title: "NEW MOBILE BUTTON", onClick: undefined, - _backgroundColor: "lightgrey" }, [this.ficon({ ignoreClick: true, diff --git a/src/client/views/collections/CollectionViewChromes.tsx b/src/client/views/collections/CollectionViewChromes.tsx index c20f2162a..7f1fe7649 100644 --- a/src/client/views/collections/CollectionViewChromes.tsx +++ b/src/client/views/collections/CollectionViewChromes.tsx @@ -300,7 +300,7 @@ export class CollectionViewBaseChrome extends React.Component<CollectionViewChro onPointerDown={stopPropagation} onChange={this.viewChanged} value={StrCast(this.props.CollectionView.props.Document._viewType)}> - {Object.values(CollectionViewType).map(type => ["invalid", "docking"].includes(type) ? (null) : ( + {Object.values(CollectionViewType).map(type => [CollectionViewType.Invalid, CollectionViewType.Docking].includes(type) ? (null) : ( <option key={Utils.GenerateGuid()} className="collectionViewBaseChrome-viewOption" |