summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFernando Arias <farias@gitlab.com>2019-01-27 22:35:23 -0500
committerFernando Arias <farias@gitlab.com>2019-02-13 07:40:17 -0600
commit0d8222e3d3dca81a24d6279c6f997e7744b04f75 (patch)
treec93554b1d099c7263d556dc0b856c24239fdd84a
parentc5e57aa89566a0a1889763d7134860c3f2a3e03a (diff)
downloadgitlab-ce-0d8222e3d3dca81a24d6279c6f997e7744b04f75.tar.gz
Fix job name overflow in Firefox, Safari and IE
-rw-r--r--app/assets/javascripts/jobs/components/sidebar.vue2
-rw-r--r--app/assets/stylesheets/framework/common.scss4
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..c0a4abce924 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-word;
+}
+
.hint { font-style: italic; color: $gl-gray-400; }
.light { color: $gl-text-color; }