Skip to content
This repository was archived by the owner on Feb 6, 2026. It is now read-only.

Fix: nav bar doesn't turn to light mode in light mode! #8333

Merged
jobelenus merged 1 commit into from
Jan 23, 2026
Merged

Fix: nav bar doesn't turn to light mode in light mode! #8333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions app/web/src/newhotness/nav/NavbarPanelCenter.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
<template v-if="isConnected">
<div v-if="ffStore.SHOW_POLICIES" class="flex flex-row items-end gap-xs p-xs">
<NewButton
tone="flat"
tone="navFlat"
@click="() => router.push(compositionLink)"
class="py-3xs"
:active="onSim"
:label="onHead ? 'Model' : 'Simulation'"
/>
<NewButton
v-if="ffStore.SHOW_AUTHORING_NAV"
tone="flat"
tone="navFlat"
class="py-3xs"
:active="onAuthor"
@click="
Expand All @@ -25,7 +25,7 @@
/>
<NewButton
v-if="onHead"
tone="flat"
tone="navFlat"
class="py-3xs"
:active="onAudit"
@click="
Expand All @@ -39,7 +39,7 @@
/>
<NewButton
v-else
tone="flat"
tone="navFlat"
class="py-3xs"
:active="onReview"
@click="
Expand All @@ -52,7 +52,7 @@
label="Review"
/>
<NewButton
tone="flat"
tone="navFlat"
class="py-3xs"
:active="onPolicy"
@click="
Expand Down
18 changes: 10 additions & 8 deletions lib/vue-lib/src/design-system/general/NewButton.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
'flex flex-row items-center justify-center rounded-sm',
size === '2xs' || size === 'xs' ? 'gap-2xs' : 'gap-xs',
'transition-all whitespace-nowrap leading-none font-medium max-h-fit',
tone === 'toggle' ? 'px-2xs min-h-[28px]' : [
hasLabel ? 'px-xs py-2xs' : 'p-3xs m-3xs',
],
tone === 'toggle'
? 'px-2xs min-h-[28px]'
: [hasLabel ? 'px-xs py-2xs' : 'p-3xs m-3xs'],
tone !== 'empty' && 'border',
computedTextSize,
truncateText && 'min-w-0',
Expand All @@ -44,6 +44,8 @@
'text-neutral-900 bg-100 border-neutral-400 hover:bg-neutral-200',
'text-white bg-neutral-800 border-neutral-600 hover:bg-neutral-700',
),
navFlat:
'text-white bg-neutral-800 border-neutral-600 hover:bg-neutral-700',
toggle: clsx(
'font-mono text-left truncate relative',
themeClasses(
Expand Down Expand Up @@ -76,6 +78,7 @@
{
neutral: themeClasses('bg-neutral-100', 'bg-neutral-600'),
flat: themeClasses('bg-neutral-200', 'bg-neutral-700'),
navFlat: 'bg-neutral-700',
toggle: '',
action: themeClasses('bg-[#2583EC]', 'bg-[#1D5BA0]'),
warning: themeClasses('bg-white', 'bg-[#67452D]'),
Expand Down Expand Up @@ -129,10 +132,7 @@
</slot>
<slot v-else>{{ label }}</slot>
</TruncateWithTooltip>
<span
v-else-if="hasLabel"
:class="labelClasses"
>
<span v-else-if="hasLabel" :class="labelClasses">
<slot v-if="confirmClick && confirmFirstClickAt" name="confirm-click">
|
{{
Expand Down Expand Up @@ -161,6 +161,7 @@
{
neutral: '',
flat: '',
navFlat: '',
toggle: '',
action: '',
warning: '',
Expand Down Expand Up @@ -414,7 +415,7 @@ const labelClasses = computed(() => {
return tw`py-2xs text-[13px] font-normal`;
}

return props.size === '2xs' || props.size === 'xs' ? tw`py-3xs` : tw`py-2xs`;
return props.size === "2xs" || props.size === "xs" ? tw`py-3xs` : tw`py-2xs`;
});

const tooltipObject = computed(() =>
Expand Down Expand Up @@ -442,6 +443,7 @@ export type ButtonSizes = "2xs" | "xs" | "sm" | "md" | "lg" | "xl";
export const BUTTON_TONES = [
"neutral",
"flat", // similar to neutral, but has the same bg as the content its sitting on top of
"navFlat", // flat, but for the nav where we dont have light mode styles
"toggle", // alternative neutral style used for buttons in the same area as ExploreModeTile
"action",
"warning",
Expand Down