Skip to content

Commit

Permalink
Merge pull request #1045 from primer/next-1
Browse files Browse the repository at this point in the history
More "component refresh" tweaks
  • Loading branch information
simurai authored Mar 11, 2020
2 parents 20f243c + c80466c commit 0e52ad3
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 7 deletions.
2 changes: 1 addition & 1 deletion src/labels/mixins.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/navigation/menu.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -60,7 +60,7 @@
width: 2px;
content: "";
// stylelint-disable-next-line primer/colors
background-color: $orange-500;
background-color: #f9826c; // custom coral
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/navigation/sidenav.scss
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
// Bar on the left
&::before {
// stylelint-disable-next-line primer/colors
background-color: $orange-500;
background-color: #f9826c; // custom coral
}
}

Expand Down
7 changes: 4 additions & 3 deletions src/navigation/underline-nav.scss
Original file line number Diff line number Diff line change
Expand Up @@ -21,21 +21,22 @@
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-timing-function: ease-out;
transition-duration: 0.12s;
}

&.selected,
&[role=tab][aria-selected=true],
&[aria-current] {
// stylelint-disable-next-line primer/borders
border-bottom-color: $orange-500;
border-bottom-color: #f9826c; // custom coral
}
}

Expand Down

0 comments on commit 0e52ad3

Please sign in to comment.