diff options
author | Fatih Acet <acetfatih@gmail.com> | 2016-10-05 16:42:43 +0000 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2016-10-05 16:42:43 +0000 |
commit | c9bb083704f8910c9b1d2f538913b493813317e9 (patch) | |
tree | c22b048a1ae11d94661d4b397e64a19be5834288 /app/assets/stylesheets | |
parent | 2ce07e901709dc178ef423a374e1c82682789d44 (diff) | |
parent | e234fe96109b753574f16c69f20cc93efd19b981 (diff) | |
download | gitlab-ce-c9bb083704f8910c9b1d2f538913b493813317e9.tar.gz |
Merge branch '22295-grouped-pipeline-dropdown-should-be-a-scrollable-container' into 'master'
added 245px max height and overflow scroll-y to .grouped-pipeline-dropdown
## What does this MR do?
It restricts the sub builds popup in the pipeline graph and makes it scrollable
## Are there points in the code the reviewer needs to double check?
none that I know of
## Why was this MR needed?
To restrict crazy CI configurations from messing with the viewport scrolling.
## Screenshots (if relevant)
![2016-10-05_16.29.35](/uploads/0ce1d8e4d46ec45e181919dd968a80cf/2016-10-05_16.29.35.gif)
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry 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
- [ ] All builds are passing
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #22295
See merge request !6696
Diffstat (limited to 'app/assets/stylesheets')
-rw-r--r-- | app/assets/stylesheets/pages/pipelines.scss | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss index b2662b812b7..68fc6da6c1b 100644 --- a/app/assets/stylesheets/pages/pipelines.scss +++ b/app/assets/stylesheets/pages/pipelines.scss @@ -82,7 +82,7 @@ } .branch-commit { - + .branch-name { font-weight: bold; max-width: 150px; @@ -390,6 +390,8 @@ left: auto; right: -214px; top: -9px; + max-height: 245px; + overflow-y: scroll; a:hover { .ci-status-text { |