- {!newEditor && !mini && }
-
{activeSubView === 'cur_file' && }
{activeSubView === 'overview' && }
diff --git a/services/web/frontend/js/features/review-panel/hooks/use-review-panel-layout.ts b/services/web/frontend/js/features/review-panel/hooks/use-review-panel-layout.ts
index 04ed9d43c3..9813a3f349 100644
--- a/services/web/frontend/js/features/review-panel/hooks/use-review-panel-layout.ts
+++ b/services/web/frontend/js/features/review-panel/hooks/use-review-panel-layout.ts
@@ -1,9 +1,7 @@
-import { useLayoutContext } from '@/shared/context/layout-context'
import { useRangesContext } from '../context/ranges-context'
import { useThreadsContext } from '@/features/review-panel/context/threads-context'
import { hasActiveRange } from '@/features/review-panel/utils/has-active-range'
import { useRailContext } from '@/features/ide-react/context/rail-context'
-import { useIsNewEditorEnabled } from '@/features/ide-redesign/utils/new-editor-utils'
import { useCallback } from 'react'
export default function useReviewPanelLayout(): {
@@ -21,30 +19,16 @@ export default function useReviewPanelLayout(): {
openTab: openRailTab,
setIsOpen: setRailIsOpen,
} = useRailContext()
- const { reviewPanelOpen: reviewPanelOpenOldEditor, setReviewPanelOpen } =
- useLayoutContext()
- const newEditor = useIsNewEditorEnabled()
-
- const reviewPanelOpen = newEditor
- ? selectedRailTab === 'review-panel' && railIsOpen
- : reviewPanelOpenOldEditor
+ const reviewPanelOpen = selectedRailTab === 'review-panel' && railIsOpen
const openReviewPanel = useCallback(() => {
- if (newEditor) {
- openRailTab('review-panel')
- } else {
- setReviewPanelOpen(true)
- }
- }, [newEditor, setReviewPanelOpen, openRailTab])
+ openRailTab('review-panel')
+ }, [openRailTab])
const closeReviewPanel = useCallback(() => {
- if (newEditor) {
- setRailIsOpen(false)
- } else {
- setReviewPanelOpen(false)
- }
- }, [newEditor, setReviewPanelOpen, setRailIsOpen])
+ setRailIsOpen(false)
+ }, [setRailIsOpen])
const hasCommentOrChange = hasActiveRange(ranges, threads)
const showPanel = reviewPanelOpen || !!hasCommentOrChange
diff --git a/services/web/frontend/js/features/review-panel/utils/position-items.ts b/services/web/frontend/js/features/review-panel/utils/position-items.ts
index e38e663ab0..e237b4b7b2 100644
--- a/services/web/frontend/js/features/review-panel/utils/position-items.ts
+++ b/services/web/frontend/js/features/review-panel/utils/position-items.ts
@@ -1,15 +1,13 @@
import { debounce } from 'lodash'
export const OFFSET_FOR_ENTRIES_ABOVE = 70
-const COLLAPSED_HEADER_HEIGHT = 42
const GAP_BETWEEN_ENTRIES = 4
export const positionItems = debounce(
(
element: HTMLDivElement,
previousFocusedItemIndex: number | undefined,
- docId: string,
- newEditor: boolean
+ docId: string
) => {
const items = Array.from(
element.querySelectorAll('.review-panel-entry')
@@ -42,11 +40,7 @@ export const positionItems = debounce(
return
}
- const activeItemTop = getTopPosition(
- activeItem,
- activeItemIndex === 0,
- newEditor
- )
+ const activeItemTop = getTopPosition(activeItem, activeItemIndex === 0)
const positions: [HTMLElement, number][] = []
positions.push([activeItem, activeItemTop])
@@ -56,7 +50,7 @@ export const positionItems = debounce(
for (let i = activeItemIndex - 1; i >= 0; i--) {
const item = items[i]
const height = item.offsetHeight
- let top = getTopPosition(item, i === 0, newEditor)
+ let top = getTopPosition(item, i === 0)
const bottom = top + height
if (bottom > topLimit) {
top = topLimit - height - GAP_BETWEEN_ENTRIES
@@ -70,7 +64,7 @@ export const positionItems = debounce(
for (let i = activeItemIndex + 1; i < items.length; i++) {
const item = items[i]
const height = item.offsetHeight
- let top = getTopPosition(item, false, newEditor)
+ let top = getTopPosition(item, false)
if (top < bottomLimit) {
top = bottomLimit + GAP_BETWEEN_ENTRIES
}
@@ -92,16 +86,8 @@ export const positionItems = debounce(
{ leading: false, trailing: true, maxWait: 1000 }
)
-function getTopPosition(
- item: HTMLDivElement,
- isFirstEntry: boolean,
- newEditor: boolean
-) {
+function getTopPosition(item: HTMLDivElement, isFirstEntry: boolean) {
const offset = isFirstEntry ? 0 : OFFSET_FOR_ENTRIES_ABOVE
- if (newEditor) {
- return Math.max(offset, Number(item.dataset.top))
- }
-
- return Math.max(COLLAPSED_HEADER_HEIGHT + offset, Number(item.dataset.top))
+ return Math.max(offset, Number(item.dataset.top))
}
diff --git a/services/web/frontend/stylesheets/pages/editor/logs.scss b/services/web/frontend/stylesheets/pages/editor/logs.scss
index d7890cf53d..2612b00399 100644
--- a/services/web/frontend/stylesheets/pages/editor/logs.scss
+++ b/services/web/frontend/stylesheets/pages/editor/logs.scss
@@ -253,77 +253,6 @@
}
}
- .log-entry-header-error {
- background-color: var(--content-danger);
- }
-
- .log-entry-header-link-error {
- @include ol-button-variant(
- $color: var(--content-primary-dark),
- $background: var(--bg-danger-02),
- $hover-background: var(--red-70)
- );
- }
-
- .log-entry-header-warning {
- background-color: var(--content-warning-dark);
- }
-
- .log-entry-header-link-warning {
- @include ol-button-variant(
- $color: var(--content-primary-dark),
- $background: var(--bg-warning-01),
- $hover-background: var(--bg-warning-02)
- );
- }
-
- .log-entry-header-typesetting {
- background-color: var(--blue-50);
- }
-
- .log-entry-header-link-typesetting {
- @include ol-button-variant(
- $color: var(--content-primary-dark),
- $background: var(--blue-60),
- $hover-background: var(--blue-70)
- );
- }
-
- .log-entry-header-raw,
- .log-entry-header-info {
- background-color: var(--bg-dark-tertiary);
- }
-
- .log-entry-header-link-raw,
- .log-entry-header-link-info {
- @include ol-button-variant(
- $color: var(--content-primary-dark),
- $background: var(--bg-dark-secondary),
- $hover-background: var(--bg-dark-primary)
- );
- }
-
- .log-entry-header-success {
- background-color: var(--green-50);
- }
-
- .log-entry-header-link-success {
- @include ol-button-variant(
- $color: var(--content-primary-dark),
- $background: var(--green-60),
- $hover-background: var(--green-70)
- );
- }
-
- .log-entry-header-title {
- @include body-base;
-
- flex-grow: 1;
- font-weight: bold;
- margin: 0;
- color: var(--content-primary-dark);
- }
-
.log-entry-header-link {
color: var(--content-primary-dark);
border-width: 0;
@@ -470,19 +399,4 @@
display: flex;
justify-content: flex-end;
}
-
- .log-entry-header-error {
- background-color: var(--red-10);
-
- .log-entry-header-title {
- @include heading-sm;
-
- color: var(--red-50);
- }
- }
-
- .log-entry-header-raw {
- background-color: var(--neutral-60);
- padding: var(--spacing-04) var(--spacing-06);
- }
}
diff --git a/services/web/locales/en.json b/services/web/locales/en.json
index 39f1565ddb..5294b97f4e 100644
--- a/services/web/locales/en.json
+++ b/services/web/locales/en.json
@@ -1477,7 +1477,6 @@
"name": "Name",
"name_usage_explanation": "Your name will be displayed to your collaborators (so they know who they’re working with).",
"native": "Native",
- "navigate_log_source": "Navigate to log position in source code: __location__",
"navigation": "Navigation",
"nearly_activated": "You’re one step away from activating your __appName__ account!",
"need_20_plus_users_discount": "20+ users? <0>Contact sales0> to get the best discounts.",