From 5190c55b29d6f181c338e60aebcc2f451f5e2489 Mon Sep 17 00:00:00 2001 From: Gilad Gray Date: Tue, 30 Oct 2018 16:58:45 -0700 Subject: [PATCH 1/3] fix lint error --- packages/core/src/common/_flex.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/src/common/_flex.scss b/packages/core/src/common/_flex.scss index b44d7db1b4..7dc3090174 100644 --- a/packages/core/src/common/_flex.scss +++ b/packages/core/src/common/_flex.scss @@ -36,8 +36,8 @@ // CSS API support &::before, - // space after all children > * { + // space after all children #{$margin-prop}: $margin; } From 7d88d11eeb422d300a5fbcb5c10a67c3d1e2d19a Mon Sep 17 00:00:00 2001 From: Gilad Gray Date: Tue, 30 Oct 2018 16:58:58 -0700 Subject: [PATCH 2/3] set tag line-height to icon size --- packages/core/src/components/tag/_common.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/core/src/components/tag/_common.scss b/packages/core/src/components/tag/_common.scss index 9ac9fd239e..4d8c7b96e1 100644 --- a/packages/core/src/components/tag/_common.scss +++ b/packages/core/src/components/tag/_common.scss @@ -31,6 +31,7 @@ $tag-round-adjustment: 2px !default; max-width: 100%; min-height: $tag-height; padding: $tag-padding-top $tag-padding; + line-height: $pt-icon-size-standard; color: $pt-dark-text-color; font-size: $pt-font-size-small; @@ -66,6 +67,7 @@ $tag-round-adjustment: 2px !default; min-width: $tag-height-large; min-height: $tag-height-large; padding: 0 $tag-padding-large; + line-height: $pt-icon-size-large; font-size: $pt-font-size; &.#{$ns}-round { From 1f04c5544819e5607dd4fa60e3f53f9f4e09c924 Mon Sep 17 00:00:00 2001 From: Gilad Gray Date: Thu, 1 Nov 2018 15:05:21 -0700 Subject: [PATCH 3/3] $tag-line-height(-large) vars --- packages/core/src/components/tag/_common.scss | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/core/src/components/tag/_common.scss b/packages/core/src/components/tag/_common.scss index 4d8c7b96e1..49e6613d36 100644 --- a/packages/core/src/components/tag/_common.scss +++ b/packages/core/src/components/tag/_common.scss @@ -5,12 +5,14 @@ $tag-default-color: $gray1 !default; $dark-tag-default-color: $gray5 !default; $tag-height: $pt-grid-size * 2 !default; -$tag-padding-top: ($tag-height - $pt-icon-size-standard) / 2 !default; +$tag-line-height: $pt-icon-size-standard !default; +$tag-padding-top: ($tag-height - $tag-line-height) / 2 !default; $tag-padding: $tag-padding-top * 3 !default; $tag-margin: ($pt-input-height - $tag-height) / 2 !default; $tag-height-large: $pt-grid-size * 3 !default; -$tag-padding-large: ($tag-height-large - $pt-icon-size-large) !default; +$tag-line-height-large: $pt-icon-size-large !default; +$tag-padding-large: ($tag-height-large - $tag-line-height-large) !default; $tag-icon-spacing: ($tag-height - 12px) / 2 !default; $tag-icon-spacing-large: ($tag-height-large - $pt-icon-size-standard) / 2 !default; @@ -31,7 +33,7 @@ $tag-round-adjustment: 2px !default; max-width: 100%; min-height: $tag-height; padding: $tag-padding-top $tag-padding; - line-height: $pt-icon-size-standard; + line-height: $tag-line-height; color: $pt-dark-text-color; font-size: $pt-font-size-small; @@ -67,7 +69,7 @@ $tag-round-adjustment: 2px !default; min-width: $tag-height-large; min-height: $tag-height-large; padding: 0 $tag-padding-large; - line-height: $pt-icon-size-large; + line-height: $tag-line-height-large; font-size: $pt-font-size; &.#{$ns}-round {