From f5751c34a9a42779726e09620744a5f114d1c427 Mon Sep 17 00:00:00 2001 From: Paulo Reis Date: Thu, 21 Dec 2017 12:57:33 +0000 Subject: [PATCH] Make inline tags look nicer with v2 typography. --- services/web/public/stylesheets/app/project-list.less | 2 +- services/web/public/stylesheets/components/labels.less | 2 +- services/web/public/stylesheets/core/_common-variables.less | 4 +++- services/web/public/stylesheets/core/ol-variables.less | 2 ++ 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/services/web/public/stylesheets/app/project-list.less b/services/web/public/stylesheets/app/project-list.less index 930eecd3c3..94469b246c 100644 --- a/services/web/public/stylesheets/app/project-list.less +++ b/services/web/public/stylesheets/app/project-list.less @@ -345,9 +345,9 @@ ul.project-list { .tag-label { margin-left: @line-height-computed / 4; position: relative; - top: -2px; display: inline-block; white-space: nowrap; + top: @tag-top-adjustment; } .tag-label-name, .tag-label-remove { diff --git a/services/web/public/stylesheets/components/labels.less b/services/web/public/stylesheets/components/labels.less index 5db1ed12c0..675b6522ef 100755 --- a/services/web/public/stylesheets/components/labels.less +++ b/services/web/public/stylesheets/components/labels.less @@ -5,7 +5,7 @@ .label { display: inline; padding: .2em .6em .3em; - font-size: 75%; + font-size: @labels-font-size; font-weight: bold; line-height: 1; color: @label-color; diff --git a/services/web/public/stylesheets/core/_common-variables.less b/services/web/public/stylesheets/core/_common-variables.less index 02bda45121..b385a45e8e 100644 --- a/services/web/public/stylesheets/core/_common-variables.less +++ b/services/web/public/stylesheets/core/_common-variables.less @@ -952,4 +952,6 @@ @tag-border-radius : 0.25em; @tag-bg-color : @label-default-bg; @tag-max-width : 150px; -@tag-bg-hover-color : darken(@label-default-bg, 10%); \ No newline at end of file +@tag-bg-hover-color : darken(@label-default-bg, 10%); +@tag-top-adjustment : -2px; +@labels-font-size : 75%; \ No newline at end of file diff --git a/services/web/public/stylesheets/core/ol-variables.less b/services/web/public/stylesheets/core/ol-variables.less index 632c326b81..d2e3cdb530 100644 --- a/services/web/public/stylesheets/core/ol-variables.less +++ b/services/web/public/stylesheets/core/ol-variables.less @@ -93,6 +93,8 @@ @tag-border-radius : 9999px; @tag-bg-color : @ol-green; @tag-bg-hover-color : @ol-dark-green; +@tag-top-adjustment : 2px; +@labels-font-size : 85%; // Navbar @navbar-default-padding : (@grid-gutter-width / 2) 0;