Skip to content

Add hover state to Hierarchy toggle background and hover + refactor #915

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Add hover state to Hierarchy toggle background and hover + refactor #915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e4a7677
Add colors for state hover in toggle background and border
marinaaisa Nov 19, 2024
00396f0
Delete unnecessary nav-dark mode in HierarchyCollapsedItems
marinaaisa Nov 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 6 additions & 17 deletions src/components/DocumentationTopic/Hero/HierarchyCollapsedItems.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,18 +100,17 @@ $border-width: 1px;
// Values specified in rgba due to alpha transparency used in the background
// of the nav area, so they are represented as clear overlays here
$toggle-bg-color: var(--color-nav-hierarchy-collapse-background);
$toggle-bg-color-dark: var(--color-nav-dark-hierarchy-collapse-background);
$toggle-bg-color-hover: var(--color-nav-hierarchy-collapse-background-hover);
$toggle-border-color: var(--color-nav-hierarchy-collapse-borders);
$toggle-border-color-hover: var(--color-nav-hierarchy-collapse-borders-hover);
$hierarchy-toggle-border-width: 0 !default;
$toggle-height: rem(19px);
$toggle-width: rem(36px);

// Values specified here are opaque versions of the dropdown colors so that
// they match (without using alpha)
$dropdown-bg-color: $toggle-bg-color;
$dropdown-bg-color-dark: $toggle-bg-color-dark;
$dropdown-border-color: var(--color-nav-hierarchy-collapse-borders);
$dropdown-border-color-dark: var(--color-nav-dark-hierarchy-collapse-borders);
$dropdown-transition-duration: 250ms;
$hierarchy-dropdown-border-width: 0px !default;
$hierarchy-dropdown-box-shadow: 0 1px 4px -1px var(--color-figure-gray-secondary) !default;
Expand Down Expand Up @@ -158,8 +157,10 @@ $dropdown-vertical-offset: rem(7px);
display: flex;
align-items: center;
justify-content: center;
@include nav-dark() {
background: $toggle-bg-color-dark;

&:hover {
background: $toggle-bg-color-hover;
border-color: $toggle-border-color-hover;
}

&:active,
Expand Down Expand Up @@ -193,10 +194,6 @@ $dropdown-vertical-offset: rem(7px);
position: absolute;
z-index: 42;
top: calc(100% + #{$dropdown-vertical-offset});
@include nav-dark() {
background: $dropdown-bg-color-dark;
border-color: $dropdown-border-color-dark;
}

&.collapsed {
opacity: 0;
Expand Down Expand Up @@ -234,10 +231,6 @@ $dropdown-vertical-offset: rem(7px);
left: $tail-offset;
position: absolute;
top: rem($border-width) - $tail-width;

@include nav-dark() {
border-bottom-color: $dropdown-bg-color-dark;
}
}
}

Expand All @@ -246,10 +239,6 @@ $dropdown-vertical-offset: rem(7px);
border-top-style: $border-style;
border-top-width: $border-width;

@include nav-dark() {
border-top-color: $dropdown-border-color-dark;
}

&:first-child {
border-top: none;
}
Expand Down
6 changes: 4 additions & 2 deletions src/styles/core/colors/_dark.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,10 @@
--color-nav-color: var(--color-nav-dark-color);
--color-nav-current-link: var(--color-nav-dark-current-link);
--color-nav-expanded: var(--color-nav-dark-expanded);
--color-nav-hierarchy-collapse-background: var(--color-nav-dark-hierarchy-collapse-background);
--color-nav-hierarchy-collapse-borders: var(--color-nav-dark-hierarchy-collapse-borders);
--color-nav-hierarchy-collapse-background: #{dark-color(fill-gray-tertiary)};
--color-nav-hierarchy-collapse-borders: #{light-color(figure-gray-secondary)};
--color-nav-hierarchy-collapse-background-hover: #{change-color(dark-color(fill-blue), $alpha: 0.5)};
--color-nav-hierarchy-collapse-borders-hover: #{dark-color(figure-blue)};
--color-nav-hierarchy-item-borders: var(--color-nav-dark-hierarchy-item-borders);
--color-nav-keyline: var(--color-nav-dark-keyline);
--color-nav-link-color: var(--color-nav-dark-link-color);
Expand Down
4 changes: 2 additions & 2 deletions src/styles/core/colors/_light.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,9 @@
--color-nav-current-link: #{change-color(light-color(figure-gray))};
--color-nav-expanded: #{light-color(fill)};
--color-nav-hierarchy-collapse-background: #{light-color(fill-gray-tertiary)};
--color-nav-hierarchy-collapse-background-hover: #{change-color(light-color(fill-blue), $alpha: 0.05)};
--color-nav-hierarchy-collapse-borders: #{dark-color(figure-gray-secondary)};
--color-nav-hierarchy-collapse-borders-hover: #{light-color(figure-blue)};
--color-nav-hierarchy-item-borders: #{dark-color(figure-gray-secondary)};
--color-nav-keyline: #{change-color(light-color(figure-gray), $alpha: 0.2)};
--color-nav-link-color: #{light-color(figure-gray)};
Expand All @@ -120,8 +122,6 @@
--color-nav-dark-color: #{dark-color(figure-gray)};
--color-nav-dark-current-link: #{change-color(dark-color(figure-gray))};
--color-nav-dark-expanded: #{dark-color(fill-tertiary)};
--color-nav-dark-hierarchy-collapse-background: #{dark-color(fill-gray-tertiary)};
--color-nav-dark-hierarchy-collapse-borders: #{light-color(figure-gray-secondary)};
--color-nav-dark-hierarchy-item-borders: #{dark-color(fill-gray-tertiary)};
--color-nav-dark-keyline: #{change-color(dark-color(fill-gray-tertiary), $alpha: 0.95)};
--color-nav-dark-link-color: #{dark-color(figure-gray)};
Expand Down