diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index ed3ab0375c..13b90f8f80 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -6,7 +6,7 @@ /mkdocs.yml @lstein @blessedcoolant # nodes -/invokeai/app/ @Kyle0654 @blessedcoolant +/invokeai/app/ @Kyle0654 @blessedcoolant @psychedelicious @brandonrising # installation and configuration /pyproject.toml @lstein @blessedcoolant @@ -22,7 +22,7 @@ /invokeai/backend @blessedcoolant @psychedelicious @lstein @maryhipp # generation, model management, postprocessing -/invokeai/backend @damian0815 @lstein @blessedcoolant @jpphoto @gregghelt2 @StAlKeR7779 +/invokeai/backend @damian0815 @lstein @blessedcoolant @gregghelt2 @StAlKeR7779 @brandonrising # front ends /invokeai/frontend/CLI @lstein diff --git a/invokeai/frontend/web/src/features/controlNet/components/parameters/ParamControlNetFeatureToggle.tsx b/invokeai/frontend/web/src/features/controlNet/components/parameters/ParamControlNetFeatureToggle.tsx index 3a7eea2fbf..8eed90ce16 100644 --- a/invokeai/frontend/web/src/features/controlNet/components/parameters/ParamControlNetFeatureToggle.tsx +++ b/invokeai/frontend/web/src/features/controlNet/components/parameters/ParamControlNetFeatureToggle.tsx @@ -29,6 +29,9 @@ const ParamControlNetFeatureToggle = () => { label="Enable ControlNet" isChecked={isEnabled} onChange={handleChange} + formControlProps={{ + width: '100%', + }} /> ); }; diff --git a/invokeai/frontend/web/src/features/parameters/components/Parameters/ControlNet/ParamControlNetCollapse.tsx b/invokeai/frontend/web/src/features/parameters/components/Parameters/ControlNet/ParamControlNetCollapse.tsx index 999bfd0de9..7f62c8b6c8 100644 --- a/invokeai/frontend/web/src/features/parameters/components/Parameters/ControlNet/ParamControlNetCollapse.tsx +++ b/invokeai/frontend/web/src/features/parameters/components/Parameters/ControlNet/ParamControlNetCollapse.tsx @@ -2,8 +2,8 @@ import { Divider, Flex } from '@chakra-ui/react'; import { createSelector } from '@reduxjs/toolkit'; import { useAppDispatch, useAppSelector } from 'app/store/storeHooks'; import { defaultSelectorOptions } from 'app/store/util/defaultMemoizeOptions'; -import IAIButton from 'common/components/IAIButton'; import IAICollapse from 'common/components/IAICollapse'; +import IAIIconButton from 'common/components/IAIIconButton'; import ControlNet from 'features/controlNet/components/ControlNet'; import ParamControlNetFeatureToggle from 'features/controlNet/components/parameters/ParamControlNetFeatureToggle'; import { @@ -16,6 +16,7 @@ import { useFeatureStatus } from 'features/system/hooks/useFeatureStatus'; import { map } from 'lodash-es'; import { Fragment, memo, useCallback } from 'react'; import { useTranslation } from 'react-i18next'; +import { FaPlus } from 'react-icons/fa'; import { useGetControlNetModelsQuery } from 'services/api/endpoints/models'; import { v4 as uuidv4 } from 'uuid'; @@ -66,15 +67,33 @@ const ParamControlNetCollapse = () => { return ( - - - Add ControlNet - + + + + + } + isDisabled={!firstModel} + flexGrow={1} + size="md" + onClick={handleClickedAddControlNet} + /> + {controlNetsArray.map((c, i) => ( {i > 0 && }