Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Schatz <jschatz@gitlab.com>2016-06-17 16:32:04 +0300
committerRobert Speicher <rspeicher@gmail.com>2016-06-17 21:22:31 +0300
commitc73aeed9827ad87f5b5de7ff7b1a67dbb0ec1027 (patch)
tree20e55d033d041c997f96163c5c85a388a94bfdc2 /app/assets
parent7db27be140be68fdae4355750655ca45ce363da6 (diff)
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
Diffstat (limited to 'app/assets')
-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 {