diff --git a/.env.development b/.env.development index ecfbeb5346c2..c929267237f5 100644 --- a/.env.development +++ b/.env.development @@ -13,7 +13,7 @@ VITE_APP_WS_SERVER_URL=http://localhost:5001 # set this only if using the collaboration workflow we use on excalidraw.com VITE_APP_PORTAL_URL= -VITE_APP_PLUS_LP=https://plus.excalidraw.com +VITE_APP_PLUS_LP= VITE_APP_PLUS_APP=https://app.excalidraw.com VITE_APP_AI_BACKEND= diff --git a/.env.production b/.env.production index cc0e5cedf942..1b83b36baf24 100644 --- a/.env.production +++ b/.env.production @@ -17,6 +17,7 @@ VITE_APP_LIBRARY_BACKEND=https://us-central1-excalidraw-room-persistence.cloudfu # not needed for self hosted VITE_APP_PORTAL_URL= VITE_APP_AI_BACKEND= +VITE_APP_PLUS_LP= # production-only vars VITE_APP_GOOGLE_ANALYTICS_ID= diff --git a/excalidraw-app/components/AppWelcomeScreen.tsx b/excalidraw-app/components/AppWelcomeScreen.tsx index a5176c2fface..de322f9553de 100644 --- a/excalidraw-app/components/AppWelcomeScreen.tsx +++ b/excalidraw-app/components/AppWelcomeScreen.tsx @@ -43,7 +43,9 @@ export const AppWelcomeScreen: React.FC<{ - + {import.meta.env.VITE_APP_PLUS_LP && + + } {headingContent} @@ -55,7 +57,7 @@ export const AppWelcomeScreen: React.FC<{ onSelect={() => props.setCollabDialogShown(true)} /> )} - {!isExcalidrawPlusSignedUser && ( + {!isExcalidrawPlusSignedUser && import.meta.env.VITE_APP_PLUS_LP && ( - + - + - - - - - - - - <% } %> - - - + + + diff --git a/excalidraw-app/index.scss b/excalidraw-app/index.scss index 5a961c1e04b2..144f416a9e1b 100644 --- a/excalidraw-app/index.scss +++ b/excalidraw-app/index.scss @@ -1,8 +1,8 @@ .excalidraw { - --color-primary-contrast-offset: #625ee0; // to offset Chubb illusion + --color-primary-contrast-offset: #00a3d3; // to offset Chubb illusion &.theme--dark { - --color-primary-contrast-offset: #726dff; // to offset Chubb illusion + --color-primary-contrast-offset: #00a3d3; // to offset Chubb illusion } .footer-center { justify-content: flex-end; diff --git a/excalidraw-app/start/start.scss b/excalidraw-app/start/start.scss index 15d39307d0c3..8291f1bfd757 100644 --- a/excalidraw-app/start/start.scss +++ b/excalidraw-app/start/start.scss @@ -47,8 +47,7 @@ a { } .kits-content-left img { - width: 40%; - height: 40%; + width: 272px; } .kits-content-right { diff --git a/packages/excalidraw/assets/lock.svg b/packages/excalidraw/assets/lock.svg index aa9dbf1701ce..bfb68fe3d726 100644 --- a/packages/excalidraw/assets/lock.svg +++ b/packages/excalidraw/assets/lock.svg @@ -1,20 +1,52 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + diff --git a/packages/excalidraw/components/Toolbar.scss b/packages/excalidraw/components/Toolbar.scss index 33f106ac21b6..8c0fda3ece81 100644 --- a/packages/excalidraw/components/Toolbar.scss +++ b/packages/excalidraw/components/Toolbar.scss @@ -37,7 +37,7 @@ &--selected, &--selected:hover { background: var(--color-primary-light); - color: var(--color-primary); + color: $oc-white; } } diff --git a/packages/excalidraw/components/welcome-screen/WelcomeScreen.Center.tsx b/packages/excalidraw/components/welcome-screen/WelcomeScreen.Center.tsx index 711cc30ccae3..7cbe35e19097 100644 --- a/packages/excalidraw/components/welcome-screen/WelcomeScreen.Center.tsx +++ b/packages/excalidraw/components/welcome-screen/WelcomeScreen.Center.tsx @@ -110,7 +110,7 @@ Center.displayName = "Center"; const Logo = ({ children }: { children?: React.ReactNode }) => { return (
- {children || } + {children || }
); }; diff --git a/packages/excalidraw/css/theme.scss b/packages/excalidraw/css/theme.scss index 9b00dfaea57a..34c43e3e3f5f 100644 --- a/packages/excalidraw/css/theme.scss +++ b/packages/excalidraw/css/theme.scss @@ -137,15 +137,15 @@ --border-radius-md: 0.375rem; --border-radius-lg: 0.5rem; - --color-surface-high: hsl(244, 100%, 97%); - --color-surface-mid: hsl(240 25% 96%); - --color-surface-low: hsl(240 25% 94%); + --color-surface-high: var(--color-gray-20); + --color-surface-mid: white; + --color-surface-low: white; --color-surface-lowest: #ffffff; --color-on-surface: #1b1b1f; - --color-brand-hover: #5753d0; + --color-brand-hover: var(--color-primary-darker); --color-on-primary-container: #030064; --color-surface-primary-container: #e0dfff; - --color-brand-active: #4440bf; + --color-brand-active: var(--color-primary-darker); --color-border-outline: #767680; --color-border-outline-variant: #c5c5d0; --color-surface-primary-container: #e0dfff; @@ -170,7 +170,7 @@ --dialog-border-color: var(--color-gray-80); --dropdown-icon: url('data:image/svg+xml,'); --focus-highlight-color: #{$oc-blue-6}; - --icon-fill-color: var(--white); + --icon-fill-color: #{$oc-white}; --icon-green-fill-color: var(--color-primary); --default-bg-color: #121212; --input-bg-color: #121212; @@ -245,7 +245,7 @@ --color-surface-mid: hsl(240 6% 10%); --color-surface-lowest: hsl(0, 0%, 7%); --color-on-surface: #e3e3e8; - --color-brand-hover: #bbb8ff; + --color-brand-hover: var(--color-primary-darker); --color-on-primary-container: #e0dfff; --color-surface-primary-container: #403e6a; --color-brand-active: #d0ccff; diff --git a/packages/excalidraw/css/variables.module.scss b/packages/excalidraw/css/variables.module.scss index 37b692ea278b..cb43a2cc2a2a 100644 --- a/packages/excalidraw/css/variables.module.scss +++ b/packages/excalidraw/css/variables.module.scss @@ -74,7 +74,7 @@ } &:hover { - background-color: var(--button-hover-bordwe, var(--default-border-color)); + background-color: var(--button-hover-border, var(--default-border-color)); border-color: var( --button-hover-border, var(--button-border, var(--default-border-color)) diff --git a/packages/excalidraw/renderer/renderElement.ts b/packages/excalidraw/renderer/renderElement.ts index c346392b7e05..0a27f63e745d 100644 --- a/packages/excalidraw/renderer/renderElement.ts +++ b/packages/excalidraw/renderer/renderElement.ts @@ -572,7 +572,7 @@ export const renderSelectionElement = ( ) => { context.save(); context.translate(element.x + appState.scrollX, element.y + appState.scrollY); - context.fillStyle = "rgba(0, 0, 200, 0.04)"; + context.fillStyle = "rgba(0, 163, 211, 0.04)"; // render from 0.5px offset to get 1px wide line // https://stackoverflow.com/questions/7530593/html5-canvas-and-line-width/7531540#7531540 @@ -582,7 +582,7 @@ export const renderSelectionElement = ( context.fillRect(offset, offset, element.width, element.height); context.lineWidth = 1 / appState.zoom.value; - context.strokeStyle = " rgb(105, 101, 219)"; + context.strokeStyle = " rgb(0, 163, 211)"; context.strokeRect(offset, offset, element.width, element.height); context.restore(); diff --git a/public/favicon-16x16.png b/public/favicon-16x16.png deleted file mode 100644 index eead573640ba..000000000000 Binary files a/public/favicon-16x16.png and /dev/null differ diff --git a/public/favicon-32x32.png b/public/favicon-32x32.png deleted file mode 100644 index 041545cbd770..000000000000 Binary files a/public/favicon-32x32.png and /dev/null differ diff --git a/public/kits-icon-16.png b/public/kits-icon-16.png new file mode 100644 index 000000000000..03b2f9de1cc1 Binary files /dev/null and b/public/kits-icon-16.png differ diff --git a/public/kits-icon-32.png b/public/kits-icon-32.png new file mode 100644 index 000000000000..1cd6a876d321 Binary files /dev/null and b/public/kits-icon-32.png differ diff --git a/public/web/icons/icon-16x16.png b/public/web/icons/icon-16x16.png new file mode 100644 index 000000000000..ad0b0d2f5148 Binary files /dev/null and b/public/web/icons/icon-16x16.png differ diff --git a/public/web/icons/icon-32x32.png b/public/web/icons/icon-32x32.png new file mode 100644 index 000000000000..da635dd6e183 Binary files /dev/null and b/public/web/icons/icon-32x32.png differ