diff --git a/src/components/Menu/Menus/AppMenu.jsx b/src/components/Menu/Menus/AppMenu.jsx
index d5a8a55ae..6723dd7f5 100644
--- a/src/components/Menu/Menus/AppMenu.jsx
+++ b/src/components/Menu/Menus/AppMenu.jsx
@@ -105,7 +105,14 @@ export const AppMenu = ({ user, ...props }) => {
return (
<>
- {isAdmin && }
+ {isAdmin && (
+
+ )}
)
}
diff --git a/src/components/YnputCloud/YnputCloud.styled.js b/src/components/YnputCloud/YnputCloud.styled.js
index 25b03764e..c68428a12 100644
--- a/src/components/YnputCloud/YnputCloud.styled.js
+++ b/src/components/YnputCloud/YnputCloud.styled.js
@@ -35,10 +35,25 @@ export const HeaderButton = styled(ayonButton)`
.icon {
color: var(--md-sys-color-on-tertiary);
- font-size: 2rem;
+ font-size: 1.5rem;
font-variation-settings: 'FILL' 1;
}
+ /* if $darkMode show inverse colors */
+ ${({ $darkMode }) =>
+ $darkMode &&
+ css`
+ background-color: var(--md-sys-color-surface-container-lowest);
+ color: var(--md-sys-color-on-surface);
+ &:hover {
+ background-color: var(--md-sys-color-surface-container-low);
+ }
+
+ .icon {
+ color: var(--md-sys-color-on-surface);
+ }
+ `}
+
/* when loading show shimmer */
${({ $isLoading }) =>
$isLoading &&
@@ -72,7 +87,10 @@ export const Container = styled.div`
display: grid;
flex-direction: column;
align-items: center;
- background-color: var(--md-sys-color-tertiary-container);
+ background-color: ${({ $darkMode }) =>
+ $darkMode
+ ? 'var(--md-sys-color-surface-container-lowest)'
+ : 'var(--md-sys-color-tertiary-container)'};
border-radius: 8px;
gap: 0;
`
diff --git a/src/components/YnputCloud/YnputCloudButton.jsx b/src/components/YnputCloud/YnputCloudButton.jsx
index 655ca7fa3..33ce5e3b2 100644
--- a/src/components/YnputCloud/YnputCloudButton.jsx
+++ b/src/components/YnputCloud/YnputCloudButton.jsx
@@ -2,9 +2,13 @@ import React from 'react'
import * as Styled from './YnputCloud.styled'
import { Icon, Spacer } from '@ynput/ayon-react-components'
import Type from '/src/theme/typography.module.css'
+import CloudLogo from '/src/svg/CloudLogo'
const YnputCloudButton = React.forwardRef(
- ({ isConnected, showStatus, showDropdown, isOpen, isLoading, smallLogo, ...props }, ref) => {
+ (
+ { isConnected, showStatus, showDropdown, isOpen, isLoading, smallLogo, darkMode, ...props },
+ ref,
+ ) => {
return (
- 
+
{(showStatus || showDropdown) && (
{showStatus && (
diff --git a/src/components/YnputCloud/YnputConnector.jsx b/src/components/YnputCloud/YnputConnector.jsx
index bc1ad747e..60fa0b37c 100644
--- a/src/components/YnputCloud/YnputConnector.jsx
+++ b/src/components/YnputCloud/YnputConnector.jsx
@@ -27,6 +27,7 @@ const YnputConnector = ({
onClick,
styleContainer,
user,
+ darkMode,
...props
}) => {
const location = useLocation()
@@ -101,8 +102,10 @@ const YnputConnector = ({
}
}
+ if (isLoading) return null
+
return (
-
+
@@ -119,13 +123,13 @@ const YnputConnector = ({
Instance: {connectData?.instanceName || '???'}
Organization: {connectData?.orgName || '???'}
-
- {showDisconnect && !connectData?.managed && (
+ {showDisconnect && (
+
Disconnect
- )}
-
+
+ )}
diff --git a/src/containers/SettingsEditor/widgets.jsx b/src/containers/SettingsEditor/widgets.jsx
index b37e7e518..a2c15e642 100644
--- a/src/containers/SettingsEditor/widgets.jsx
+++ b/src/containers/SettingsEditor/widgets.jsx
@@ -218,11 +218,11 @@ const SelectWidget = (props) => {
const getDefaultValue = (props) => {
//console.log("Creating default value for", props.id)
- if (props.value !== undefined) return props.value
- if (props.schema.widget === 'color') {
+ if (props.schema.widget === 'color' && !props.value) {
if (props.schema.colorFormat === 'hex') return props.schema.colorAlpha ? '#00000000' : '#000000'
return props.schema.colorAlpha ? [0, 0, 0, 0] : [0, 0, 0]
}
+ if (props.value !== undefined) return props.value
if (props.schema.type === 'string') return ''
if (props.schema.type === 'integer') return 0
}
diff --git a/src/pages/EditorPage/NewEntity.jsx b/src/pages/EditorPage/NewEntity.jsx
index 6bd312ac9..61f5b7861 100644
--- a/src/pages/EditorPage/NewEntity.jsx
+++ b/src/pages/EditorPage/NewEntity.jsx
@@ -155,9 +155,10 @@ const NewEntity = ({
if (!entityData.label || !entityData.type) return
// check name is unique
- if (folderNames.has(entityData.name) && type === 'folder')
- return toast.warning('Folder names must be unique')
- else if (taskNames.get(entityData.name) in currentSelection) {
+ //if (folderNames.has(entityData.name) && type === 'folder')
+ if (folderNames.get(entityData.name) in currentSelection) {
+ return toast.warning('Sibling Folder names must be unique')
+ } else if (taskNames.get(entityData.name) in currentSelection) {
return toast.warning('Sibling Task names must be unique')
}
diff --git a/src/pages/OnBoarding/Step/ConnectionDetails.jsx b/src/pages/OnBoarding/Step/ConnectionDetails.jsx
index f4c8b050b..311391f33 100644
--- a/src/pages/OnBoarding/Step/ConnectionDetails.jsx
+++ b/src/pages/OnBoarding/Step/ConnectionDetails.jsx
@@ -10,7 +10,6 @@ export const ConnectionDetails = ({ Header, Body, Footer, userForm }) => {
(
+
+)
+
+export default CloudLogo