Commit 0fa137ca authored by Phil Hughes's avatar Phil Hughes

Merge branch '346708-divider-for-file-tree-max-width' into 'master'

Make max width for file tree depend on screen width

See merge request gitlab-org/gitlab!77015
parents d8752364 4a7d166b
...@@ -26,7 +26,6 @@ import { ...@@ -26,7 +26,6 @@ import {
TREE_LIST_WIDTH_STORAGE_KEY, TREE_LIST_WIDTH_STORAGE_KEY,
INITIAL_TREE_WIDTH, INITIAL_TREE_WIDTH,
MIN_TREE_WIDTH, MIN_TREE_WIDTH,
MAX_TREE_WIDTH,
TREE_HIDE_STATS_WIDTH, TREE_HIDE_STATS_WIDTH,
MR_TREE_SHOW_KEY, MR_TREE_SHOW_KEY,
ALERT_OVERFLOW_HIDDEN, ALERT_OVERFLOW_HIDDEN,
...@@ -622,7 +621,7 @@ export default { ...@@ -622,7 +621,7 @@ export default {
}, },
}, },
minTreeWidth: MIN_TREE_WIDTH, minTreeWidth: MIN_TREE_WIDTH,
maxTreeWidth: MAX_TREE_WIDTH, maxTreeWidth: window.innerWidth / 2,
howToMergeDocsPath: helpPagePath('user/project/merge_requests/reviews/index.md', { howToMergeDocsPath: helpPagePath('user/project/merge_requests/reviews/index.md', {
anchor: 'checkout-merge-requests-locally-through-the-head-ref', anchor: 'checkout-merge-requests-locally-through-the-head-ref',
}), }),
......
...@@ -42,7 +42,6 @@ export const TREE_LIST_WIDTH_STORAGE_KEY = 'mr_tree_list_width'; ...@@ -42,7 +42,6 @@ export const TREE_LIST_WIDTH_STORAGE_KEY = 'mr_tree_list_width';
export const INITIAL_TREE_WIDTH = 320; export const INITIAL_TREE_WIDTH = 320;
export const MIN_TREE_WIDTH = 240; export const MIN_TREE_WIDTH = 240;
export const MAX_TREE_WIDTH = 400;
export const TREE_HIDE_STATS_WIDTH = 260; export const TREE_HIDE_STATS_WIDTH = 260;
export const OLD_LINE_KEY = 'old_line'; export const OLD_LINE_KEY = 'old_line';
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment