diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-12-26 21:44:38 +0300 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2016-12-27 19:57:49 +0300 |
| commit | f52d272e2542b70173726482ba190a5861c42796 (patch) | |
| tree | c9b7449fa402645d7169dea2763058c46d4f533d | |
| parent | 81cb58c2fb22ec7030cd83ca5443e22530707364 (diff) | |
Merge branch '26026-pipeline-overflow-firefox' into 'master'
Fix line breaking in nodes of the pipeline graph in firefox
Closes #26026
See merge request !8292
| -rw-r--r-- | app/assets/stylesheets/pages/pipelines.scss | 6 | ||||
| -rw-r--r-- | changelogs/unreleased/26026-pipeline-overflow-firefox.yml | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss index e0b17869e9d..2a9880cc673 100644 --- a/app/assets/stylesheets/pages/pipelines.scss +++ b/app/assets/stylesheets/pages/pipelines.scss @@ -331,7 +331,6 @@ width: 100%; background-color: $gray-light; padding: $gl-padding; - overflow: auto; white-space: nowrap; transition: max-height 0.3s, padding 0.3s; @@ -601,11 +600,12 @@ } .dropdown-counter-badge { - float: right; color: $border-color; font-weight: 100; font-size: 15px; - margin-right: 2px; + position: absolute; + right: 5px; + top: 8px; } .grouped-pipeline-dropdown { diff --git a/changelogs/unreleased/26026-pipeline-overflow-firefox.yml b/changelogs/unreleased/26026-pipeline-overflow-firefox.yml new file mode 100644 index 00000000000..bf11d877c7e --- /dev/null +++ b/changelogs/unreleased/26026-pipeline-overflow-firefox.yml @@ -0,0 +1,4 @@ +--- +title: Fix line breaking in nodes of the pipeline graph in firefox +merge_request: 8292 +author: |