From a74eecd110b68e9747db0a6975dd0a28860dd461 Mon Sep 17 00:00:00 2001 From: Tim Down <158919+timdown@users.noreply.github.com> Date: Wed, 31 May 2023 10:14:08 +0100 Subject: [PATCH] Merge pull request #13259 from overleaf/td-history-survey-link History migration: Add beta badge to history toolbar GitOrigin-RevId: e5c818953a7d41c31018a2d39c3937d70c057f8c --- .../history/components/diff-view/toolbar/toolbar.tsx | 5 +++++ .../web/frontend/stylesheets/app/editor/history-react.less | 5 +---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/services/web/frontend/js/features/history/components/diff-view/toolbar/toolbar.tsx b/services/web/frontend/js/features/history/components/diff-view/toolbar/toolbar.tsx index 9f75b8f449..c769285f8f 100644 --- a/services/web/frontend/js/features/history/components/diff-view/toolbar/toolbar.tsx +++ b/services/web/frontend/js/features/history/components/diff-view/toolbar/toolbar.tsx @@ -5,6 +5,7 @@ import ToolbarDatetime from './toolbar-datetime' import ToolbarFileInfo from './toolbar-file-info' import ToolbarRestoreFileButton from './toolbar-restore-file-button' import { isFileRemoved } from '../../../utils/file-diff' +import SplitTestBadge from '../../../../../shared/components/split-test-badge' type ToolbarProps = { diff: Nullable @@ -17,6 +18,10 @@ export default function Toolbar({ diff, selection }: ToolbarProps) { return (
+ {selection.selectedFile?.pathname ? ( diff --git a/services/web/frontend/stylesheets/app/editor/history-react.less b/services/web/frontend/stylesheets/app/editor/history-react.less index ce31d6011e..b87d3ea9f0 100644 --- a/services/web/frontend/stylesheets/app/editor/history-react.less +++ b/services/web/frontend/stylesheets/app/editor/history-react.less @@ -266,6 +266,7 @@ history-root { .history-react-toolbar { display: flex; align-items: center; + gap: 8px; .history-react-toolbar-file-info { flex: 1; @@ -275,10 +276,6 @@ history-root { .history-react-toolbar-time { font-weight: 700; } - - .history-react-toolbar-restore-file-button { - margin-left: 5px; - } } .history-paywall-prompt {