Commit e7b995e8 authored by Fatih Acet's avatar Fatih Acet

Merge branch 'rounded-labels-fixes' into 'master'

Additional rounded label fixes

## What does this MR do?

fixes some UI bugs for the change to rounded labels

## Are there points in the code the reviewer needs to double check?
-

## Why was this MR needed? / Screenshots (if relevant)

before:
![image](/uploads/ce359bb021fee324156f050b3f848c2e/image.png)

after:
![image](/uploads/a5f0d536db3efdce4ff994deb0d73081/image.png)
these now have full rounded border-radius as well :)
![image](/uploads/d331eae2c32dd043766b4148f9ad88e9/image.png)

## Does this MR meet the acceptance criteria?

- [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
  - [ ] Added for this feature/bug
  - [ ] All builds are passing
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

## What are the relevant issue numbers?

-

See merge request !8136
parents fb16b01f 595da33d
...@@ -438,7 +438,7 @@ $jq-ui-default-color: #777; ...@@ -438,7 +438,7 @@ $jq-ui-default-color: #777;
$label-gray-bg: #f8fafc; $label-gray-bg: #f8fafc;
$label-inverse-bg: #333; $label-inverse-bg: #333;
$label-remove-border: rgba(0, 0, 0, .1); $label-remove-border: rgba(0, 0, 0, .1);
$label-border-radius: 14px; $label-border-radius: 100px;
/* /*
* Lint * Lint
......
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
} }
.label { .label {
padding: 9px; padding: 8px 9px 9px;
font-size: 14px; font-size: 14px;
} }
} }
...@@ -201,6 +201,8 @@ ...@@ -201,6 +201,8 @@
.label-remove { .label-remove {
border-left: 1px solid $label-remove-border; border-left: 1px solid $label-remove-border;
z-index: 3; z-index: 3;
border-radius: $label-border-radius;
padding: 6px 10px 6px 9px;
} }
.btn { .btn {
......
---
title: Additional rounded label fixes
merge_request:
author:
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment