diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-12-06 02:11:38 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-12-06 02:11:38 +0000 |
| commit | 18201ace36f13eb916737154178d700feb4eeec6 (patch) | |
| tree | 2774116430ccec3c55589fb6ac6dbdb4057ab8ee | |
| parent | 0bb1bc5f13a6775272617c7550d7b2d87b278fd7 (diff) | |
| parent | 9a1c8aa34239f4a6c40df2f75225ef058798ee98 (diff) | |
| download | gitlab-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:
AFTER:
cc: @markglenfletcher @annabeldunstone
Closes #25202
See merge request !7900
| -rw-r--r-- | app/assets/stylesheets/pages/merge_requests.scss | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/25202-fix-mr-widget-content-wrapping.yml | 5 |
2 files changed, 10 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; 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 |