diff options
author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-10-27 22:51:15 +0000 |
---|---|---|
committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-10-27 22:51:15 +0000 |
commit | 20a7db4483904c7280093a0309a63dfd1b7ef72e (patch) | |
tree | 75ae3d77da5dab7bbf0e9ceed998027325b2e9b6 | |
parent | 09cccd9345d0d3d81a91ec8e6118ba1f04f5e1b0 (diff) | |
parent | 8e430807f823620abd252dad966d6cfe652b22b9 (diff) | |
download | gitlab-ce-20a7db4483904c7280093a0309a63dfd1b7ef72e.tar.gz |
Merge branch 'modal-mergerequest-shorten-clipboard' into 'master'
edited stylesheet with mr modal fixes and added to changelog
## What does this MR do?
It shortens the modal command merge info elements.
## Are there points in the code the reviewer needs to double check?
I used the `.dark` class.. is that correct usage?
Made no issue as this is a minor upgrade to UI
## Why was this MR needed?
Clipboard buttons could obscure information in the merge info modal, this way its clean.
## Screenshots (if relevant)
From:
![image](/uploads/99269c9a314c593cb06239c27565b07c/image.png)
To:
![image](/uploads/7e278a5aaa8c57270e8a320cc270b5d8/image.png)
## 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 it does - 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?
None, its a quick fix
See merge request !7145
-rw-r--r-- | CHANGELOG.md | 1 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/merge_requests.scss | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 447a5614e75..9151a27e100 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,6 +28,7 @@ Please view this file on the master branch, on stable branches it's out of date. - Show full status link on MR & commit pipelines - Fix documents and comments on Build API `scope` - Refactor email, use setter method instead AR callbacks for email attribute (Semyon Pupkov) + - Shortened merge request modal to let clipboard button not overlap ## 8.13.2 - Fix builds dropdown overlapping bug !7124 diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index 33f09722274..f510e3d3cdf 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -279,6 +279,10 @@ #modal_merge_info .modal-dialog { width: 600px; + .dark { + margin-right: 40px; + } + .btn-clipboard { @extend .pull-right; |