From 7de1751eee112e8c618f9c1d5b0f9dba62d5e91e Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Wed, 28 Apr 2021 16:32:48 -0500 Subject: [PATCH] GH-191: UNTESTED Use env() in branding_logos, also - Remove global colors import that is redundant on Portal. - Comment plan to remove global fonts redundant on Portal. --- .../static/site_cms/css/src/_imports/branding_logos.css | 8 ++++---- taccsite_cms/static/site_cms/css/src/site.header.css | 5 +---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/taccsite_cms/static/site_cms/css/src/_imports/branding_logos.css b/taccsite_cms/static/site_cms/css/src/_imports/branding_logos.css index bdffadf1e..32547ed21 100644 --- a/taccsite_cms/static/site_cms/css/src/_imports/branding_logos.css +++ b/taccsite_cms/static/site_cms/css/src/_imports/branding_logos.css @@ -22,16 +22,16 @@ /* FAQ: Do not use `48.78px`, because Safari only accepts whole numbers */ height: 49px; - background-color: var(--global-color-primary--xx-dark); - color: var(--global-color-primary--xx-light); - border-bottom: 1px solid var(--global-color-primary--normal); + background-color: env(--header-bkgd-color); + color: env(--header-text-color); + border-bottom: 1px solid env(--header-minor-border-color); } .branding-seperator { width: 1px; height: 100%; max-height: var(--branding-logo-height); - border-left: solid 1px var(--global-color-primary--xx-light); + border-left: solid 1px env(--header-text-color); margin: 0 15px; vertical-align: middle; } diff --git a/taccsite_cms/static/site_cms/css/src/site.header.css b/taccsite_cms/static/site_cms/css/src/site.header.css index 54d5011ab..e3d1eeaa2 100644 --- a/taccsite_cms/static/site_cms/css/src/site.header.css +++ b/taccsite_cms/static/site_cms/css/src/site.header.css @@ -10,11 +10,8 @@ /* CAVEAT: This is already imported in `site.css`, but necessary here to override Portal (which also loads `site.header.css`), so font variables are unfortunately overwritten 1x in CMS, 2x in Portal */ -/* TODO: Find a way to be modular, but not redundant */ +/* GH-191: Use `env()` vars for fonts */ @import url("_imports/settings/font.css"); -/* NOTE: Portal does not need this, because it has independent copy of these, - but the User Guides do not. This can be removed in Core-CMS PR #192 */ -@import url("../../../site_shared/css/src/_imports/settings/color.css"); /* TRUMPS */