1
0
mirror of https://github.com/tabler/tabler.git synced 2025-12-21 17:34:25 +04:00

Enhance navbar styles with new hover effects and color variables (#2159)

This commit is contained in:
Paweł Kuna
2025-02-14 00:01:41 +01:00
committed by GitHub
parent 9755e1e9e9
commit ca4ba14718
8 changed files with 41 additions and 25 deletions

View File

@@ -0,0 +1,5 @@
---
"@tabler/core": patch
---
Fixes navbar styles with new hover effects and color variables

View File

@@ -681,7 +681,7 @@ $dropdown-divider-margin-y: var(--#{$prefix}spacer-2) !default;
// Tooltip // Tooltip
$tooltip-bg: var(--#{$prefix}bg-surface-dark) !default; $tooltip-bg: var(--#{$prefix}bg-surface-dark) !default;
$tooltip-color: var(--#{$prefix}light) !default; $tooltip-color: var(--#{$prefix}light) !default;
$tooltip-padding-y: var(--#{$prefix}spacer-2) !default; $tooltip-padding-y: var(--#{$prefix}spacer-1) !default;
$tooltip-padding-x: var(--#{$prefix}spacer-2) !default; $tooltip-padding-x: var(--#{$prefix}spacer-2) !default;
// Loader // Loader
@@ -729,9 +729,10 @@ $modal-sm: 380px !default;
$nav-link-padding-y: 0.5rem !default; $nav-link-padding-y: 0.5rem !default;
$nav-link-padding-x: 0.75rem !default; $nav-link-padding-x: 0.75rem !default;
$nav-link-color: var(--#{$prefix}gray-500) !default; $nav-link-color: var(--#{$prefix}gray-500) !default;
$nav-link-active-color: var(--#{$prefix}body-color) !default;
$nav-link-disabled-color: var(--#{$prefix}disabled-color) !default; $nav-link-disabled-color: var(--#{$prefix}disabled-color) !default;
$nav-link-icon-size: $icon-size !default; $nav-link-icon-size: $icon-size !default;
$nav-link-icon-color: var(--#{$prefix}icon-color) !default; $nav-link-icon-color: inherit !default;
$nav-pills-link-active-color: var(--#{$prefix}primary) !default; $nav-pills-link-active-color: var(--#{$prefix}primary) !default;
$nav-pills-link-active-bg: var(--#{$prefix}active-bg) !default; $nav-pills-link-active-bg: var(--#{$prefix}active-bg) !default;
@@ -753,7 +754,7 @@ $nav-tabs-bg: var(--#{$prefix}bg-surface-tertiary) !default;
// Navbar // Navbar
$navbar-height: 3.5rem !default; $navbar-height: 3.5rem !default;
$navbar-padding-y: 0.25rem !default; $navbar-padding-y: 0.25rem !default;
$navbar-light-color: var(--#{$prefix}muted) !default; $navbar-light-color: var(--#{$prefix}secondary) !default;
$navbar-hover-color: $white !default; $navbar-hover-color: $white !default;
@@ -762,8 +763,8 @@ $navbar-border-color: var(--#{$prefix}border-color) !default;
$navbar-light-color: var(--#{$prefix}body-color) !default; $navbar-light-color: var(--#{$prefix}body-color) !default;
$navbar-light-brand-color: var(--#{$prefix}body-color) !default; $navbar-light-brand-color: var(--#{$prefix}body-color) !default;
$navbar-light-active-color: var(--#{$prefix}body-color) color !default; $navbar-light-active-color: var(--#{$prefix}body-color) !default;
$navbar-light-hover-color: var(--#{$prefix}body-color) color !default; $navbar-light-hover-color: var(--#{$prefix}body-color) !default;
$navbar-light-disabled-color: var(--#{$prefix}disabled-color) !default; $navbar-light-disabled-color: var(--#{$prefix}disabled-color) !default;
$navbar-light-active-bg: rgba(0, 0, 0, 0.2) !default; $navbar-light-active-bg: rgba(0, 0, 0, 0.2) !default;
@@ -787,6 +788,7 @@ $navbar-toggler-focus-width: 0 !default;
$navbar-overlap-height: 9rem !default; $navbar-overlap-height: 9rem !default;
$navbar-nav-link-padding-x: $nav-link-padding-x !default; $navbar-nav-link-padding-x: $nav-link-padding-x !default;
$navbar-nav-link-hover-bg: rgba(0, 0, 0, .04) !default;
$navbar-active-border-color: var(--#{$prefix}primary) !default; $navbar-active-border-color: var(--#{$prefix}primary) !default;

View File

@@ -107,8 +107,8 @@ Navbar
.nav-link { .nav-link {
position: relative; position: relative;
min-width: 2rem; min-width: 2.5rem;
min-height: 2rem; min-height: 2.5rem;
justify-content: center; justify-content: center;
border-radius: var(--#{$prefix}border-radius); border-radius: var(--#{$prefix}border-radius);
@@ -122,11 +122,6 @@ Navbar
} }
} }
.navbar-nav {
margin: 0;
padding: 0;
}
.navbar-expand { .navbar-expand {
@each $breakpoint in map-keys($grid-breakpoints) { @each $breakpoint in map-keys($grid-breakpoints) {
$next: breakpoint-next($breakpoint, $grid-breakpoints); $next: breakpoint-next($breakpoint, $grid-breakpoints);
@@ -146,6 +141,10 @@ Navbar
.nav-item.active { .nav-item.active {
position: relative; position: relative;
.nav-link {
color: var(--#{$prefix}navbar-active-color);
}
&:after { &:after {
content: ""; content: "";
position: absolute; position: absolute;
@@ -276,6 +275,9 @@ Navbar transparent
Navbar nav Navbar nav
*/ */
.navbar-nav { .navbar-nav {
--#{$prefix}nav-link-hover-bg: #{$navbar-nav-link-hover-bg};
margin: 0;
padding: 0;
align-items: stretch; align-items: stretch;
.nav-item { .nav-item {

View File

@@ -53,7 +53,7 @@
justify-content: center; justify-content: center;
text-decoration: none; text-decoration: none;
padding: .25rem; padding: .25rem;
color: var(--#{$prefix}muted); color: var(--#{$prefix}secondary);
font-size: var(--#{$prefix}font-size-h5); font-size: var(--#{$prefix}font-size-h5);
border-radius: var(--#{$prefix}border-radius); border-radius: var(--#{$prefix}border-radius);
line-height: 1; line-height: 1;

View File

@@ -18,7 +18,7 @@
} }
.hero-description { .hero-description {
color: var(--#{$prefix}muted); color: var(--#{$prefix}secondary);
font-size: var(--#{$prefix}font-size-h2); font-size: var(--#{$prefix}font-size-h2);
line-height: 1.5; line-height: 1.5;
margin: 0 auto; margin: 0 auto;

View File

@@ -81,7 +81,7 @@
} }
.section-description { .section-description {
color: var(--#{$prefix}muted); color: var(--#{$prefix}secondary);
font-size: var(--#{$prefix}font-size-h3); font-size: var(--#{$prefix}font-size-h3);
line-height: var(--#{$prefix}line-height-h3); line-height: var(--#{$prefix}line-height-h3);
margin-top: 1rem; margin-top: 1rem;

View File

@@ -51,8 +51,13 @@
.nav-link { .nav-link {
display: flex; display: flex;
@include transition(color $transition-time); @include transition(color $transition-time, background-color $transition-time);
align-items: center; align-items: center;
&:hover,
&:focus {
background-color: var(--#{$prefix}nav-link-hover-bg);
}
} }
.nav-link-toggle { .nav-link-toggle {

View File

@@ -14,15 +14,17 @@
{% endunless %} {% endunless %}
<div class="d-none d-{{ include.breakpoint }}-flex"> <div class="d-none d-{{ include.breakpoint }}-flex">
<a href="?theme=dark" class="nav-link px-0 hide-theme-dark" title="Enable dark mode" data-bs-toggle="tooltip" <div class="nav-item">
data-bs-placement="bottom"> <a href="?theme=dark" class="nav-link px-0 hide-theme-dark" title="Enable dark mode" data-bs-toggle="tooltip"
{% include "ui/icon.html" icon="moon" %} data-bs-placement="bottom">
</a> {% include "ui/icon.html" icon="moon" %}
</a>
<a href="?theme=light" class="nav-link px-0 hide-theme-light" title="Enable light mode" data-bs-toggle="tooltip" <a href="?theme=light" class="nav-link px-0 hide-theme-light" title="Enable light mode" data-bs-toggle="tooltip"
data-bs-placement="bottom"> data-bs-placement="bottom">
{% include "ui/icon.html" icon="sun" %} {% include "ui/icon.html" icon="sun" %}
</a> </a>
</div>
<div class="nav-item dropdown d-none d-md-flex me-3"> <div class="nav-item dropdown d-none d-md-flex me-3">
<a href="#" class="nav-link px-0" data-bs-toggle="dropdown" tabindex="-1" aria-label="Show notifications"> <a href="#" class="nav-link px-0" data-bs-toggle="dropdown" tabindex="-1" aria-label="Show notifications">
@@ -36,7 +38,7 @@
</div> </div>
<div class="nav-item dropdown"> <div class="nav-item dropdown">
<a href="#" class="nav-link d-flex lh-1 text-reset p-0" data-bs-toggle="dropdown" aria-label="Open user menu"> <a href="#" class="nav-link d-flex lh-1 p-0 px-2" data-bs-toggle="dropdown" aria-label="Open user menu">
{% include "ui/avatar.html" person-id=person-id size="sm" %} {% include "ui/avatar.html" person-id=person-id size="sm" %}
{% unless include.hide-username %} {% unless include.hide-username %}