From 8a369066aea308d4f6520cad30c50beb4bc89321 Mon Sep 17 00:00:00 2001 From: Volker E Date: Fri, 19 May 2023 00:44:59 -0700 Subject: [PATCH] styles: Replace local var with Codex design token This replaces the local variable for line-height with the design token of same value. Bug: T331403 Change-Id: I08a5edfc355f36a16e780912af6945b2c4f50252 --- resources/common/typography.less | 2 +- resources/common/variables.less | 5 ++--- resources/skins.vector.zebra.styles/variables.less | 1 - 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/resources/common/typography.less b/resources/common/typography.less index d700e7fd6..8dd39e94b 100644 --- a/resources/common/typography.less +++ b/resources/common/typography.less @@ -48,7 +48,7 @@ pre, margin-bottom: 0.25em; padding: 0; font-family: @font-family-serif; - line-height: @line-height-heading; + line-height: @line-height-xx-small; // Fallback heading font for scripts which render poorly in `@font-family-serif`. // See T73240 diff --git a/resources/common/variables.less b/resources/common/variables.less index bbfe154ca..984e127f8 100644 --- a/resources/common/variables.less +++ b/resources/common/variables.less @@ -57,7 +57,6 @@ @font-size-footer: unit( 12 / @font-size-browser, em ); @line-height-base: 1.6; -@line-height-heading: 1.375; @line-height-code: 1.3; @line-height-footer-info: 1.4; @line-height-footer-buttons: 2; @@ -109,12 +108,12 @@ @max-height-bottom-spacing-scroll-indicator: 16px; // TOC and Page tools Pinned elements -@padding-top-pinned-element: unit( (30px - @padding-top-tabs) / @font-size-browser, em); +@padding-top-pinned-element: unit( ( 30px - @padding-top-tabs ) / @font-size-browser, em ); // Page Tools // 2.34 (height of #firstHeading) - the padding on the pinned element to allow // for 30px of space between the top of the pinned element and the top of the viewport. -@margin-top-pinned-page-tools: (@font-size-heading-1 * @line-height-heading) - @padding-top-pinned-element; +@margin-top-pinned-page-tools: ( @font-size-heading-1 * @line-height-xx-small ) - @padding-top-pinned-element; // TOC @spacing-subsection-toggle: 22px; // @size-toc-subsection-toggle-icon @ 12 diff --git a/resources/skins.vector.zebra.styles/variables.less b/resources/skins.vector.zebra.styles/variables.less index 11ec4c04a..e309140d9 100644 --- a/resources/skins.vector.zebra.styles/variables.less +++ b/resources/skins.vector.zebra.styles/variables.less @@ -57,7 +57,6 @@ @font-size-footer: unit( 12 / @font-size-browser, em ); @line-height-base: 1.6; -@line-height-heading: 1.375; @line-height-code: 1.3; @line-height-footer-info: 1.4; @line-height-footer-buttons: 2;