summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2016-12-13 12:32:27 +0000
committerFilipa Lacerda <filipa@gitlab.com>2016-12-13 15:38:46 +0000
commit44085354620458ceea3a941b49dc926e38f84a01 (patch)
tree6b5d669ef07b4e654b8ae574408c66e4c14df5f9
parent0139896b370a56619b29e08ba8b5d0da091443b1 (diff)
downloadgitlab-ce-20052-actions-table-vscroll.tar.gz
Prevent overflow with vertical scroll when we have space to show content20052-actions-table-vscroll
Adds changelog
-rw-r--r--app/assets/stylesheets/pages/environments.scss8
-rw-r--r--app/assets/stylesheets/pages/pipelines.scss17
-rw-r--r--changelogs/unreleased/20052-actions-table-vscroll.yml4
3 files changed, 16 insertions, 13 deletions
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: