summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitrie Hoekstra <dimitriehoekstra@gmail.com>2016-10-27 17:01:00 +0200
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2016-10-27 16:48:52 -0500
commit8e430807f823620abd252dad966d6cfe652b22b9 (patch)
tree247a1c8273a0652b029b931e641e6a964c7900b1
parent51821e1ee4533843a3abd03f8395fa89086e640c (diff)
downloadgitlab-ce-modal-mergerequest-shorten-clipboard.tar.gz
edited stylesheet with mr modal fixes and added to changelogmodal-mergerequest-shorten-clipboard
-rw-r--r--CHANGELOG.md1
-rw-r--r--app/assets/stylesheets/pages/merge_requests.scss4
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;