diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-21 09:09:01 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-21 09:09:01 +0000 |
| commit | a53d2c37c4934f564caa94543dd4cf5af1703e2d (patch) | |
| tree | a028dc39771a4612a9845ab700a73af2d6f3f51b /app/assets/javascripts/ide/components | |
| parent | 18b8435318887d3fc6e9f9d305967a953cdd7d3f (diff) | |
| download | gitlab-ce-a53d2c37c4934f564caa94543dd4cf5af1703e2d.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/ide/components')
| -rw-r--r-- | app/assets/javascripts/ide/components/nav_dropdown_button.vue | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/ide/components/nav_dropdown_button.vue b/app/assets/javascripts/ide/components/nav_dropdown_button.vue index 4cd320d5d66..8dc22620eca 100644 --- a/app/assets/javascripts/ide/components/nav_dropdown_button.vue +++ b/app/assets/javascripts/ide/components/nav_dropdown_button.vue @@ -31,8 +31,8 @@ export default { <template> <dropdown-button> - <span class="row"> - <span class="col-auto text-truncate" :class="{ 'col-7': showMergeRequests }"> + <span class="row flex-nowrap"> + <span class="col-auto flex-fill text-truncate"> <icon :size="16" :aria-label="__('Current Branch')" name="branch" /> {{ branchLabel }} </span> <span v-if="showMergeRequests" class="col-5 pl-0 text-truncate"> |