Commit 88e3915d authored by Clement Ho's avatar Clement Ho

Merge branch 'fix/change-event-body-label-font-size' into 'master'

Apply new default and inline label design #34725

Closes #34725

See merge request gitlab-org/gitlab-ce!16956
parents daf88307 6220c595
......@@ -558,6 +558,7 @@ $jq-ui-default-color: #777;
/*
* Label
*/
$label-font-size: 12px;
$label-padding: 7px;
$label-padding-modal: 10px;
$label-gray-bg: #f8fafc;
......
......@@ -72,7 +72,6 @@
.label {
color: $gl-text-color;
font-size: inherit;
}
iframe.twitter-share-button {
......
......@@ -102,12 +102,11 @@
.issuable-show-labels {
a {
margin-right: 5px;
margin-bottom: 5px;
display: inline-block;
.color-label {
padding: 6px 10px;
padding: 4px $grid-size;
border-radius: $label-border-radius;
}
......
......@@ -105,13 +105,16 @@
}
.label {
padding: 8px 12px;
font-size: 14px;
padding: 4px $grid-size;
font-size: $label-font-size;
position: relative;
top: ($grid-size / 2);
}
}
.color-label {
padding: 3px $label-padding;
padding: 0 $grid-size;
line-height: 16px;
border-radius: $label-border-radius;
}
......@@ -302,10 +305,11 @@
}
.label-link {
display: inline-block;
display: inline-flex;
vertical-align: top;
.label {
vertical-align: inherit;
font-size: $label-font-size;
}
}
......@@ -128,7 +128,6 @@
.label {
color: $gl-text-color;
font-size: inherit;
}
p {
......
---
title: Apply new default and inline label design
merge_request: 16956
author: George Tsiolis
type: changed
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