summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2016-11-10 22:00:56 +0000
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2016-11-10 22:00:56 +0000
commita3fd8521fb036b1f7153cad58234e8cb08246278 (patch)
tree4d08279c4a82afe65c311b811cd34cbaeeb6bb99
parentb7a750ecdc1a0cad8928587ec6297402bb55b4f0 (diff)
parente2f8fcac2c33ad3fd70b7937aa2ce1bd745575da (diff)
downloadgitlab-ce-a3fd8521fb036b1f7153cad58234e8cb08246278.tar.gz
Merge branch '24369-remove-additional-padding' into 'master'
Remove additional padding on right-aligned items in MR widget. ## What does this MR do? Remove additional padding on right-aligned items in MR widget. So links look aligned. ## Are there points in the code the reviewer needs to double check? No. ## Why was this MR needed? Because the links are not aligned. ## Screenshots (if relevant) ![Screen_Shot_2016-11-10_at_22.38.26](/uploads/a1deacb77483125df3c25c320f53b579/Screen_Shot_2016-11-10_at_22.38.26.png) ## Does this MR meet the acceptance criteria? - [x] [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 - [ ] 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 #24369 See merge request !7411
-rw-r--r--app/assets/stylesheets/pages/merge_requests.scss1
-rw-r--r--changelogs/unreleased/24369-remove-additional-padding.yml4
2 files changed, 5 insertions, 0 deletions
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss
index f8e31a624ec..6cf43713fec 100644
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -47,6 +47,7 @@
&.right {
float: right;
+ padding-right: 0;
a {
color: $gl-gray;
diff --git a/changelogs/unreleased/24369-remove-additional-padding.yml b/changelogs/unreleased/24369-remove-additional-padding.yml
new file mode 100644
index 00000000000..a6a0b248412
--- /dev/null
+++ b/changelogs/unreleased/24369-remove-additional-padding.yml
@@ -0,0 +1,4 @@
+---
+title: Remove additional padding on right-aligned items in MR widget.
+merge_request: 7411
+author: Didem Acet