summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Schatz <jschatz@gitlab.com>2016-06-17 13:32:04 +0000
committerJacob Schatz <jschatz@gitlab.com>2016-06-17 13:32:04 +0000
commit1051f0c5845c53a8c1b4922e639b3a780cbdef6d (patch)
treebbe2f515d26831ff64136233ddae29e6ddc1eaea
parentfaee4763f7a166772bb40945f82da4b25a95e7d5 (diff)
parent673ae917f57655841d2a3607594dac27b6c2f0e8 (diff)
downloadgitlab-ce-1051f0c5845c53a8c1b4922e639b3a780cbdef6d.tar.gz
Merge branch 'new-merge-request-commit-box-fix' into 'master'
Fixed styling of commit box in new MR ## What does this MR do? Fixes an issue that caused the new merge request commit box to go all funny styled. ## What are the relevant issue numbers? #18781 ## Screenshots (if relevant) ![Screen_Shot_2016-06-17_at_14.08.44](/uploads/b1e34b0c6bf67adc1be8748306e20b06/Screen_Shot_2016-06-17_at_14.08.44.png) See merge request !4747
-rw-r--r--app/assets/stylesheets/pages/merge_requests.scss8
1 files changed, 5 insertions, 3 deletions
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss
index 53bff508c72..e67271adfb1 100644
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -244,6 +244,10 @@
.panel-footer {
padding: 5px 10px;
+
+ .btn {
+ min-width: auto;
+ }
}
.commit {
@@ -252,9 +256,7 @@
}
.avatar {
- width: 20px;
- height: 20px;
- margin-right: 5px;
+ margin-left: 0;
}
.commit-row-info {