feat(ui): revert tabs to txt2img/img2img

invokeai/frontend/web/src/features/parameters/components/AdvancedParameters/ImageToImage/ImageToImageFit.tsx

@@ -5,7 +5,7 @@ import { setShouldFitToWidthHeight } from 'features/parameters/store/generationS
 import { ChangeEvent } from 'react';
 import { useTranslation } from 'react-i18next';
 
-export default function ImageFit() {
+export default function ImageToImageFit() {
   const dispatch = useAppDispatch();
 
   const shouldFitToWidthHeight = useAppSelector(

invokeai/frontend/web/src/features/parameters/components/AdvancedParameters/ImageToImage/ImageToImageSettings.tsx

@@ -13,7 +13,7 @@ import {
 import { motion } from 'framer-motion';
 
 import IAIButton from 'common/components/IAIButton';
-import ImageFit from 'features/parameters/components/AdvancedParameters/ImageToImage/ImageFit';
+import ImageToImageFit from 'features/parameters/components/AdvancedParameters/ImageToImage/ImageToImageFit';
 import ImageToImageStrength from 'features/parameters/components/AdvancedParameters/ImageToImage/ImageToImageStrength';
 import IAIIconButton from 'common/components/IAIIconButton';
 
@@ -21,16 +21,16 @@ import { useTranslation } from 'react-i18next';
 import InitialImagePreview from './InitialImagePreview';
 import { useState } from 'react';
 import { FaUndo, FaUpload } from 'react-icons/fa';
-import ImagePromptHeading from 'common/components/ImageToImageSettingsHeader';
+import InitialImageButtons from 'common/components/ImageToImageSettingsHeader';
 
 export default function ImageToImageSettings() {
   const { t } = useTranslation();
   return (
     <VStack gap={2} w="full" alignItems="stretch">
-      <ImagePromptHeading />
+      <InitialImageButtons />
       <InitialImagePreview />
       <ImageToImageStrength />
-      <ImageFit />
+      <ImageToImageFit />
     </VStack>
   );
 }

invokeai/frontend/web/src/features/parameters/components/AdvancedParameters/ImageToImage/InitialImageDisplay.tsx

@@ -0,0 +1,36 @@
+import { Flex } from '@chakra-ui/react';
+import InitialImagePreview from './InitialImagePreview';
+import InitialImageButtons from 'common/components/ImageToImageButtons';
+
+const InitialImageDisplay = () => {
+  return (
+    <Flex
+      sx={{
+        position: 'relative',
+        flexDirection: 'column',
+        height: '100%',
+        width: '100%',
+        rowGap: 4,
+        borderRadius: 'base',
+        alignItems: 'center',
+        justifyContent: 'center',
+      }}
+    >
+      <Flex
+        flexDirection="column"
+        sx={{
+          w: 'full',
+          h: 'full',
+          alignItems: 'center',
+          justifyContent: 'center',
+          gap: 4,
+        }}
+      >
+        <InitialImageButtons />
+        <InitialImagePreview />
+      </Flex>
+    </Flex>
+  );
+};
+
+export default InitialImageDisplay;

invokeai/frontend/web/src/features/parameters/components/AdvancedParameters/ImageToImage/InitialImagePreview.tsx

@@ -71,6 +71,7 @@ const InitialImagePreview = () => {
     <Flex
       sx={{
         width: 'full',
+        height: 'full',
         alignItems: 'center',
         justifyContent: 'center',
         position: 'relative',
@@ -115,7 +116,7 @@ const InitialImagePreview = () => {
         )}
         {!initialImage?.url && <SelectImagePlaceholder />}
       </Flex>
-      {!isImageToImageEnabled && (
+      {/* {!isImageToImageEnabled && (
         <Flex
           sx={{
             w: 'full',
@@ -134,7 +135,7 @@ const InitialImagePreview = () => {
             Image to Image is Disabled
           </Text>
         </Flex>
-      )}
+      )} */}
     </Flex>
   );
 };

invokeai/frontend/web/src/features/parameters/components/Parameters/Hires/ParamHiresCollapse.tsx

@@ -7,9 +7,6 @@ import { memo } from 'react';
 import { ParamHiresStrength } from './ParamHiresStrength';
 import { setHiresFix } from 'features/parameters/store/postprocessingSlice';
 
-/**
- * Seed & variation options. Includes iteration, seed, seed randomization, variation options.
- */
 const ParamHiresCollapse = () => {
   const { t } = useTranslation();
   const hiresFix = useAppSelector(