Skip to content
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.

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

Horizontal scrollbar #3195

Merged
merged 2 commits into from
Nov 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion web/src/app/chat/ChatPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2007,7 +2007,7 @@ export function ChatPage({
{...getRootProps()}
>
<div
className={`w-full h-full flex flex-col overflow-y-auto include-scrollbar overflow-x-hidden relative`}
className={`w-full h-full flex flex-col default-scrollbar overflow-y-auto overflow-x-hidden relative`}
ref={scrollableDivRef}
>
{/* ChatBanner is a custom banner that displays a admin-specified message at
Expand Down
2 changes: 1 addition & 1 deletion web/src/app/chat/modal/configuration/AssistantsTab.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ export function AssistantsTab({
items={assistants.map((a) => a.id.toString())}
strategy={verticalListSortingStrategy}
>
<div className="px-4 pb-2 max-h-[500px] include-scrollbar overflow-y-scroll my-3 grid grid-cols-1 gap-4">
<div className="px-4 pb-2 max-h-[500px] default-scrollbar overflow-y-scroll overflow-x-hidden my-3 grid grid-cols-1 gap-4">
{assistants.map((assistant) => (
<DraggableAssistantCard
key={assistant.id.toString()}
Expand Down
11 changes: 6 additions & 5 deletions web/src/app/globals.css
Original file line number Diff line number Diff line change
Expand Up @@ -260,28 +260,29 @@
}
}

.include-scrollbar::-webkit-scrollbar {
.default-scrollbar::-webkit-scrollbar {
width: 6px;
}

.include-scrollbar::-webkit-scrollbar-track {
.default-scrollbar::-webkit-scrollbar-track {
background: #f1f1f1;
}

.include-scrollbar::-webkit-scrollbar-thumb {
.default-scrollbar::-webkit-scrollbar-thumb {
background: #888;
border-radius: 4px;
}

.include-scrollbar::-webkit-scrollbar-thumb:hover {
.default-scrollbar::-webkit-scrollbar-thumb:hover {
background: #555;
}

.include-scrollbar {
.default-scrollbar {
scrollbar-width: thin;
scrollbar-color: #888 transparent;
overflow: overlay;
overflow-y: scroll;
overflow-x: hidden;
}

.inputscroll::-webkit-scrollbar-track {
Expand Down
6 changes: 4 additions & 2 deletions web/src/components/llm/LLMList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,10 @@ export const LlmList: React.FC<LlmListProps> = ({
return (
<div
className={`${
scrollable ? "max-h-[200px] include-scrollbar" : "max-h-[300px]"
} bg-background-175 flex flex-col gap-y-1 overflow-y-scroll`}
scrollable
? "max-h-[200px] default-scrollbar overflow-x-hidden"
: "max-h-[300px]"
} bg-background-175 flex flex-col gap-y-1 overflow-y-scroll`}
>
{userDefault && (
<button
Expand Down
2 changes: 1 addition & 1 deletion web/src/components/modals/ExceptionTraceModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export default function ExceptionTraceModal({
title="Full Exception Trace"
onOutsideClick={onOutsideClick}
>
<div className="overflow-y-auto include-scrollbar pr-3 h-full mb-6">
<div className="overflow-y-auto default-scrollbar overflow-x-hidden pr-3 h-full mb-6">
<div className="mb-6">
{!copyClicked ? (
<div
Expand Down
2 changes: 1 addition & 1 deletion web/src/components/search/SearchSection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -698,7 +698,7 @@ export const SearchSection = ({
</div>
</div>

<div className="absolute include-scrollbar h-screen overflow-y-auto left-0 w-full top-0">
<div className="absolute default-scrollbar h-screen overflow-y-auto overflow-x-hidden left-0 w-full top-0">
<FunctionalHeader
sidebarToggled={toggledSidebar}
reset={() => setQuery("")}
Expand Down
Loading