Commit 6220c595 authored by George Tsiolis's avatar George Tsiolis

Apply new default and inline label design

parent bb2478c2
...@@ -558,6 +558,7 @@ $jq-ui-default-color: #777; ...@@ -558,6 +558,7 @@ $jq-ui-default-color: #777;
/* /*
* Label * Label
*/ */
$label-font-size: 12px;
$label-padding: 7px; $label-padding: 7px;
$label-padding-modal: 10px; $label-padding-modal: 10px;
$label-gray-bg: #f8fafc; $label-gray-bg: #f8fafc;
......
...@@ -72,7 +72,6 @@ ...@@ -72,7 +72,6 @@
.label { .label {
color: $gl-text-color; color: $gl-text-color;
font-size: inherit;
} }
iframe.twitter-share-button { iframe.twitter-share-button {
......
...@@ -102,12 +102,11 @@ ...@@ -102,12 +102,11 @@
.issuable-show-labels { .issuable-show-labels {
a { a {
margin-right: 5px;
margin-bottom: 5px; margin-bottom: 5px;
display: inline-block; display: inline-block;
.color-label { .color-label {
padding: 6px 10px; padding: 4px $grid-size;
border-radius: $label-border-radius; border-radius: $label-border-radius;
} }
......
...@@ -105,13 +105,16 @@ ...@@ -105,13 +105,16 @@
} }
.label { .label {
padding: 8px 12px; padding: 4px $grid-size;
font-size: 14px; font-size: $label-font-size;
position: relative;
top: ($grid-size / 2);
} }
} }
.color-label { .color-label {
padding: 3px $label-padding; padding: 0 $grid-size;
line-height: 16px;
border-radius: $label-border-radius; border-radius: $label-border-radius;
} }
...@@ -302,10 +305,11 @@ ...@@ -302,10 +305,11 @@
} }
.label-link { .label-link {
display: inline-block; display: inline-flex;
vertical-align: top; vertical-align: top;
.label { .label {
vertical-align: inherit; vertical-align: inherit;
font-size: $label-font-size;
} }
} }
...@@ -128,7 +128,6 @@ ...@@ -128,7 +128,6 @@
.label { .label {
color: $gl-text-color; color: $gl-text-color;
font-size: inherit;
} }
p { 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