Commit 1503e899 authored by Tim Zallmann's avatar Tim Zallmann

Merge branch '48497-merge-request-refactor-displays-changes-dropdown-incorrectly-fix' into 'master'

Resolve "Merge request refactor displays changes dropdown incorrectly"

Closes #48497

See merge request gitlab-org/gitlab-ce!20245
parents a0ff7724 60379c7c
...@@ -66,6 +66,7 @@ export default { ...@@ -66,6 +66,7 @@ export default {
@click="clearSearch" @click="clearSearch"
></i> ></i>
</div> </div>
<div class="dropdown-content">
<ul> <ul>
<li <li
v-for="diffFile in filteredDiffFiles" v-for="diffFile in filteredDiffFiles"
...@@ -120,5 +121,6 @@ export default { ...@@ -120,5 +121,6 @@ export default {
</li> </li>
</ul> </ul>
</div> </div>
</div>
</span> </span>
</template> </template>
...@@ -737,6 +737,10 @@ ...@@ -737,6 +737,10 @@
max-width: 560px; max-width: 560px;
width: 100%; width: 100%;
z-index: 150; z-index: 150;
min-height: $dropdown-min-height;
max-height: $dropdown-max-height;
overflow-y: auto;
margin-bottom: 0;
@include media-breakpoint-up(sm) { @include media-breakpoint-up(sm) {
left: $gl-padding; left: $gl-padding;
......
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