fix text colors and migration

gorilla-devs · Nov 28, 2024 · b8d7f96 · b8d7f96
1 parent 731ca41
commit b8d7f96
Show file tree

Hide file tree

Showing 60 changed files with 146 additions and 148 deletions.
diff --git a/apps/desktop/packages/mainWindow/src/components/Browser/RowContainer.tsx b/apps/desktop/packages/mainWindow/src/components/Browser/RowContainer.tsx
@@ -98,7 +98,7 @@ const RowContainer = (props: Props & AdditionalProps) => {
               onClose={() => setIsHoveringInfoCard(false)}
               content={() => (
                 <div
-                  class="bg-darkSlate-900 rounded-lg shadow-md p-4 text-darkSlate-100 border-darkSlate-700 border-solid border-1 shadow-darkSlate-90 w-110"
+                  class="bg-darkSlate-900 rounded-lg shadow-md p-4 text-lightSlate-700 border-darkSlate-700 border-solid border-1 shadow-darkSlate-90 w-110"
                   onClick={(e) => e.stopPropagation()}
                 >
                   <div class="text-lightSlate-50 font-bold mb-4 text-xl">
@@ -163,7 +163,7 @@ const RowContainer = (props: Props & AdditionalProps) => {
               color="bg-darkSlate-900"
             >
               <div
-                class="duration-100 ease-in-out cursor-pointer hover:text-lightSlate-50 text-2xl text-darkSlate-500 i-ri:information-fill transition-color"
+                class="duration-100 ease-in-out cursor-pointer hover:text-lightSlate-50 text-2xl text-lightSlate-700 i-ri:information-fill transition-color"
                 classList={{
                   "text-lightSlate-50": isHoveringInfoCard()
                 }}

diff --git a/apps/desktop/packages/mainWindow/src/components/Card/index.tsx b/apps/desktop/packages/mainWindow/src/components/Card/index.tsx
@@ -50,7 +50,7 @@ const Card = (props: Props) => {
         <p class="m-0 text-lightSlate-50 font-bold text-xl whitespace-nowrap">
           {mergedProps.text}
         </p>
-        <h5 class="m-0 text-darkSlate-50 font-medium uppercase">
+        <h5 class="m-0 text-lightSlate-700 font-medium uppercase">
           {mergedProps.title}
         </h5>
       </div>

diff --git a/apps/desktop/packages/mainWindow/src/components/CodeInput/index.tsx b/apps/desktop/packages/mainWindow/src/components/CodeInput/index.tsx
@@ -62,7 +62,7 @@ export const DeviceCode = (props: Props) => {
         class="text-2xl font-normal"
         classList={{
           "text-lightSlate-50": !props.expired,
-          "text-darkSlate-50": props.expired
+          "text-lightSlate-700": props.expired
         }}
       >
         {props.value}
@@ -75,7 +75,7 @@ export const DeviceCode = (props: Props) => {
           "i-ri:refresh-line": props.expired,
           "animate-spin": refreshing(),
           "text-lightSlate-50": props.expired,
-          "text-darkSlate-50": !props.expired
+          "text-lightSlate-700": !props.expired
         }}
         onClick={async () => {
           if (props.expired) {

diff --git a/apps/desktop/packages/mainWindow/src/components/ContentWrapper.tsx b/apps/desktop/packages/mainWindow/src/components/ContentWrapper.tsx
@@ -10,11 +10,9 @@ const ContentWrapper = (props: Props) => {
         classList={{
           "px-6": !props.zeroPadding
         }}
-        style={
-          {
-            // "scrollbar-gutter": "stable"
-          }
-        }
+        style={{
+          "scrollbar-gutter": "stable"
+        }}
       >
         {props.children}
       </div>

diff --git a/apps/desktop/packages/mainWindow/src/components/ExploreVersionsNavbar/index.tsx b/apps/desktop/packages/mainWindow/src/components/ExploreVersionsNavbar/index.tsx
@@ -143,7 +143,7 @@ const ExploreVersionsNavbar = (props: Props) => {
             />
             <div class="flex flex-col justify-between">
               <div>{instanceDetails.data?.name}</div>
-              <div class="flex text-darkSlate-50 gap-2">
+              <div class="flex text-lightSlate-700 gap-2">
                 <Checkbox
                   checked={overrideEnabled()}
                   onChange={setOverrideEnabled}
@@ -156,7 +156,7 @@ const ExploreVersionsNavbar = (props: Props) => {
         <Match
           when={props.type === "mod" && (!instanceId || isNaN(instanceId()))}
         >
-          <div class="flex items-center text-darkSlate-100">
+          <div class="flex items-center text-lightSlate-700">
             <Trans key="rowcontainer.no_instance_selected" />
           </div>
         </Match>

diff --git a/apps/desktop/packages/mainWindow/src/components/Instance/Tile.tsx b/apps/desktop/packages/mainWindow/src/components/Instance/Tile.tsx
@@ -267,7 +267,7 @@ const Tile = (props: Props) => {
                         <div
                           class="w-6 h-6"
                           classList={{
-                            "text-darkSlate-300 hover:text-lightSlate-100 duration-100 ease-in-out i-ri:file-copy-2-fill":
+                            "text-lightSlate-700 hover:text-lightSlate-100 duration-100 ease-in-out i-ri:file-copy-2-fill":
                               !copiedError(),
                             "text-green-400 i-ri:checkbox-circle-fill":
                               copiedError()

diff --git a/apps/desktop/packages/mainWindow/src/components/JavaPathAutoComplete.tsx b/apps/desktop/packages/mainWindow/src/components/JavaPathAutoComplete.tsx
@@ -134,7 +134,7 @@ const JavaPathAutoComplete = (props: Props) => {
         icon={
           <Switch>
             <Match when={createCustomJavaVersionMutation.isPending}>
-              <div class="flex i-ri:loader-4-line animate-spin text-darkSlate-50" />
+              <div class="flex i-ri:loader-4-line animate-spin text-lightSlate-700" />
             </Match>
             <Match when={javaComponent()}>
               <Switch>
@@ -147,7 +147,7 @@ const JavaPathAutoComplete = (props: Props) => {
               </Switch>
             </Match>
             <Match when={shouldSuggestCreation()}>
-              <div class="flex i-ri:add-fill text-darkSlate-50" />
+              <div class="flex i-ri:add-fill text-lightSlate-700" />
             </Match>
           </Switch>
         }

diff --git a/apps/desktop/packages/mainWindow/src/components/ModRow/index.tsx b/apps/desktop/packages/mainWindow/src/components/ModRow/index.tsx
@@ -178,22 +178,22 @@ const ModRow = (props: ModRowProps) => {
           />
         </div>
         <div class="flex gap-4 items-center">
-          <div class="flex items-center gap-2 text-darkSlate-100">
-            <i class="text-darkSlate-100 i-ri:time-fill" />
+          <div class="flex items-center gap-2 text-lightSlate-700">
+            <i class="text-lightSlate-700 i-ri:time-fill" />
             <div class="whitespace-nowrap text-sm">
               {formatDistanceToNowStrict(
                 new Date(getDataCreation(props)).getTime()
               )}
             </div>
           </div>
-          <div class="flex gap-2 items-center text-darkSlate-100">
-            <i class="text-darkSlate-100 i-ri:download-fill" />
+          <div class="flex gap-2 items-center text-lightSlate-700">
+            <i class="text-lightSlate-700 i-ri:download-fill" />
             <div class="text-sm whitespace-nowrap">
               {formatDownloadCount(getDownloads(props))}
             </div>
           </div>
-          <div class="flex gap-2 items-center text-darkSlate-100">
-            <i class="text-darkSlate-100 i-ri:user-fill" />
+          <div class="flex gap-2 items-center text-lightSlate-700">
+            <i class="text-lightSlate-700 i-ri:user-fill" />
             <Authors modProps={props} isRowSmall={isRowSmall} />
           </div>
         </div>
@@ -219,7 +219,7 @@ const ModRow = (props: ModRowProps) => {
           <div class="flex flex-col gap-2 w-full z-10 bg-repeat-none">
             <Title />
             <div class="flex justify-between w-full">
-              <p class="text-sm overflow-hidden text-ellipsis m-0 text-darkSlate-50 max-w-full max-h-15">
+              <p class="text-sm overflow-hidden text-ellipsis m-0 text-lightSlate-700 max-w-full max-h-15">
                 <Switch>
                   <Match when={isRowSmall()}>
                     {truncateText(getSummary(props), 60)}

diff --git a/apps/desktop/packages/mainWindow/src/components/OverviewPopover/index.tsx b/apps/desktop/packages/mainWindow/src/components/OverviewPopover/index.tsx
@@ -83,7 +83,7 @@ const OverviewPopover = (props: {
         />
       </Show>
       <div class="px-4 z-30">
-        <p class="m-0 text-sm text-darkSlate-50 overflow-hidden text-ellipsis">
+        <p class="m-0 text-sm text-lightSlate-700 overflow-hidden text-ellipsis">
           {getSummary(props.data)}
         </p>
         <div class="flex gap-2 scrollbar-hide mt-4">
@@ -119,7 +119,7 @@ const OverviewPopover = (props: {
           </For>
         </div>
         <div class="flex flex-col gap-2 items-start mt-4">
-          <div class="flex gap-2 items-start text-darkSlate-100">
+          <div class="flex gap-2 items-start text-lightSlate-700">
             <span class="flex gap-2 items-center">
               <div class="text-lightSlate-100 w-4 h-4 i-ri:user-fill" />
               <p class="m-0 text-lightSlate-100 text-sm">
@@ -128,7 +128,7 @@ const OverviewPopover = (props: {
             </span>
             <Authors data={props.data} />
           </div>
-          <div class="flex gap-2 items-center text-darkSlate-100">
+          <div class="flex gap-2 items-center text-lightSlate-700">
             <div class="text-lightSlate-100 i-ri:time-fill" />
             <p class="m-0 text-lightSlate-100 text-sm">
               <Trans key="modpack.last_updated" />
@@ -144,7 +144,7 @@ const OverviewPopover = (props: {
               />
             </div>
           </div>
-          <div class="flex gap-2 items-center text-darkSlate-100">
+          <div class="flex gap-2 items-center text-lightSlate-700">
             <div class="text-lightSlate-100 i-ri:download-fill" />
             <p class="m-0 text-lightSlate-100 text-sm">
               <Trans key="modpack.total_download" />
@@ -153,7 +153,7 @@ const OverviewPopover = (props: {
               {formatDownloadCount(getDownloads(props.data))}
             </div>
           </div>
-          <div class="flex gap-2 items-center text-darkSlate-100">
+          <div class="flex gap-2 items-center text-lightSlate-700">
             <div class="text-lightSlate-100 i-ri:gamepad-fill" />
             <p class="m-0 text-lightSlate-100 text-sm">
               <Trans key="modpack.mcVersion" />

diff --git a/apps/desktop/packages/mainWindow/src/components/Sidebar/library.tsx b/apps/desktop/packages/mainWindow/src/components/Sidebar/library.tsx
@@ -101,7 +101,7 @@ const Sidebar = () => {
                   inputRef?.focus();
                 }}
               >
-                <div class="duration-100 ease-in-out transition text-darkSlate-500 i-ri:search-line group-hover:text-darkSlate-50" />
+                <div class="duration-100 ease-in-out transition text-lightSlate-700 i-ri:search-line group-hover:text-lightSlate-700" />
               </div>
             }
           >
@@ -212,7 +212,7 @@ const Sidebar = () => {
                 }}
               />
               <Show when={isSidebarOpened()}>
-                <p class="text-darkSlate-50 text-center text-xs max-w-50">
+                <p class="text-lightSlate-700 text-center text-xs max-w-50">
                   <Trans key="instance.no_instances_text" />
                 </p>
               </Show>

diff --git a/apps/desktop/packages/mainWindow/src/components/Sidebar/wrapper.tsx b/apps/desktop/packages/mainWindow/src/components/Sidebar/wrapper.tsx
@@ -50,10 +50,10 @@ const SiderbarWrapper = (props: Props) => {
           <Show
             when={!isSidebarOpened()}
             fallback={
-              <span class="text-darkSlate-500 text-3xl i-ri:arrow-left-s-line" />
+              <span class="text-lightSlate-700 text-3xl i-ri:arrow-left-s-line" />
             }
           >
-            <span class="text-darkSlate-500 text-3xl i-ri:arrow-right-s-line" />
+            <span class="text-lightSlate-700 text-3xl i-ri:arrow-right-s-line" />
           </Show>
         </div>
       </Show>

diff --git a/...desktop/packages/mainWindow/src/managers/ModalsManager/modals/InstanceCreation/Custom.tsx b/...desktop/packages/mainWindow/src/managers/ModalsManager/modals/InstanceCreation/Custom.tsx
@@ -640,7 +640,7 @@ const Custom = (props: Pick<ModalProps, "data">) => {
                     <div
                       class="flex justify-between w-full"
                       classList={{
-                        "text-darkSlate-500": Boolean(
+                        "text-lightSlate-700": Boolean(
                           !v.hasModloader && loader()
                         )
                       }}
@@ -729,7 +729,7 @@ const Custom = (props: Pick<ModalProps, "data">) => {
             <For each={modloaders}>
               {(modloader) => (
                 <div
-                  class="px-3 py-2 bg-darkSlate-800 rounded-lg border-box text-darkSlate-50 hover:text-lightSlate-50"
+                  class="px-3 py-2 bg-darkSlate-800 rounded-lg border-box text-lightSlate-700 hover:text-lightSlate-50"
                   classList={{
                     "hover:outline-darkSlate-600 outline-none":
                       loader() !== modloader.key,

diff --git a/apps/desktop/packages/mainWindow/src/managers/ModalsManager/modals/Java/AddCustomJava.tsx b/apps/desktop/packages/mainWindow/src/managers/ModalsManager/modals/Java/AddCustomJava.tsx
@@ -32,7 +32,7 @@ const AddCustomJava = (props: ModalProps) => {
               icon={
                 <Switch>
                   <Match when={validateJavaPath.isPending}>
-                    <div class="flex i-ri:loader-4-line animate-spin text-darkSlate-50" />
+                    <div class="flex i-ri:loader-4-line animate-spin text-lightSlate-700" />
                   </Match>
                   <Match when={value()}>
                     <Switch>

diff --git a/...sktop/packages/mainWindow/src/managers/ModalsManager/modals/Java/JavaSetup/manualStep.tsx b/...sktop/packages/mainWindow/src/managers/ModalsManager/modals/Java/JavaSetup/manualStep.tsx
@@ -8,8 +8,8 @@ const ManualStep = (props: StepsProps) => {
       <div class="flex flex-col justify-between w-full h-full">
         <div class="flex flex-col justify-center items-center h-13 py-4 border-dashed border-2 border-primary-500">
           <div class="flex flex-col justify-center items-center gap-2">
-            <div class="text-darkSlate-500 text-xl w-6 i-ri:folder-open-fill" />
-            <p class="m-0 text-darkSlate-500">
+            <div class="text-lightSlate-700 text-xl w-6 i-ri:folder-open-fill" />
+            <p class="m-0 text-lightSlate-700">
               <Trans
                 key="java.select_java_zip"
                 options={{
@@ -20,7 +20,7 @@ const ManualStep = (props: StepsProps) => {
             </p>
           </div>
         </div>
-        <p class="text-darkSlate-500 text-center">
+        <p class="text-lightSlate-700 text-center">
           <Trans
             key="java.select_required_java_text"
             options={{

diff --git a/apps/desktop/packages/mainWindow/src/managers/ModalsManager/modals/ModDetails/index.tsx b/apps/desktop/packages/mainWindow/src/managers/ModalsManager/modals/ModDetails/index.tsx
@@ -211,7 +211,7 @@ const ModDetails = (props: ModalProps) => {
                           <h1 class="m-0 h-9">{getName(modDetails())}</h1>
                         </div>
                         <div class="flex flex-col lg:flex-row justify-between cursor-default">
-                          <div class="flex flex-col lg:flex-row text-darkSlate-50 gap-1 items-start lg:items-center lg:gap-0">
+                          <div class="flex flex-col lg:flex-row text-lightSlate-700 gap-1 items-start lg:items-center lg:gap-0">
                             <div class="p-0 lg:pr-4 border-0 lg:border-r-2 border-darkSlate-500">
                               {getLatestVersion(modDetails())}
                             </div>

diff --git a/apps/desktop/packages/mainWindow/src/managers/ModalsManager/modals/OnBoarding/FirstStep.tsx b/apps/desktop/packages/mainWindow/src/managers/ModalsManager/modals/OnBoarding/FirstStep.tsx
@@ -24,7 +24,7 @@ const FirstStep = (props: Props) => {
         <h1 class="text-center text-lg m-0 font-bold mt-10">
           <Trans key="onboarding.welcome_gdlauncher_title" />
         </h1>
-        <pre class="text-darkSlate-100 text-left text-xs max-w-140 whitespace-pre-line lg:text-base leading-5">
+        <pre class="text-lightSlate-700 text-left text-xs max-w-140 whitespace-pre-line lg:text-base leading-5">
           <Trans
             key="onboarding.welcome_gdlauncher_text"
             options={{

diff --git a/...desktop/packages/mainWindow/src/managers/ModalsManager/modals/OnBoarding/SingleEntity.tsx b/...desktop/packages/mainWindow/src/managers/ModalsManager/modals/OnBoarding/SingleEntity.tsx
@@ -177,7 +177,7 @@ const SingleEntity = (props: {
             <div class="flex gap-2">
               <Show when={entityDefaultPath.data}>
                 <Tooltip content={<Trans key="tooltip.reset" />}>
-                  <div class="flex items-center justify-center p-2 bg-darkSlate-800 rounded-lg text-darkSlate-50 hover:text-lightSlate-50">
+                  <div class="flex items-center justify-center p-2 bg-darkSlate-800 rounded-lg text-lightSlate-700 hover:text-lightSlate-50">
                     <div
                       onClick={async () => {
                         setPath(entityDefaultPath.data!);
@@ -189,7 +189,7 @@ const SingleEntity = (props: {
               </Show>
               <Show when={props.entity.selection_type === "directory"}>
                 <Tooltip content={<Trans key="instance.select_path" />}>
-                  <div class="flex items-center justify-center p-2 bg-darkSlate-800 rounded-lg text-darkSlate-50 hover:text-lightSlate-50">
+                  <div class="flex items-center justify-center p-2 bg-darkSlate-800 rounded-lg text-lightSlate-700 hover:text-lightSlate-50">
                     <div
                       onClick={async () => {
                         const result = await window.openFileDialog({
@@ -211,7 +211,7 @@ const SingleEntity = (props: {
               </Show>
               <Show when={props.entity.selection_type === "file"}>
                 <Tooltip content={<Trans key="instance.select_zip" />}>
-                  <div class="flex items-center justify-center p-2 bg-darkSlate-800 rounded-lg text-darkSlate-50 hover:text-lightSlate-50">
+                  <div class="flex items-center justify-center p-2 bg-darkSlate-800 rounded-lg text-lightSlate-700 hover:text-lightSlate-50">
                     <div
                       onClick={async () => {
                         const result = await window.openFileDialog({

diff --git a/apps/desktop/packages/mainWindow/src/pages/Library/FeaturedModpackTile.tsx b/apps/desktop/packages/mainWindow/src/pages/Library/FeaturedModpackTile.tsx
@@ -97,7 +97,7 @@ const FeaturedModpackTile = () => {
                     <div class="text-xl font-bold text-nowrap">
                       {hexingTales()?.data.name}
                     </div>
-                    <div class="text-sm text-darkSlate-50">
+                    <div class="text-sm text-lightSlate-700">
                       <For each={hexingTales()?.data.authors}>
                         {(v) => <span>{v.name}</span>}
                       </For>

diff --git a/apps/desktop/packages/mainWindow/src/pages/Library/HomeGrid.tsx b/apps/desktop/packages/mainWindow/src/pages/Library/HomeGrid.tsx
@@ -344,7 +344,7 @@ const HomeGrid = () => {
         >
           <div class="w-full h-full flex flex-col justify-center items-center mt-12">
             <img src={skull} class="w-16 h-16" />
-            <p class="text-darkSlate-50 text-center max-w-100">
+            <p class="text-lightSlate-700 text-center max-w-100">
               <Trans key="instance.no_instances_text" />
             </p>
           </div>
@@ -441,7 +441,7 @@ const HomeGrid = () => {
                           }}
                         />
                         <div
-                          class="w-6 h-6 text-darkSlate-50 hover:text-lightSlate-50"
+                          class="w-6 h-6 text-lightSlate-700 hover:text-lightSlate-50"
                           classList={{
                             "i-ri:sort-alphabet-asc":
                               globalStore.settings.data?.instancesSortByAsc,
@@ -478,7 +478,7 @@ const HomeGrid = () => {
                           }}
                         />
                         <div
-                          class="w-6 h-6 text-darkSlate-50 hover:text-lightSlate-50"
+                          class="w-6 h-6 text-lightSlate-700 hover:text-lightSlate-50"
                           classList={{
                             "i-ri:sort-alphabet-asc":
                               globalStore.settings.data?.instancesGroupByAsc,
@@ -498,7 +498,7 @@ const HomeGrid = () => {
                     </div>
                     <div class="flex justify-end">
                       <span
-                        class="text-darkSlate-50 hover:text-lightSlate-50 mt-4"
+                        class="text-lightSlate-700 hover:text-lightSlate-50 mt-4"
                         onClick={() => {
                           settingsMutation.mutate({
                             instancesSortBy: {

diff --git a/apps/desktop/packages/mainWindow/src/pages/Library/HomeWithSidebar.tsx b/apps/desktop/packages/mainWindow/src/pages/Library/HomeWithSidebar.tsx
@@ -53,7 +53,7 @@ const HomeWithSidebar = () => {
           >
             <div class="w-full h-full flex flex-col justify-center items-center mt-12">
               <img src={skull} class="w-16 h-16" />
-              <p class="text-darkSlate-50 text-center max-w-100">
+              <p class="text-lightSlate-700 text-center max-w-100">
                 <Trans
                   key="instance.no_instances_text"
                   options={{

diff --git a/apps/desktop/packages/mainWindow/src/pages/Library/Instance/Overview.tsx b/apps/desktop/packages/mainWindow/src/pages/Library/Instance/Overview.tsx
@@ -205,7 +205,7 @@ const Overview = () => {
 
       <Show when={routeData.instanceDetails.data?.notes}>
         <div class="flex flex-col justify-between gap-2 p-5 bg-darkSlate-700 rounded-xl w-full items-start box-border w-59">
-          <div class="text-darkSlate-50 uppercase">
+          <div class="text-lightSlate-700 uppercase">
             <Trans
               key="instance.notes"
               options={{

diff --git a/apps/desktop/packages/mainWindow/src/pages/Library/Instance/Tabs/Log/LogsContent.tsx b/apps/desktop/packages/mainWindow/src/pages/Library/Instance/Tabs/Log/LogsContent.tsx
@@ -245,7 +245,7 @@ const LogsContent = (props: Props) => {
         </div>
       </div>
       <Show when={props.isActive}>
-        <div class="z-1 absolute top-20 right-6 w-fit h-10 bg-darkSlate-700 text-lightSlate-800 flex items-center px-4 rounded-3xl">
+        <div class="z-1 absolute top-20 right-6 w-fit h-10 bg-darkSlate-700 text-lightSlate-700 flex items-center px-4 rounded-3xl">
           <div class="bg-red-400 rounded-full text-red-400 w-3 h-3 mr-2 animate-liveCirclePulse" />
           <div>LIVE</div>
         </div>

diff --git a/apps/desktop/packages/mainWindow/src/pages/Library/Instance/Tabs/Log/LogsSidebar.tsx b/apps/desktop/packages/mainWindow/src/pages/Library/Instance/Tabs/Log/LogsSidebar.tsx
@@ -67,7 +67,7 @@ const LogsCollapsable = (props: LogsCollapsableProps) => {
         <For each={sortedLogs()}>
           {(log) => (
             <div
-              class="relative text-darkSlate-100 py-3.5 px-4 hover:bg-darkSlate-700 rounded-md w-full box-border"
+              class="relative text-lightSlate-700 py-3.5 px-4 hover:bg-darkSlate-700 rounded-md w-full box-border"
               onClick={() => {
                 props.setSelectedLog(log.id);
               }}