diff options
| author | Phil Hughes <me@iamphill.com> | 2018-03-22 12:37:57 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-03-22 12:37:57 +0000 |
| commit | c01697539c3da4e72b1812662ff35d1f709d1dcc (patch) | |
| tree | 992e0adc4fc9d17f95c123cb7f5fecbdc09ff663 | |
| parent | afef35e93360e2e1a78698fe7e9085247d32b356 (diff) | |
| parent | 3886489a479956a1758b68105815418766155815 (diff) | |
| download | gitlab-ce-c01697539c3da4e72b1812662ff35d1f709d1dcc.tar.gz | |
Merge branch '44453-performance-bar-modalbox' into 'master'
Resolve "Performance bar modal box content overflows"
Closes #44453
See merge request gitlab-org/gitlab-ce!17889
| -rw-r--r-- | app/assets/javascripts/performance_bar/components/detailed_metric.vue | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/common.scss | 4 | ||||
| -rw-r--r-- | app/assets/stylesheets/performance_bar.scss | 10 |
3 files changed, 13 insertions, 2 deletions
diff --git a/app/assets/javascripts/performance_bar/components/detailed_metric.vue b/app/assets/javascripts/performance_bar/components/detailed_metric.vue index d4881f07972..db8a0055acd 100644 --- a/app/assets/javascripts/performance_bar/components/detailed_metric.vue +++ b/app/assets/javascripts/performance_bar/components/detailed_metric.vue @@ -70,6 +70,7 @@ export default { <td v-for="key in keys" :key="key" + class="break-word" > {{ item[key] }} </td> diff --git a/app/assets/stylesheets/framework/common.scss b/app/assets/stylesheets/framework/common.scss index 37d33320445..d0dda50a835 100644 --- a/app/assets/stylesheets/framework/common.scss +++ b/app/assets/stylesheets/framework/common.scss @@ -446,6 +446,10 @@ img.emoji { opacity: .5; } +.break-word { + word-wrap: break-word; +} + /** COMMON CLASSES **/ .prepend-top-0 { margin-top: 0; } .prepend-top-5 { margin-top: 5px; } diff --git a/app/assets/stylesheets/performance_bar.scss b/app/assets/stylesheets/performance_bar.scss index 5d1a9489aad..d69b390ac27 100644 --- a/app/assets/stylesheets/performance_bar.scss +++ b/app/assets/stylesheets/performance_bar.scss @@ -102,8 +102,14 @@ } } - .performance-bar-modal .modal-footer { - display: none; + .performance-bar-modal { + .modal-footer { + display: none; + } + + .modal-dialog { + width: 860px; + } } } |