From 44085354620458ceea3a941b49dc926e38f84a01 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Tue, 13 Dec 2016 12:32:27 +0000
Subject: Prevent overflow with vertical scroll when we have space to show
 content

Adds changelog
---
 app/assets/stylesheets/pages/environments.scss        |  8 +++++---
 app/assets/stylesheets/pages/pipelines.scss           | 17 +++++++----------
 changelogs/unreleased/20052-actions-table-vscroll.yml |  4 ++++
 3 files changed, 16 insertions(+), 13 deletions(-)
 create mode 100644 changelogs/unreleased/20052-actions-table-vscroll.yml

diff --git a/app/assets/stylesheets/pages/environments.scss b/app/assets/stylesheets/pages/environments.scss
index de3d2ba549f..e716f24c8e2 100644
--- a/app/assets/stylesheets/pages/environments.scss
+++ b/app/assets/stylesheets/pages/environments.scss
@@ -1,6 +1,8 @@
-.deployments-container {
-  width: 100%;
-  overflow: auto;
+@media (max-width: $screen-md-max) {
+  .deployments-container {
+    width: 100%;
+    overflow: auto;
+  }
 }
 
 .environments-list-loading {
diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index 08062b85504..6822f916cc5 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -37,12 +37,13 @@
   }
 }
 
-.content-list {
-
-  &.pipelines,
-  &.builds-content-list {
-    width: 100%;
-    overflow: auto;
+@media (max-width: $screen-md-max) {
+  .content-list {
+    &.pipelines,
+    &.builds-content-list {
+      width: 100%;
+      overflow: auto;
+    }
   }
 }
 
@@ -666,10 +667,6 @@
       min-width: 900px;
     }
 
-    .content-list.pipelines {
-      overflow: auto;
-    }
-
     .stage {
       max-width: 100px;
       width: 100px;
diff --git a/changelogs/unreleased/20052-actions-table-vscroll.yml b/changelogs/unreleased/20052-actions-table-vscroll.yml
new file mode 100644
index 00000000000..779cd08de09
--- /dev/null
+++ b/changelogs/unreleased/20052-actions-table-vscroll.yml
@@ -0,0 +1,4 @@
+---
+title: Prevent overflow with vertical scroll when we have space to show content
+merge_request: 8061
+author:
-- 
cgit v1.2.1