diff options
| author | Phil Hughes <me@iamphill.com> | 2019-06-10 15:35:38 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-06-10 15:35:38 +0000 |
| commit | e74f7159c5d2725c1069940c6810545b1007cfbc (patch) | |
| tree | 48bea446216b7e6349c50259c0080adab488a5db | |
| parent | 56d03e8ca401b45c83ee3bd971ace9496b61589f (diff) | |
| parent | ca1d447d70bd95e68282fbeba4b569664f3e53b3 (diff) | |
| download | gitlab-ce-e74f7159c5d2725c1069940c6810545b1007cfbc.tar.gz | |
Merge branch 'fix-issue-mr-badge' into 'master'
Use grid and correct border radius for status badge
See merge request gitlab-org/gitlab-ce!29420
| -rw-r--r-- | app/assets/stylesheets/framework/issue_box.scss | 4 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/issuable.scss | 3 | ||||
| -rw-r--r-- | changelogs/unreleased/fix-issue-mr-badge.yml | 5 |
3 files changed, 8 insertions, 4 deletions
diff --git a/app/assets/stylesheets/framework/issue_box.scss b/app/assets/stylesheets/framework/issue_box.scss index e51f230a680..1a38f3ccce4 100644 --- a/app/assets/stylesheets/framework/issue_box.scss +++ b/app/assets/stylesheets/framework/issue_box.scss @@ -16,10 +16,10 @@ margin-top: 5px; } - border-radius: 3px; + border-radius: $border-radius-default; display: block; float: left; - margin-right: 10px; + margin-right: $gl-padding-8; color: $white-light; font-size: $gl-font-size; line-height: $gl-line-height-24; diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss index 79282f9043c..dcbb23684d1 100644 --- a/app/assets/stylesheets/pages/issuable.scss +++ b/app/assets/stylesheets/pages/issuable.scss @@ -682,8 +682,7 @@ justify-content: center; align-items: center; margin-top: 0; - padding-left: 9px; - padding-right: 9px; + padding: 0 $gl-padding-8; @include media-breakpoint-up(sm) { display: inline-block; diff --git a/changelogs/unreleased/fix-issue-mr-badge.yml b/changelogs/unreleased/fix-issue-mr-badge.yml new file mode 100644 index 00000000000..e777f52f173 --- /dev/null +++ b/changelogs/unreleased/fix-issue-mr-badge.yml @@ -0,0 +1,5 @@ +--- +title: Use grid and correct border radius for status badge +merge_request: +author: +type: other |