From 1b945448a7518b61ded3eee1556d895433d5a67b Mon Sep 17 00:00:00 2001 From: simurai Date: Wed, 11 Mar 2020 13:51:44 +0900 Subject: [PATCH 1/4] Use normal font-weight for .Label --- src/labels/mixins.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/labels/mixins.scss b/src/labels/mixins.scss index 2e351848d4..3da49d0b11 100644 --- a/src/labels/mixins.scss +++ b/src/labels/mixins.scss @@ -8,7 +8,7 @@ display: inline-block; padding: 0 7px; font-size: $font-size-small; - font-weight: $font-weight-semibold; + font-weight: $font-weight-normal; line-height: 18px; border: $border-width $border-style transparent; border-radius: 2em; From c26bacc55b3e36c305a3d6a1040a32ad76decdc4 Mon Sep 17 00:00:00 2001 From: simurai Date: Wed, 11 Mar 2020 14:11:31 +0900 Subject: [PATCH 2/4] Use custom accent color --- src/navigation/menu.scss | 4 ++-- src/navigation/sidenav.scss | 2 +- src/navigation/underline-nav.scss | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/navigation/menu.scss b/src/navigation/menu.scss index 84b7e483db..2aff4ab1f8 100644 --- a/src/navigation/menu.scss +++ b/src/navigation/menu.scss @@ -50,7 +50,7 @@ &[aria-current] { cursor: default; // stylelint-disable-next-line primer/colors - background-color: $orange-000; + background-color: #fff2f0; // custom coral &::before { position: absolute; @@ -60,7 +60,7 @@ width: 2px; content: ""; // stylelint-disable-next-line primer/colors - background-color: $orange-500; + background-color: #f9826c; // custom coral } } diff --git a/src/navigation/sidenav.scss b/src/navigation/sidenav.scss index bdc3b2b193..b8c06cfbf0 100644 --- a/src/navigation/sidenav.scss +++ b/src/navigation/sidenav.scss @@ -62,7 +62,7 @@ // Bar on the left &::before { // stylelint-disable-next-line primer/colors - background-color: $orange-500; + background-color: #f9826c; // custom coral } } diff --git a/src/navigation/underline-nav.scss b/src/navigation/underline-nav.scss index f8f0c97bef..ceb5d8b3f1 100644 --- a/src/navigation/underline-nav.scss +++ b/src/navigation/underline-nav.scss @@ -35,7 +35,7 @@ &[role=tab][aria-selected=true], &[aria-current] { // stylelint-disable-next-line primer/borders - border-bottom-color: $orange-500; + border-bottom-color: #f9826c; // custom coral } } From 8c615b63699cab52cd589793b4720586f990d23e Mon Sep 17 00:00:00 2001 From: simurai Date: Wed, 11 Mar 2020 16:53:06 +0900 Subject: [PATCH 3/4] Fix dark border on page load --- src/navigation/underline-nav.scss | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/navigation/underline-nav.scss b/src/navigation/underline-nav.scss index ceb5d8b3f1..745eefbc37 100644 --- a/src/navigation/underline-nav.scss +++ b/src/navigation/underline-nav.scss @@ -21,14 +21,15 @@ background-color: transparent; border: 0; // stylelint-disable-next-line primer/borders - border-bottom: 2px $border-style transparent; + border-bottom: 2px $border-style rgba($border-gray-dark, 0); transition: border-bottom-color 0.36s ease-in; &:hover, &:focus { text-decoration: none; border-bottom-color: $border-gray-dark; - transition: border-bottom-color 0.12s ease-out; + transition-duration: 0.12s; + transition-timing-function: ease-out; } &.selected, From c80466c3ec44ca121437e7e08fd5736c0e713581 Mon Sep 17 00:00:00 2001 From: simurai Date: Wed, 11 Mar 2020 19:34:18 +0900 Subject: [PATCH 4/4] Lint --- src/navigation/underline-nav.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/navigation/underline-nav.scss b/src/navigation/underline-nav.scss index 745eefbc37..7c76ef5fe8 100644 --- a/src/navigation/underline-nav.scss +++ b/src/navigation/underline-nav.scss @@ -28,8 +28,8 @@ &:focus { text-decoration: none; border-bottom-color: $border-gray-dark; - transition-duration: 0.12s; transition-timing-function: ease-out; + transition-duration: 0.12s; } &.selected,