Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
048d0cba
Commit
048d0cba
authored
Aug 27, 2020
by
Jarek Ostrowski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix top position of diff file search
MR:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40634
parent
3ca6d55b
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
2 deletions
+7
-2
app/assets/javascripts/diffs/components/app.vue
app/assets/javascripts/diffs/components/app.vue
+1
-1
app/assets/stylesheets/pages/diff.scss
app/assets/stylesheets/pages/diff.scss
+1
-1
changelogs/unreleased/233002-diff-file-input-cutoff.yml
changelogs/unreleased/233002-diff-file-input-cutoff.yml
+5
-0
No files found.
app/assets/javascripts/diffs/components/app.vue
View file @
048d0cba
...
@@ -468,7 +468,7 @@ export default {
...
@@ -468,7 +468,7 @@ export default {
<div
<div
:data-can-create-note=
"getNoteableData.current_user.can_create_note"
:data-can-create-note=
"getNoteableData.current_user.can_create_note"
class=
"files d-flex"
class=
"files d-flex
gl-mt-2
"
>
>
<div
<div
v-if=
"showTreeList"
v-if=
"showTreeList"
...
...
app/assets/stylesheets/pages/diff.scss
View file @
048d0cba
...
@@ -1062,7 +1062,7 @@ table.code {
...
@@ -1062,7 +1062,7 @@ table.code {
.diff-tree-list
{
.diff-tree-list
{
position
:
-
webkit-sticky
;
position
:
-
webkit-sticky
;
position
:
sticky
;
position
:
sticky
;
$top-pos
:
$header-height
+
$mr-tabs-height
+
$mr-version-controls-height
+
1
1
px
;
$top-pos
:
$header-height
+
$mr-tabs-height
+
$mr-version-controls-height
+
1
5
px
;
top
:
$top-pos
;
top
:
$top-pos
;
max-height
:
calc
(
100vh
-
#{
$top-pos
}
);
max-height
:
calc
(
100vh
-
#{
$top-pos
}
);
z-index
:
202
;
z-index
:
202
;
...
...
changelogs/unreleased/233002-diff-file-input-cutoff.yml
0 → 100644
View file @
048d0cba
---
title
:
Fix file file input top position cutoff
merge_request
:
40634
author
:
type
:
fixed
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment