Repository navigation
feat(cloud): align logo, content and terms on one edge #14697
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
17 commits
Select commit
Hold shift + click to select a range
95ebca8
feat(cloud): dark theme, brand tokens and PP Formula pipeline
MaanilVerma 0103271
fix(ui): keep the button label readable while loading
MaanilVerma b632ed0
feat(cloud): brand button variants and redesigned auth panels
MaanilVerma 31bc6a1
feat(cloud): align logo, content and terms on one edge
MaanilVerma 27b0925
Merge branch 'main' into feat/cloud-auth-shell
MaanilVerma de2efbc
Merge branch 'feat/cloud-auth-shell' into fix/button-loading-a11y
MaanilVerma c859195
Merge branch 'fix/button-loading-a11y' into feat/cloud-auth-panel
MaanilVerma 6246be0
Merge branch 'feat/cloud-auth-panel' into feat/cloud-auth-layout
MaanilVerma 2d51907
revert(i18n): move auth and carousel keys to the PRs that use them
MaanilVerma a8ef3dd
Merge branch 'fix/button-loading-a11y' into feat/cloud-auth-panel
MaanilVerma b500d16
Merge branch 'feat/cloud-auth-panel' into feat/cloud-auth-layout
MaanilVerma 6d20cfd
feat(cloud): add auth panel copy
MaanilVerma 2e1ef92
Merge branch 'feat/cloud-auth-panel' into feat/cloud-auth-layout
MaanilVerma ad559e0
fix(cloud): bound the auth panel width in the template
MaanilVerma a008732
Merge branch 'feat/cloud-auth-panel' into feat/cloud-auth-layout
MaanilVerma a96c105
fix(cloud): keep the footer on forgot-password
MaanilVerma 292b193
Merge remote-tracking branch 'origin/main' into feat/cloud-auth-layout
MaanilVerma File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
48 changes: 29 additions & 19 deletions
48
src/platform/cloud/onboarding/components/CloudTemplate.vue
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,37 +1,47 @@ | ||
| <template> | ||
| <div | ||
| class="flex h-svh w-screen bg-primary-comfy-ink font-sans text-primary-comfy-canvas" | ||
| class="dark-theme h-svh w-screen bg-primary-comfy-ink font-formula text-primary-comfy-canvas" | ||
| > | ||
| <div class="relative flex flex-1 flex-col"> | ||
| <div class="flex h-16 shrink-0 items-center px-6"> | ||
| <i | ||
| class="icon-[comfy--comfy-logo] h-5 w-22 text-brand-yellow md:h-6 md:w-26" | ||
| /> | ||
| <div class="mx-auto flex size-full max-w-[100rem]"> | ||
| <div v-if="showHero" class="relative min-h-0 flex-1 overflow-hidden"> | ||
| <CloudHeroCarousel /> | ||
| </div> | ||
| <div class="flex flex-1 items-center justify-center overflow-auto"> | ||
| <div class="w-full max-w-md px-6 lg:max-w-lg 2xl:max-w-xl"> | ||
| <slot /> | ||
| <div class="flex min-h-0 flex-1 flex-col overflow-auto"> | ||
| <div | ||
| class="mx-auto flex min-h-full w-full max-w-md flex-col px-6 py-8 lg:max-w-lg xl:py-10 2xl:max-w-xl" | ||
| > | ||
| <img | ||
| src="/icons/logo.svg" | ||
| :alt="t('g.comfyOrgLogoAlt')" | ||
| class="h-9 w-auto shrink-0 object-contain object-left lg:h-10 2xl:h-11" | ||
| /> | ||
|
|
||
| <div class="my-auto w-full"> | ||
| <slot /> | ||
| </div> | ||
|
|
||
| <CloudTermsNotice v-if="route.meta.showTermsNotice" /> | ||
| <CloudTemplateFooter v-if="!route.meta.showTermsNotice" /> | ||
| </div> | ||
| </div> | ||
| <CloudTemplateFooter /> | ||
| </div> | ||
| <div | ||
| v-if="!route.meta.hideHero" | ||
| class="relative hidden flex-1 overflow-hidden py-2 pr-2 lg:block" | ||
| > | ||
| <CloudHeroCarousel /> | ||
| </div> | ||
| </div> | ||
| </template> | ||
|
|
||
| <script setup lang="ts"> | ||
| import { breakpointsTailwind, useBreakpoints } from '@vueuse/core' | ||
| import { computed } from 'vue' | ||
| import { useI18n } from 'vue-i18n' | ||
| import { useRoute } from 'vue-router' | ||
|
|
||
| import CloudHeroCarousel from '@/platform/cloud/onboarding/components/CloudHeroCarousel.vue' | ||
| import CloudTemplateFooter from '@/platform/cloud/onboarding/components/CloudTemplateFooter.vue' | ||
| import CloudTermsNotice from '@/platform/cloud/onboarding/components/CloudTermsNotice.vue' | ||
|
|
||
| import '../assets/css/fonts.css' | ||
|
|
||
| const { t } = useI18n() | ||
| const route = useRoute() | ||
| const isWideViewport = useBreakpoints(breakpointsTailwind).greaterOrEqual('xl') | ||
| const showHero = computed(() => isWideViewport.value && !route.meta.hideHero) | ||
| </script> | ||
| <style> | ||
| @import '../assets/css/fonts.css'; | ||
| </style> |
4 changes: 1 addition & 3 deletions
4
src/platform/cloud/onboarding/components/CloudTemplateFooter.vue
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
44 changes: 44 additions & 0 deletions
44
src/platform/cloud/onboarding/components/CloudTermsNotice.vue
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| <template> | ||
| <div | ||
| class="mt-10 mb-8 shrink-0 text-center text-sm/relaxed text-primary-warm-gray" | ||
| > | ||
| <p class="my-0"> | ||
| {{ t('auth.login.termsText') }} | ||
| <br /> | ||
| <a | ||
| href="https://www.comfy.org/terms-of-service" | ||
| target="_blank" | ||
| rel="noopener noreferrer" | ||
| class="text-primary-comfy-canvas underline" | ||
| > | ||
| {{ t('auth.login.termsLink') }} | ||
| </a> | ||
| {{ t('auth.login.andText') }} | ||
| <a | ||
| href="https://www.comfy.org/privacy-policy" | ||
| target="_blank" | ||
| rel="noopener noreferrer" | ||
| class="text-primary-comfy-canvas underline" | ||
| > | ||
| {{ t('auth.login.privacyLink') }} </a | ||
| >. | ||
| </p> | ||
| <p class="mt-4 mb-0 text-xs/relaxed"> | ||
| {{ t('cloudWaitlist_questionsText') }} | ||
| <a | ||
| href="https://support.comfy.org" | ||
| target="_blank" | ||
| rel="noopener noreferrer" | ||
| class="text-primary-comfy-canvas underline" | ||
| > | ||
| {{ t('cloudWaitlist_contactLink') }} </a | ||
| >. | ||
|
MaanilVerma marked this conversation as resolved.
Resolved
|
||
| </p> | ||
| </div> | ||
| </template> | ||
|
|
||
| <script setup lang="ts"> | ||
| import { useI18n } from 'vue-i18n' | ||
|
|
||
| const { t } = useI18n() | ||
| </script> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.