diff options
| author | Phil Hughes <me@iamphill.com> | 2017-06-29 11:08:56 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-06-29 11:08:56 +0000 |
| commit | da6a3fb0c24e2af59d6fbd3421446b8f7666cdf6 (patch) | |
| tree | 7cf7928747e7d97eddc9ee582528af491f42d750 | |
| parent | ff048ba8a353f25341694db89c8ef5680fa574e8 (diff) | |
| parent | 6da858dcb18ef50230b63a306375403c516ae074 (diff) | |
| download | gitlab-ce-da6a3fb0c24e2af59d6fbd3421446b8f7666cdf6.tar.gz | |
Merge branch '34039-scroll-job' into 'master'
Job details won't scroll horizontally to show long lines
Closes #34039 and #33638
See merge request !12518
| -rw-r--r-- | app/assets/javascripts/build.js | 7 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/builds.scss | 5 |
2 files changed, 8 insertions, 4 deletions
diff --git a/app/assets/javascripts/build.js b/app/assets/javascripts/build.js index c28f6e151a0..9974e135022 100644 --- a/app/assets/javascripts/build.js +++ b/app/assets/javascripts/build.js @@ -196,6 +196,7 @@ window.Build = (function () { }) .done((log) => { gl.utils.setCiStatusFavicon(`${this.pageUrl}/status.json`); + if (log.state) { this.state = log.state; } @@ -220,7 +221,11 @@ window.Build = (function () { } if (!log.complete) { - this.toggleScrollAnimation(true); + if (!this.hasBeenScrolled) { + this.toggleScrollAnimation(true); + } else { + this.toggleScrollAnimation(false); + } Build.timeout = setTimeout(() => { //eslint-disable-next-line diff --git a/app/assets/stylesheets/pages/builds.scss b/app/assets/stylesheets/pages/builds.scss index cdb0b1bc59e..9cff99b839c 100644 --- a/app/assets/stylesheets/pages/builds.scss +++ b/app/assets/stylesheets/pages/builds.scss @@ -147,10 +147,9 @@ top: 35px; left: 10px; bottom: 0; - overflow-y: scroll; - overflow-x: hidden; padding: 10px 20px 20px 5px; - white-space: pre; + white-space: pre-wrap; + overflow: auto; } .environment-information { |