Browse Source

Merge pull request #766 from open-webui/styling-fix

fix: styling
Timothy Jaeryang Baek 1 year ago
parent
commit
4c3edd0375

+ 1 - 1
README.md

@@ -8,7 +8,7 @@
 ![GitHub top language](https://img.shields.io/github/languages/top/ollama-webui/ollama-webui)
 ![GitHub top language](https://img.shields.io/github/languages/top/ollama-webui/ollama-webui)
 ![GitHub last commit](https://img.shields.io/github/last-commit/ollama-webui/ollama-webui?color=red)
 ![GitHub last commit](https://img.shields.io/github/last-commit/ollama-webui/ollama-webui?color=red)
 ![Hits](https://hits.seeyoufarm.com/api/count/incr/badge.svg?url=https%3A%2F%2Fgithub.com%2Follama-webui%2Follama-wbui&count_bg=%2379C83D&title_bg=%23555555&icon=&icon_color=%23E7E7E7&title=hits&edge_flat=false)
 ![Hits](https://hits.seeyoufarm.com/api/count/incr/badge.svg?url=https%3A%2F%2Fgithub.com%2Follama-webui%2Follama-wbui&count_bg=%2379C83D&title_bg=%23555555&icon=&icon_color=%23E7E7E7&title=hits&edge_flat=false)
-[![Discord](https://img.shields.io/badge/Discord-Ollama_Web_UI-blue?logo=discord&logoColor=white)](https://discord.gg/5rJgQTnV4s)
+[![Discord](https://img.shields.io/badge/Discord-Open_WebUI-blue?logo=discord&logoColor=white)](https://discord.gg/5rJgQTnV4s)
 [![](https://img.shields.io/static/v1?label=Sponsor&message=%E2%9D%A4&logo=GitHub&color=%23fe8e86)](https://github.com/sponsors/tjbck)
 [![](https://img.shields.io/static/v1?label=Sponsor&message=%E2%9D%A4&logo=GitHub&color=%23fe8e86)](https://github.com/sponsors/tjbck)
 
 
 ChatGPT-Style Web Interface for Ollama 🦙
 ChatGPT-Style Web Interface for Ollama 🦙

+ 1 - 1
src/lib/components/chat/Settings/About.svelte

@@ -40,7 +40,7 @@
 			<a href="https://discord.gg/5rJgQTnV4s" target="_blank">
 			<a href="https://discord.gg/5rJgQTnV4s" target="_blank">
 				<img
 				<img
 					alt="Discord"
 					alt="Discord"
-					src="https://img.shields.io/badge/Discord-Ollama_Web_UI-blue?logo=discord&logoColor=white"
+					src="https://img.shields.io/badge/Discord-Open_WebUI-blue?logo=discord&logoColor=white"
 				/>
 				/>
 			</a>
 			</a>
 
 

+ 2 - 2
src/lib/components/layout/Sidebar.svelte

@@ -88,8 +88,8 @@
 <div
 <div
 	bind:this={navElement}
 	bind:this={navElement}
 	class="h-screen max-h-[100dvh] min-h-screen {show
 	class="h-screen max-h-[100dvh] min-h-screen {show
-		? 'lg:relative'
-		: '-translate-x-[260px] w-[0px]'}  w-[260px] min-w[260px] bg-black text-gray-200 shadow-2xl text-sm transition z-40 fixed top-0 left-0
+		? 'lg:relative w-[260px]'
+		: '-translate-x-[260px] w-[0px]'}  bg-black text-gray-200 shadow-2xl text-sm transition z-40 fixed top-0 left-0
         "
         "
 >
 >
 	<div
 	<div

+ 1 - 1
src/lib/constants.ts

@@ -1,6 +1,6 @@
 import { dev } from '$app/environment';
 import { dev } from '$app/environment';
 
 
-export const WEBUI_NAME = 'Open Web UI';
+export const WEBUI_NAME = 'Open WebUI';
 export const WEBUI_BASE_URL = dev ? `http://${location.hostname}:8080` : ``;
 export const WEBUI_BASE_URL = dev ? `http://${location.hostname}:8080` : ``;
 
 
 export const WEBUI_API_BASE_URL = `${WEBUI_BASE_URL}/api/v1`;
 export const WEBUI_API_BASE_URL = `${WEBUI_BASE_URL}/api/v1`;

+ 125 - 123
src/routes/(app)/admin/+page.svelte

@@ -75,137 +75,139 @@
 <SettingsModal bind:show={showSettingsModal} />
 <SettingsModal bind:show={showSettingsModal} />
 
 
 <div
 <div
-	class=" bg-white dark:bg-gray-900 dark:text-gray-100 min-h-screen w-full flex justify-center font-mona"
+	class="min-h-screen max-h-[100dvh] w-full flex justify-center dark:text-white bg-white dark:bg-gray-900 font-mona"
 >
 >
 	{#if loaded}
 	{#if loaded}
-		<div class="w-full max-w-3xl px-10 md:px-16 min-h-screen flex flex-col">
-			<div class="py-10 w-full">
-				<div class=" flex flex-col justify-center">
-					<div class=" flex justify-between items-center">
-						<div class=" text-2xl font-semibold">Users ({users.length})</div>
-						<div>
-							<button
-								class="flex items-center space-x-1 border border-gray-200 dark:border-gray-600 px-3 py-1 rounded-lg"
-								type="button"
-								on:click={() => {
-									showSettingsModal = !showSettingsModal;
-								}}
-							>
-								<svg
-									xmlns="http://www.w3.org/2000/svg"
-									viewBox="0 0 16 16"
-									fill="currentColor"
-									class="w-4 h-4"
+		<div class="overflow-y-auto w-full flex justify-center">
+			<div class="w-full max-w-3xl px-10 md:px-16 flex flex-col">
+				<div class="py-10 w-full">
+					<div class=" flex flex-col justify-center">
+						<div class=" flex justify-between items-center">
+							<div class=" text-2xl font-semibold">Users ({users.length})</div>
+							<div>
+								<button
+									class="flex items-center space-x-1 border border-gray-200 dark:border-gray-600 px-3 py-1 rounded-lg"
+									type="button"
+									on:click={() => {
+										showSettingsModal = !showSettingsModal;
+									}}
 								>
 								>
-									<path
-										fill-rule="evenodd"
-										d="M6.955 1.45A.5.5 0 0 1 7.452 1h1.096a.5.5 0 0 1 .497.45l.17 1.699c.484.12.94.312 1.356.562l1.321-1.081a.5.5 0 0 1 .67.033l.774.775a.5.5 0 0 1 .034.67l-1.08 1.32c.25.417.44.873.561 1.357l1.699.17a.5.5 0 0 1 .45.497v1.096a.5.5 0 0 1-.45.497l-1.699.17c-.12.484-.312.94-.562 1.356l1.082 1.322a.5.5 0 0 1-.034.67l-.774.774a.5.5 0 0 1-.67.033l-1.322-1.08c-.416.25-.872.44-1.356.561l-.17 1.699a.5.5 0 0 1-.497.45H7.452a.5.5 0 0 1-.497-.45l-.17-1.699a4.973 4.973 0 0 1-1.356-.562L4.108 13.37a.5.5 0 0 1-.67-.033l-.774-.775a.5.5 0 0 1-.034-.67l1.08-1.32a4.971 4.971 0 0 1-.561-1.357l-1.699-.17A.5.5 0 0 1 1 8.548V7.452a.5.5 0 0 1 .45-.497l1.699-.17c.12-.484.312-.94.562-1.356L2.629 4.107a.5.5 0 0 1 .034-.67l.774-.774a.5.5 0 0 1 .67-.033L5.43 3.71a4.97 4.97 0 0 1 1.356-.561l.17-1.699ZM6 8c0 .538.212 1.026.558 1.385l.057.057a2 2 0 0 0 2.828-2.828l-.058-.056A2 2 0 0 0 6 8Z"
-										clip-rule="evenodd"
-									/>
-								</svg>
-
-								<div class=" text-xs">Admin Settings</div>
-							</button>
+									<svg
+										xmlns="http://www.w3.org/2000/svg"
+										viewBox="0 0 16 16"
+										fill="currentColor"
+										class="w-4 h-4"
+									>
+										<path
+											fill-rule="evenodd"
+											d="M6.955 1.45A.5.5 0 0 1 7.452 1h1.096a.5.5 0 0 1 .497.45l.17 1.699c.484.12.94.312 1.356.562l1.321-1.081a.5.5 0 0 1 .67.033l.774.775a.5.5 0 0 1 .034.67l-1.08 1.32c.25.417.44.873.561 1.357l1.699.17a.5.5 0 0 1 .45.497v1.096a.5.5 0 0 1-.45.497l-1.699.17c-.12.484-.312.94-.562 1.356l1.082 1.322a.5.5 0 0 1-.034.67l-.774.774a.5.5 0 0 1-.67.033l-1.322-1.08c-.416.25-.872.44-1.356.561l-.17 1.699a.5.5 0 0 1-.497.45H7.452a.5.5 0 0 1-.497-.45l-.17-1.699a4.973 4.973 0 0 1-1.356-.562L4.108 13.37a.5.5 0 0 1-.67-.033l-.774-.775a.5.5 0 0 1-.034-.67l1.08-1.32a4.971 4.971 0 0 1-.561-1.357l-1.699-.17A.5.5 0 0 1 1 8.548V7.452a.5.5 0 0 1 .45-.497l1.699-.17c.12-.484.312-.94.562-1.356L2.629 4.107a.5.5 0 0 1 .034-.67l.774-.774a.5.5 0 0 1 .67-.033L5.43 3.71a4.97 4.97 0 0 1 1.356-.561l.17-1.699ZM6 8c0 .538.212 1.026.558 1.385l.057.057a2 2 0 0 0 2.828-2.828l-.058-.056A2 2 0 0 0 6 8Z"
+											clip-rule="evenodd"
+										/>
+									</svg>
+
+									<div class=" text-xs">Admin Settings</div>
+								</button>
+							</div>
+						</div>
+						<div class=" text-gray-500 text-xs font-medium mt-1">
+							Click on the user role cell in the table to change a user's role.
 						</div>
 						</div>
-					</div>
-					<div class=" text-gray-500 text-xs font-medium mt-1">
-						Click on the user role cell in the table to change a user's role.
-					</div>
 
 
-					<hr class=" my-3 dark:border-gray-600" />
-
-					<div class="scrollbar-hidden relative overflow-x-auto whitespace-nowrap">
-						<table class="w-full text-sm text-left text-gray-500 dark:text-gray-400">
-							<thead
-								class="text-xs text-gray-700 uppercase bg-gray-50 dark:bg-gray-700 dark:text-gray-400"
-							>
-								<tr>
-									<th scope="col" class="px-6 py-3"> Name </th>
-									<th scope="col" class="px-6 py-3"> Email </th>
-									<th scope="col" class="px-6 py-3"> Role </th>
-									<th scope="col" class="px-6 py-3"> Action </th>
-								</tr>
-							</thead>
-							<tbody>
-								{#each users as user}
-									<tr class="bg-white border-b dark:bg-gray-900 dark:border-gray-700">
-										<th
-											scope="row"
-											class="px-6 py-4 font-medium text-gray-900 whitespace-nowrap dark:text-white w-fit"
-										>
-											<div class="flex flex-row">
-												<img
-													class=" rounded-full max-w-[30px] max-h-[30px] object-cover mr-4"
-													src={user.profile_image_url}
-													alt="user"
-												/>
-
-												<div class=" font-semibold self-center">{user.name}</div>
-											</div>
-										</th>
-										<td class="px-6 py-4"> {user.email} </td>
-										<td class="px-6 py-4">
-											<button
-												class="  dark:text-white underline"
-												on:click={() => {
-													if (user.role === 'user') {
-														updateRoleHandler(user.id, 'admin');
-													} else if (user.role === 'pending') {
-														updateRoleHandler(user.id, 'user');
-													} else {
-														updateRoleHandler(user.id, 'pending');
-													}
-												}}>{user.role}</button
-											>
-										</td>
-										<td class="px-6 py-4 space-x-1 text-center flex justify-center">
-											<button
-												class="self-center w-fit text-sm p-1.5 border dark:border-gray-600 rounded-xl flex"
-												on:click={async () => {
-													showEditUserModal = !showEditUserModal;
-													selectedUser = user;
-												}}
+						<hr class=" my-3 dark:border-gray-600" />
+
+						<div class="scrollbar-hidden relative overflow-x-auto whitespace-nowrap">
+							<table class="w-full text-sm text-left text-gray-500 dark:text-gray-400">
+								<thead
+									class="text-xs text-gray-700 uppercase bg-gray-50 dark:bg-gray-700 dark:text-gray-400"
+								>
+									<tr>
+										<th scope="col" class="px-6 py-3"> Name </th>
+										<th scope="col" class="px-6 py-3"> Email </th>
+										<th scope="col" class="px-6 py-3"> Role </th>
+										<th scope="col" class="px-6 py-3"> Action </th>
+									</tr>
+								</thead>
+								<tbody>
+									{#each users as user}
+										<tr class="bg-white border-b dark:bg-gray-900 dark:border-gray-700">
+											<th
+												scope="row"
+												class="px-6 py-4 font-medium text-gray-900 whitespace-nowrap dark:text-white w-fit"
 											>
 											>
-												<svg
-													xmlns="http://www.w3.org/2000/svg"
-													viewBox="0 0 16 16"
-													fill="currentColor"
-													class="w-4 h-4"
-												>
-													<path
-														fill-rule="evenodd"
-														d="M11.013 2.513a1.75 1.75 0 0 1 2.475 2.474L6.226 12.25a2.751 2.751 0 0 1-.892.596l-2.047.848a.75.75 0 0 1-.98-.98l.848-2.047a2.75 2.75 0 0 1 .596-.892l7.262-7.261Z"
-														clip-rule="evenodd"
+												<div class="flex flex-row">
+													<img
+														class=" rounded-full max-w-[30px] max-h-[30px] object-cover mr-4"
+														src={user.profile_image_url}
+														alt="user"
 													/>
 													/>
-												</svg>
-											</button>
-
-											<button
-												class="self-center w-fit text-sm p-1.5 border dark:border-gray-600 rounded-xl flex"
-												on:click={async () => {
-													deleteUserHandler(user.id);
-												}}
-											>
-												<svg
-													xmlns="http://www.w3.org/2000/svg"
-													fill="none"
-													viewBox="0 0 24 24"
-													stroke-width="1.5"
-													stroke="currentColor"
-													class="w-4 h-4"
+
+													<div class=" font-semibold self-center">{user.name}</div>
+												</div>
+											</th>
+											<td class="px-6 py-4"> {user.email} </td>
+											<td class="px-6 py-4">
+												<button
+													class="  dark:text-white underline"
+													on:click={() => {
+														if (user.role === 'user') {
+															updateRoleHandler(user.id, 'admin');
+														} else if (user.role === 'pending') {
+															updateRoleHandler(user.id, 'user');
+														} else {
+															updateRoleHandler(user.id, 'pending');
+														}
+													}}>{user.role}</button
 												>
 												>
-													<path
-														stroke-linecap="round"
-														stroke-linejoin="round"
-														d="M14.74 9l-.346 9m-4.788 0L9.26 9m9.968-3.21c.342.052.682.107 1.022.166m-1.022-.165L18.16 19.673a2.25 2.25 0 01-2.244 2.077H8.084a2.25 2.25 0 01-2.244-2.077L4.772 5.79m14.456 0a48.108 48.108 0 00-3.478-.397m-12 .562c.34-.059.68-.114 1.022-.165m0 0a48.11 48.11 0 013.478-.397m7.5 0v-.916c0-1.18-.91-2.164-2.09-2.201a51.964 51.964 0 00-3.32 0c-1.18.037-2.09 1.022-2.09 2.201v.916m7.5 0a48.667 48.667 0 00-7.5 0"
-													/>
-												</svg>
-											</button>
-										</td>
-									</tr>
-								{/each}
-							</tbody>
-						</table>
+											</td>
+											<td class="px-6 py-4 space-x-1 text-center flex justify-center">
+												<button
+													class="self-center w-fit text-sm p-1.5 border dark:border-gray-600 rounded-xl flex"
+													on:click={async () => {
+														showEditUserModal = !showEditUserModal;
+														selectedUser = user;
+													}}
+												>
+													<svg
+														xmlns="http://www.w3.org/2000/svg"
+														viewBox="0 0 16 16"
+														fill="currentColor"
+														class="w-4 h-4"
+													>
+														<path
+															fill-rule="evenodd"
+															d="M11.013 2.513a1.75 1.75 0 0 1 2.475 2.474L6.226 12.25a2.751 2.751 0 0 1-.892.596l-2.047.848a.75.75 0 0 1-.98-.98l.848-2.047a2.75 2.75 0 0 1 .596-.892l7.262-7.261Z"
+															clip-rule="evenodd"
+														/>
+													</svg>
+												</button>
+
+												<button
+													class="self-center w-fit text-sm p-1.5 border dark:border-gray-600 rounded-xl flex"
+													on:click={async () => {
+														deleteUserHandler(user.id);
+													}}
+												>
+													<svg
+														xmlns="http://www.w3.org/2000/svg"
+														fill="none"
+														viewBox="0 0 24 24"
+														stroke-width="1.5"
+														stroke="currentColor"
+														class="w-4 h-4"
+													>
+														<path
+															stroke-linecap="round"
+															stroke-linejoin="round"
+															d="M14.74 9l-.346 9m-4.788 0L9.26 9m9.968-3.21c.342.052.682.107 1.022.166m-1.022-.165L18.16 19.673a2.25 2.25 0 01-2.244 2.077H8.084a2.25 2.25 0 01-2.244-2.077L4.772 5.79m14.456 0a48.108 48.108 0 00-3.478-.397m-12 .562c.34-.059.68-.114 1.022-.165m0 0a48.11 48.11 0 013.478-.397m7.5 0v-.916c0-1.18-.91-2.164-2.09-2.201a51.964 51.964 0 00-3.32 0c-1.18.037-2.09 1.022-2.09 2.201v.916m7.5 0a48.667 48.667 0 00-7.5 0"
+														/>
+													</svg>
+												</button>
+											</td>
+										</tr>
+									{/each}
+								</tbody>
+							</table>
+						</div>
 					</div>
 					</div>
 				</div>
 				</div>
 			</div>
 			</div>

+ 2 - 2
src/routes/(app)/documents/+page.svelte

@@ -179,8 +179,8 @@
 	}}
 	}}
 />
 />
 
 
-<div class="min-h-screen w-full flex justify-center dark:text-white">
-	<div class=" py-2.5 flex flex-col justify-between w-full">
+<div class="min-h-screen max-h-[100dvh] w-full flex justify-center dark:text-white">
+	<div class=" py-2.5 flex flex-col justify-between w-full overflow-y-auto">
 		<div class="max-w-2xl mx-auto w-full px-3 md:px-0 my-10">
 		<div class="max-w-2xl mx-auto w-full px-3 md:px-0 my-10">
 			<div class="mb-6 flex justify-between items-center">
 			<div class="mb-6 flex justify-between items-center">
 				<div class=" text-2xl font-semibold self-center">My Documents</div>
 				<div class=" text-2xl font-semibold self-center">My Documents</div>

+ 2 - 2
src/routes/(app)/modelfiles/+page.svelte

@@ -68,8 +68,8 @@
 	});
 	});
 </script>
 </script>
 
 
-<div class="min-h-screen w-full flex justify-center dark:text-white">
-	<div class=" py-2.5 flex flex-col justify-between w-full">
+<div class="min-h-screen max-h-[100dvh] w-full flex justify-center dark:text-white">
+	<div class=" py-2.5 flex flex-col justify-between w-full overflow-y-auto">
 		<div class="max-w-2xl mx-auto w-full px-3 md:px-0 my-10">
 		<div class="max-w-2xl mx-auto w-full px-3 md:px-0 my-10">
 			<div class=" text-2xl font-semibold mb-6">My Modelfiles</div>
 			<div class=" text-2xl font-semibold mb-6">My Modelfiles</div>
 
 

+ 2 - 2
src/routes/(app)/modelfiles/create/+page.svelte

@@ -256,8 +256,8 @@ SYSTEM """${system}"""`.replace(/^\s*\n/gm, '');
 	});
 	});
 </script>
 </script>
 
 
-<div class="min-h-screen w-full flex justify-center dark:text-white">
-	<div class=" py-2.5 flex flex-col justify-between w-full">
+<div class="min-h-screen max-h-[100dvh] w-full flex justify-center dark:text-white">
+	<div class=" py-2.5 flex flex-col justify-between w-full overflow-y-auto">
 		<div class="max-w-2xl mx-auto w-full px-3 md:px-0 my-10">
 		<div class="max-w-2xl mx-auto w-full px-3 md:px-0 my-10">
 			<input
 			<input
 				bind:this={filesInputElement}
 				bind:this={filesInputElement}

+ 2 - 2
src/routes/(app)/modelfiles/edit/+page.svelte

@@ -180,8 +180,8 @@
 	};
 	};
 </script>
 </script>
 
 
-<div class="min-h-screen w-full flex justify-center dark:text-white">
-	<div class=" py-2.5 flex flex-col justify-between w-full">
+<div class="min-h-screen max-h-[100dvh] w-full flex justify-center dark:text-white">
+	<div class=" py-2.5 flex flex-col justify-between w-full overflow-y-auto">
 		<div class="max-w-2xl mx-auto w-full px-3 md:px-0 my-10">
 		<div class="max-w-2xl mx-auto w-full px-3 md:px-0 my-10">
 			<input
 			<input
 				bind:this={filesInputElement}
 				bind:this={filesInputElement}

+ 2 - 2
src/routes/(app)/prompts/+page.svelte

@@ -35,8 +35,8 @@
 	};
 	};
 </script>
 </script>
 
 
-<div class="min-h-screen w-full flex justify-center dark:text-white">
-	<div class=" py-2.5 flex flex-col justify-between w-full">
+<div class="min-h-screen max-h-[100dvh] w-full flex justify-center dark:text-white">
+	<div class=" py-2.5 flex flex-col justify-between w-full overflow-y-auto">
 		<div class="max-w-2xl mx-auto w-full px-3 md:px-0 my-10">
 		<div class="max-w-2xl mx-auto w-full px-3 md:px-0 my-10">
 			<div class="mb-6 flex justify-between items-center">
 			<div class="mb-6 flex justify-between items-center">
 				<div class=" text-2xl font-semibold self-center">My Prompts</div>
 				<div class=" text-2xl font-semibold self-center">My Prompts</div>

+ 2 - 2
src/routes/(app)/prompts/create/+page.svelte

@@ -77,8 +77,8 @@
 	});
 	});
 </script>
 </script>
 
 
-<div class="min-h-screen w-full flex justify-center dark:text-white">
-	<div class=" py-2.5 flex flex-col justify-between w-full">
+<div class="min-h-screen max-h-[100dvh] w-full flex justify-center dark:text-white">
+	<div class=" py-2.5 flex flex-col justify-between w-full overflow-y-auto">
 		<div class="max-w-2xl mx-auto w-full px-3 md:px-0 my-10">
 		<div class="max-w-2xl mx-auto w-full px-3 md:px-0 my-10">
 			<div class=" text-2xl font-semibold mb-6">My Prompts</div>
 			<div class=" text-2xl font-semibold mb-6">My Prompts</div>
 
 

+ 2 - 2
src/routes/(app)/prompts/edit/+page.svelte

@@ -71,8 +71,8 @@
 	});
 	});
 </script>
 </script>
 
 
-<div class="min-h-screen w-full flex justify-center dark:text-white">
-	<div class=" py-2.5 flex flex-col justify-between w-full">
+<div class="min-h-screen max-h-[100dvh] w-full flex justify-center dark:text-white">
+	<div class=" py-2.5 flex flex-col justify-between w-full overflow-y-auto">
 		<div class="max-w-2xl mx-auto w-full px-3 md:px-0 my-10">
 		<div class="max-w-2xl mx-auto w-full px-3 md:px-0 my-10">
 			<div class=" text-2xl font-semibold mb-6">My Prompts</div>
 			<div class=" text-2xl font-semibold mb-6">My Prompts</div>