From 299b8d8c822515f5549a17477f298df51bd2f80e Mon Sep 17 00:00:00 2001 From: Colin Date: Thu, 19 Nov 2020 10:50:47 -0500 Subject: [PATCH 1/2] npm install @primer/primitives@0.0.0-20201019154814 --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index ad731a73..e9f107f2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3499,9 +3499,9 @@ } }, "@primer/primitives": { - "version": "0.0.0-20201019125449", - "resolved": "https://registry.npmjs.org/@primer/primitives/-/primitives-0.0.0-20201019125449.tgz", - "integrity": "sha512-tI9CfIlmvZx/0zB/bTEG6xxNiWw5vJ4ystTb0auWco5dvnBzvOENuf29WAgFOtjW5mg01xsbleoy3I6Baqt+PQ==" + "version": "0.0.0-20201019154814", + "resolved": "https://registry.npmjs.org/@primer/primitives/-/primitives-0.0.0-20201019154814.tgz", + "integrity": "sha512-ykPpK3Tmet3YLgb206gajuxKlFMQqmltWPAgXz+YgzeuZGxPWR/SdMjwnWr+55E6m4hhA2dZLxIUtu5AsAyvaQ==" }, "@reach/router": { "version": "1.3.3", diff --git a/package.json b/package.json index 520bf7c0..b44f5e10 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ }, "dependencies": { "@primer/octicons": "^9.1.1", - "@primer/primitives": "0.0.0-20201019125449" + "@primer/primitives": "0.0.0-20201019154814" }, "devDependencies": { "@octokit/rest": "^16.34.0", From 5c39e220592e678b3a2001dca3f85e644370b4a8 Mon Sep 17 00:00:00 2001 From: Colin Date: Thu, 19 Nov 2020 12:37:54 -0500 Subject: [PATCH 2/2] fix subnav and filter list component selected bg colors --- src/navigation/filter-list.scss | 4 ++-- src/navigation/subnav.scss | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/navigation/filter-list.scss b/src/navigation/filter-list.scss index cad6d277..cef3b8dc 100644 --- a/src/navigation/filter-list.scss +++ b/src/navigation/filter-list.scss @@ -43,8 +43,8 @@ &.selected, &[aria-selected=true], &[aria-current]:not([aria-current=false]) { - color: var(--color-state-hover-primary-text); - background-color: var(--color-bg-info-inverse); + color: var(--color-state-selected-primary-text); + background-color: var(--color-state-selected-primary-bg); } .count { diff --git a/src/navigation/subnav.scss b/src/navigation/subnav.scss index 48d72fb5..f4aa95b5 100644 --- a/src/navigation/subnav.scss +++ b/src/navigation/subnav.scss @@ -43,10 +43,9 @@ &[aria-selected=true], &[aria-current]:not([aria-current=false]) { z-index: 2; - color: var(--color-state-hover-primary-text); - background-color: var(--color-bg-info-inverse); - // stylelint-disable-next-line primer/borders - border-color: var(--color-auto-blue-6); + color: var(--color-state-selected-primary-text); + background-color: var(--color-state-selected-primary-bg); + border-color: var(--color-state-selected-primary-border); } &:first-child {