From cf2632c1dbec41298eb94986f5861f0917721a4e Mon Sep 17 00:00:00 2001 From: Dimitrie Hoekstra Date: Fri, 7 Oct 2016 15:15:20 +0200 Subject: [PATCH 1/3] shortened merge request modal to let clipboard button not overlap --- app/assets/stylesheets/pages/merge_requests.scss | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index 70afa568554c..27d72979b6e7 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -278,7 +278,9 @@ #modal_merge_info .modal-dialog { width: 600px; - + .dark{ + margin-right: 40px; + } .btn-clipboard { @extend .pull-right; -- GitLab From 9b3e13e9f9222c07b9ff9fbbe84f5603044baeb4 Mon Sep 17 00:00:00 2001 From: Dimitrie Hoekstra Date: Fri, 7 Oct 2016 15:16:03 +0200 Subject: [PATCH 2/3] added entry to changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ff8e03e7d584..ff3d710828cd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -254,6 +254,7 @@ Please view this file on the master branch, on stable branches it's out of date. - Fix bug where 'Search results' repeated many times when a search in the emoji search form is cleared (Xavier Bick) (@zeiv) - Fix resolve discussion buttons endpoint path - Refactor remnants of CoffeeScript destructured opts and super !6261 + - Shortened merge request modal to let clipboard button not overlap ## 8.12.1 -- GitLab From ef24d40142800f5c2bcfab528a2af75b99f1a109 Mon Sep 17 00:00:00 2001 From: Dimitrie Hoekstra Date: Thu, 27 Oct 2016 15:29:12 +0200 Subject: [PATCH 3/3] makes code complient to linting --- app/assets/stylesheets/pages/merge_requests.scss | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index 27d72979b6e7..ff16c1ecc8da 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -278,9 +278,11 @@ #modal_merge_info .modal-dialog { width: 600px; - .dark{ + + .dark { margin-right: 40px; } + .btn-clipboard { @extend .pull-right; -- GitLab