diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-07-21 20:33:06 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-07-21 20:33:06 +0000 |
| commit | 95c4825a456a4d1df8dba1def8735203368356c9 (patch) | |
| tree | 7a4584d4a20c11fb6beeab5344a5e8d0a1208ad8 | |
| parent | d1682ef36da83e3f0625bce760810bdde8efec51 (diff) | |
| parent | 25ce5e7e707ddaf08e134c56419d95065b9479e8 (diff) | |
| download | gitlab-ce-95c4825a456a4d1df8dba1def8735203368356c9.tar.gz | |
Merge branch 'pipeline-table' into 'master'
Reduce min width of pipeline table
## What does this MR do?
Reduce min width of pipeline table
## Why was this MR needed?
The current min-width is based on the heavily populated pipelines page main table. This pipeline table doesn't have nearly as much information so can be collapsed down a lot further
cc @markpundsack
See merge request !5409
| -rw-r--r-- | app/assets/stylesheets/pages/pipelines.scss | 9 | ||||
| -rw-r--r-- | app/views/projects/commit/_pipeline.html.haml | 4 |
2 files changed, 11 insertions, 2 deletions
diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss index 843f04ab1f6..c58e2ffe7f5 100644 --- a/app/assets/stylesheets/pages/pipelines.scss +++ b/app/assets/stylesheets/pages/pipelines.scss @@ -29,9 +29,18 @@ } } +.pipeline-holder { + width: 100%; + overflow: auto; +} + .table.builds { min-width: 1200px; + &.pipeline { + min-width: 650px; + } + tr { th { padding: 16px 8px; diff --git a/app/views/projects/commit/_pipeline.html.haml b/app/views/projects/commit/_pipeline.html.haml index 41fd5459429..540689f4a61 100644 --- a/app/views/projects/commit/_pipeline.html.haml +++ b/app/views/projects/commit/_pipeline.html.haml @@ -35,8 +35,8 @@ .bs-callout.bs-callout-warning \.gitlab-ci.yml not found in this commit -.table-holder - %table.table.builds +.table-holder.pipeline-holder + %table.table.builds.pipeline %thead %tr %th Status |