Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-08-26 21:11:43 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-08-26 21:11:43 +0300
commitbc75527dca77b2b72331ac6cbd5928d5b8c0c419 (patch)
tree000196faadb05f6e2ff60c08865b1a09506e5522 /app/assets/javascripts/monitoring
parentc82ca12a1c5a359325cb45aaf01b483d1fa0efcb (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/monitoring')
-rw-r--r--app/assets/javascripts/monitoring/components/dashboards_dropdown.vue14
1 files changed, 7 insertions, 7 deletions
diff --git a/app/assets/javascripts/monitoring/components/dashboards_dropdown.vue b/app/assets/javascripts/monitoring/components/dashboards_dropdown.vue
index aed27b5ea51..dd15d1e2804 100644
--- a/app/assets/javascripts/monitoring/components/dashboards_dropdown.vue
+++ b/app/assets/javascripts/monitoring/components/dashboards_dropdown.vue
@@ -95,12 +95,10 @@ export default {
@click="selectDashboard(dashboard)"
>
<div class="gl-display-flex">
- <div class="gl-flex-grow-1 gl-min-w-0">
- <div class="gl-word-break-all">
- {{ dashboardDisplayName(dashboard) }}
- </div>
- </div>
- <gl-icon class="text-muted gl-flex-shrink-0" name="star" />
+ <span class="gl-flex-grow-1 gl-min-w-0 gl-overflow-hidden gl-overflow-wrap-break">
+ {{ dashboardDisplayName(dashboard) }}
+ </span>
+ <gl-icon class="text-muted gl-flex-shrink-0 gl-ml-3 gl-align-self-center" name="star" />
</div>
</gl-new-dropdown-item>
<gl-new-dropdown-divider
@@ -115,7 +113,9 @@ export default {
:is-checked="dashboard.path === selectedDashboardPath"
@click="selectDashboard(dashboard)"
>
- {{ dashboardDisplayName(dashboard) }}
+ <span class="gl-overflow-hidden gl-overflow-wrap-break">
+ {{ dashboardDisplayName(dashboard) }}
+ </span>
</gl-new-dropdown-item>
</div>