aboutsummaryrefslogtreecommitdiffstats
path: root/server/sonar-web/src/main
diff options
context:
space:
mode:
authorWouter Admiraal <wouter.admiraal@sonarsource.com>2019-06-26 12:12:30 +0200
committersonartech <sonartech@sonarsource.com>2019-06-28 08:45:56 +0200
commit3e75aa82f6eac9e0f410a12e934cfe28adbab3a1 (patch)
treea378a16b93072b0f9a9d97e0157922804de923e4 /server/sonar-web/src/main
parent23f63e3f324cf10cd0e60cc5f3ecbff0b5696259 (diff)
downloadsonarqube-3e75aa82f6eac9e0f410a12e934cfe28adbab3a1.tar.gz
sonarqube-3e75aa82f6eac9e0f410a12e934cfe28adbab3a1.zip
SONAR-11714 Make badges round
Diffstat (limited to 'server/sonar-web/src/main')
-rw-r--r--server/sonar-web/src/main/js/app/styles/components/badges.css12
-rw-r--r--server/sonar-web/src/main/js/components/facet/FacetHeader.tsx2
-rw-r--r--server/sonar-web/src/main/js/components/facet/__tests__/__snapshots__/FacetHeader-test.tsx.snap6
3 files changed, 6 insertions, 14 deletions
diff --git a/server/sonar-web/src/main/js/app/styles/components/badges.css b/server/sonar-web/src/main/js/app/styles/components/badges.css
index 5704c6ed703..89b735f3b71 100644
--- a/server/sonar-web/src/main/js/app/styles/components/badges.css
+++ b/server/sonar-web/src/main/js/app/styles/components/badges.css
@@ -23,7 +23,7 @@
height: var(--smallControlHeight);
line-height: calc(var(--smallControlHeight) - 1px);
padding: 0 var(--gridSize);
- border-radius: 2px;
+ border-radius: 10px;
font-size: var(--smallFontSize);
min-width: 10px;
letter-spacing: 0.03em;
@@ -47,12 +47,6 @@ a.badge {
border-bottom: none;
}
-.badge.is-rounded {
- padding-left: 5px;
- padding-right: 5px;
- border-radius: 50px;
-}
-
.badge-medium {
height: var(--controlHeight);
line-height: calc(var(--controlHeight));
@@ -111,7 +105,6 @@ a.badge {
.badge-danger-light {
border: 1px solid var(--alertBorderError) !important;
- border-radius: 3px;
background-color: var(--alertBackgroundError);
color: #a94442;
}
@@ -124,7 +117,6 @@ a.badge-danger-light:active {
.badge-focus {
border: 1px solid #faebcc;
- border-radius: 3px;
background-color: #fcf8e3;
color: #8a6d3b;
font-weight: 400;
@@ -147,7 +139,7 @@ a.badge-focus:active {
line-height: calc(var(--smallControlHeight) - 1px);
padding: 0 var(--gridSize);
border: 1px solid var(--gray80);
- border-radius: 2px;
+ border-radius: 10px;
box-sizing: border-box;
background-color: var(--gray80);
font-size: var(--smallFontSize);
diff --git a/server/sonar-web/src/main/js/components/facet/FacetHeader.tsx b/server/sonar-web/src/main/js/components/facet/FacetHeader.tsx
index 600ee76ca42..9fc909e9a9f 100644
--- a/server/sonar-web/src/main/js/components/facet/FacetHeader.tsx
+++ b/server/sonar-web/src/main/js/components/facet/FacetHeader.tsx
@@ -60,7 +60,7 @@ export default class FacetHeader extends React.PureComponent<Props> {
const value =
values.length === 1 ? values[0] : translateWithParameters('x_selected', values.length);
return (
- <span className="badge badge-secondary is-rounded text-ellipsis" title={value}>
+ <span className="badge badge-secondary text-ellipsis" title={value}>
{value}
</span>
);
diff --git a/server/sonar-web/src/main/js/components/facet/__tests__/__snapshots__/FacetHeader-test.tsx.snap b/server/sonar-web/src/main/js/components/facet/__tests__/__snapshots__/FacetHeader-test.tsx.snap
index 2e5979cbff6..d0b3085bc68 100644
--- a/server/sonar-web/src/main/js/components/facet/__tests__/__snapshots__/FacetHeader-test.tsx.snap
+++ b/server/sonar-web/src/main/js/components/facet/__tests__/__snapshots__/FacetHeader-test.tsx.snap
@@ -22,7 +22,7 @@ exports[`should clear 1`] = `
className="search-navigator-facet-header-value spacer-left spacer-right "
>
<span
- className="badge badge-secondary is-rounded text-ellipsis"
+ className="badge badge-secondary text-ellipsis"
title="x_selected.3"
>
x_selected.3
@@ -59,7 +59,7 @@ exports[`should render closed facet with value 1`] = `
className="search-navigator-facet-header-value spacer-left spacer-right "
>
<span
- className="badge badge-secondary is-rounded text-ellipsis"
+ className="badge badge-secondary text-ellipsis"
title="foo"
>
foo
@@ -114,7 +114,7 @@ exports[`should render open facet with value 1`] = `
className="search-navigator-facet-header-value spacer-left spacer-right "
>
<span
- className="badge badge-secondary is-rounded text-ellipsis"
+ className="badge badge-secondary text-ellipsis"
title="foo"
>
foo