summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2016-09-01 20:25:01 +0000
committerFatih Acet <acetfatih@gmail.com>2016-09-01 20:25:01 +0000
commit2038e86772b3a7a02df5b01e454400e7d9314312 (patch)
tree4ac8c1a267fa7780d9227c2f0d59735b613bcf29
parentb211887282409a7a5209514b388e3cc2e16f6ba0 (diff)
parentbf1337be949baef050ad99fc5e4c60e7ac4e3aae (diff)
downloadgitlab-ce-2038e86772b3a7a02df5b01e454400e7d9314312.tar.gz
Merge branch '21781-pipelines-for-mr' into 'master'
Change widths of content in MR pipeline tab ## What does this MR do? * Fixes width of items in pipelines tab * Removes scrollbars on Windows ## Screenshots (if relevant) ![Screen_Shot_2016-09-01_at_2.40.55_PM](/uploads/2163022eb325b9b0eca2f2003416e100/Screen_Shot_2016-09-01_at_2.40.55_PM.png) #### What are the relevant issue numbers? Closes #21396 Closes #21781 See merge request !6157
-rw-r--r--app/assets/stylesheets/pages/pipelines.scss10
1 files changed, 7 insertions, 3 deletions
diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index 2911576b66f..ee5d9de66d8 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -474,12 +474,16 @@
.pipelines.tab-pane {
.content-list.pipelines {
- overflow: scroll;
+ overflow: auto;
}
.stage {
- max-width: 60px;
- width: 60px;
+ max-width: 100px;
+ width: 100px;
+ }
+
+ .pipeline-actions {
+ min-width: initial;
}
}