From 9a1c8aa34239f4a6c40df2f75225ef058798ee98 Mon Sep 17 00:00:00 2001 From: Ryan Harris Date: Fri, 2 Dec 2016 09:47:19 -0500 Subject: Fixed MR widget content wrapping for XS viewports Update merge_requests.scss Update merge_requests.scss to use padding shorthand Removed padding from Accept Merge Request button --- app/assets/stylesheets/pages/merge_requests.scss | 5 +++++ changelogs/unreleased/25202-fix-mr-widget-content-wrapping.yml | 5 +++++ 2 files changed, 10 insertions(+) create mode 100644 changelogs/unreleased/25202-fix-mr-widget-content-wrapping.yml diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index da1187af41c..740881487c3 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; diff --git a/changelogs/unreleased/25202-fix-mr-widget-content-wrapping.yml b/changelogs/unreleased/25202-fix-mr-widget-content-wrapping.yml new file mode 100644 index 00000000000..7afc794866b --- /dev/null +++ b/changelogs/unreleased/25202-fix-mr-widget-content-wrapping.yml @@ -0,0 +1,5 @@ +--- +title: Centered Accept Merge Request button within MR widget and added padding for + viewports smaller than 768px +merge_request: +author: Ryan Harris -- cgit v1.2.1