diff options
author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-12-13 22:29:17 +0000 |
---|---|---|
committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-12-13 22:29:17 +0000 |
commit | 3e8118d689824ef299c1069eff6150849046c0b5 (patch) | |
tree | bdd0f85cb59d688872dc29caefe3502e4f3a8ca2 /app | |
parent | dedcff485ce9fd8ccbfef6c523a79309d9db838a (diff) | |
parent | 44085354620458ceea3a941b49dc926e38f84a01 (diff) | |
download | gitlab-ce-3e8118d689824ef299c1069eff6150849046c0b5.tar.gz |
Merge branch '20052-actions-table-vscroll' into 'master'
Prevent overflow with vertical scroll when we have space to show content
## What does this MR do?
Removes vertical and horizontal scroll from builds, environments and pipelines tables by adding a media query since this is only necessary in smaller screens.
## Screenshots (if relevant)
![scroll](/uploads/6b9e3584df6e4ca29553d2ff576b794e/scroll.jpg)
## Does this MR meet the acceptance criteria?
- [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [x] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #20052
See merge request !8061
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/stylesheets/pages/environments.scss | 8 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/pipelines.scss | 17 |
2 files changed, 12 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; |