kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Resolve "Merge request refactor displays changes dropdown incorrectly"

Browse source
This commit is contained in:
Constance Okoghenun 2018-06-29 14:27:27 +00:00 committed by Tim Zallmann
parent a0ff77246e
commit 60379c7c98
2 changed files with 55 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/diffs/components/changed_files_dropdown.vue
View file

@ -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 {
</li> </li>
</ul> </ul>
</div> </div>
</div>
</span> </span>
</template> </template>

4
app/assets/stylesheets/pages/diff.scss
View file

@ -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;