summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/pages/merge_requests.scss
diff options
context:
space:
mode:
authorJacob Schatz <jschatz@gitlab.com>2016-12-06 02:11:38 +0000
committerJacob Schatz <jschatz@gitlab.com>2016-12-06 02:11:38 +0000
commit18201ace36f13eb916737154178d700feb4eeec6 (patch)
tree2774116430ccec3c55589fb6ac6dbdb4057ab8ee /app/assets/stylesheets/pages/merge_requests.scss
parent0bb1bc5f13a6775272617c7550d7b2d87b278fd7 (diff)
parent9a1c8aa34239f4a6c40df2f75225ef058798ee98 (diff)
downloadgitlab-ce-18201ace36f13eb916737154178d700feb4eeec6.tar.gz
Merge branch '25202-fix-mr-widget-content-wrapping' into 'master'
Fixed MR widget content wrapping for XS viewports Centers the "Accept Merge Request" button within the MR widget (and adds a bit of right/left padding) for viewports smaller than 768px. BEFORE: ![Screen_Shot_2016-12-02_at_8_53_01_AM](/uploads/fcdae5302a1407090483dd3cff868c51/Screen_Shot_2016-12-02_at_8_53_01_AM.png) AFTER: ![Screen_Shot_2016-12-02_at_9_43_37_AM](/uploads/f7d1dce082b79d263f05cea3c90e870a/Screen_Shot_2016-12-02_at_9_43_37_AM.png) cc: @markglenfletcher @annabeldunstone Closes #25202 See merge request !7900
Diffstat (limited to 'app/assets/stylesheets/pages/merge_requests.scss')
-rw-r--r--app/assets/stylesheets/pages/merge_requests.scss5
1 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 dc5945e1139..6234779ac19 100644
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -129,6 +129,11 @@
margin-bottom: 4px;
}
+ .btn-grouped {
+ float: none;
+ margin-right: 0;
+ }
+
.accept-action {
width: 100%;
text-align: center;