aboutsummaryrefslogtreecommitdiff
path: root/src/client/views/topbar
diff options
context:
space:
mode:
authorJenny Yu <jennyyu212@outlook.com>2022-06-08 19:00:02 -0700
committerJenny Yu <jennyyu212@outlook.com>2022-06-08 19:00:02 -0700
commitdff15ea5cc4b351f9bea90c1822e1b02d4f0730b (patch)
treee3e893b6b8fdf95e9860673f0b4357e26dc9ff1d /src/client/views/topbar
parent88a8f35c33bbff61b0058a66d7bcc586d483deca (diff)
parent0ae3de67900489a6ffd43eabaa810c3ec3fdddd9 (diff)
fix: merge conflicts
Diffstat (limited to 'src/client/views/topbar')
-rw-r--r--src/client/views/topbar/TopBar.tsx6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/client/views/topbar/TopBar.tsx b/src/client/views/topbar/TopBar.tsx
index be248ab92..e486bcb52 100644
--- a/src/client/views/topbar/TopBar.tsx
+++ b/src/client/views/topbar/TopBar.tsx
@@ -48,7 +48,7 @@ export class TopBar extends React.Component {
await CurrentUserUtils.createNewDashboard(Doc.UserDoc());
batch.end();
}}>
- {"New"}<FontAwesomeIcon icon="plus" />
+ New<FontAwesomeIcon icon="plus" />
</div>
</Tooltip>
<Tooltip title={<div className="dash-tooltip">Work on a copy of the dashboard layout</div>} placement="bottom">
@@ -57,12 +57,12 @@ export class TopBar extends React.Component {
await CurrentUserUtils.snapshotDashboard(Doc.UserDoc());
batch.end();
}}>
- {"Snapshot"}<FontAwesomeIcon icon="camera" />
+ Snapshot<FontAwesomeIcon icon="camera" />
</div>
</Tooltip>
<Tooltip title={<div className="dash-tooltip">Browsing mode for directly navigating to documents</div>} placement="bottom">
<div className="topbar-icon" style={{ background: MainView.Instance._exploreMode ? Colors.LIGHT_BLUE : undefined }} onClick={action(() => MainView.Instance._exploreMode = !MainView.Instance._exploreMode)}>
- {"Explore"}<FontAwesomeIcon icon="map" />
+ Explore<FontAwesomeIcon icon="map" />
</div>
</Tooltip>
</div>