diff options
| author | Kushal Pandya <kushalspandya@gmail.com> | 2019-02-18 13:46:47 +0300 |
|---|---|---|
| committer | Kushal Pandya <kushalspandya@gmail.com> | 2019-02-18 13:46:47 +0300 |
| commit | 1d229689588e0e22b5cee57f6c8d2ddcc7f0822b (patch) | |
| tree | 80f6fd196f2e29a4bdca9b9efe73e9d145328120 /app/assets | |
| parent | 6b1e1315762023018a138cc2f03b7270808eb7d9 (diff) | |
| parent | e551ebf6a06e62ccce05d9d4666413ad2db63d21 (diff) | |
Merge branch 'fix-job-name-overflow' into 'master'
Fix job name overflow in Firefox, Safari and IE
Closes #56426
See merge request gitlab-org/gitlab-ce!24707
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/jobs/components/sidebar.vue | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/common.scss | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/assets/javascripts/jobs/components/sidebar.vue b/app/assets/javascripts/jobs/components/sidebar.vue index a2141dc3760..1691ac62100 100644 --- a/app/assets/javascripts/jobs/components/sidebar.vue +++ b/app/assets/javascripts/jobs/components/sidebar.vue @@ -110,7 +110,7 @@ export default { <div class="sidebar-container"> <div class="blocks-container"> <div class="block d-flex flex-nowrap align-items-center"> - <h4 class="my-0 mr-2">{{ job.name }}</h4> + <h4 class="my-0 mr-2 text-break-word">{{ job.name }}</h4> <div class="flex-grow-1 flex-shrink-0 text-right"> <gl-link v-if="job.retry_path" diff --git a/app/assets/stylesheets/framework/common.scss b/app/assets/stylesheets/framework/common.scss index c5c3b66438c..dc279bfa202 100644 --- a/app/assets/stylesheets/framework/common.scss +++ b/app/assets/stylesheets/framework/common.scss @@ -48,6 +48,10 @@ color: $brand-info; } +.text-break-word { + word-break: break-all; +} + .hint { font-style: italic; color: $gl-gray-400; } .light { color: $gl-text-color; } |