diff --git a/ui/src/cmsData/projects.json b/ui/src/cmsData/projects.json index 29ecbefd6..7bfa72e99 100644 --- a/ui/src/cmsData/projects.json +++ b/ui/src/cmsData/projects.json @@ -75,7 +75,7 @@ "type": "doc", "_version": 12 }, - "heading": "Welcome to Content Migrations", + "heading": "Welcome to Content Migration!", "help_text": { "type": "doc", "attrs": {}, diff --git a/ui/src/components/DestinationStack/Actions/LoadStacks.tsx b/ui/src/components/DestinationStack/Actions/LoadStacks.tsx index 5cd2dddf0..adebdcc36 100644 --- a/ui/src/components/DestinationStack/Actions/LoadStacks.tsx +++ b/ui/src/components/DestinationStack/Actions/LoadStacks.tsx @@ -274,10 +274,10 @@ const LoadStacks = (props: LoadFileFormatProps) => { // placeholder='Select a stack' placeholder={placeholder} - isClearable={newMigrationData?.destination_stack?.stackArray?.length > 0 && !emptyStackValue ? true : false } + isClearable={newMigrationData?.destination_stack?.stackArray?.length > 0 && !emptyStackValue} // hideSelectedOptions={true} // isDisabled={props?.stepComponentProps?.isSummary || false} - error={isLoading ? false : isError ? true : false } + error={isLoading ? false : !!isError } width="600px" hasAddOption={true} // menuIsOpen diff --git a/ui/src/components/MainHeader/index.scss b/ui/src/components/MainHeader/index.scss index 14a769e90..f3c6149c1 100644 --- a/ui/src/components/MainHeader/index.scss +++ b/ui/src/components/MainHeader/index.scss @@ -3,6 +3,7 @@ .mainheader { [class*="Profile_card"] { [class*="Dropdown__menu__list"] { + max-height: 203px; padding: 0; } @@ -79,11 +80,12 @@ } .Dropdown__header__value { - color: #475161; + color: $color-font-base; + font-weight: $font-weight-regular; + height: 22px; max-width: 11.1875rem; width: auto; - color: $color-black-222 !important; - line-height: $line-height-reset; + line-height: $line-height-default; } .Dropdown__menu--primary .Dropdown__menu__list__item, @@ -93,8 +95,27 @@ } .Dropdown__header__label { - line-height: $line-height-reset; - margin-bottom: 8px; + font-weight: $font-weight-bold; + line-height: 1.3; + margin-bottom: 4px; } } + .user-short-name { + background-color: $color-font-white; + border: 2px solid $color-base-white-10; + border-radius: 50%; + color: $color-font-base; + font-weight: $font-weight-bold; + height: $px-32; + width: $px-32; + &:hover { + border-color: $color-brand-primary-base; + } + } + .Dropdown-wrapper .Dropdown__menu--primary { + left: auto; + right: 0; + top: 3rem; + width: 300px; + } } \ No newline at end of file diff --git a/ui/src/components/ProfileHeader/index.scss b/ui/src/components/ProfileHeader/index.scss index 193fd1886..26361a472 100644 --- a/ui/src/components/ProfileHeader/index.scss +++ b/ui/src/components/ProfileHeader/index.scss @@ -2,20 +2,20 @@ .profile-card { width: 300px; - padding: 16px; + padding: 11px 16px; // background-color: #f8f9fa; - border-radius: 8px; box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); text-align: center; } .profile-card__avatar { - margin-bottom: 16px; + height: 60px; + margin-bottom: 8px; } .profile-card__initials { - width: 64px; - height: 64px; + width: 60px; + height: 60px; border-radius: 50%; background-color: #2c3e50; color: white; @@ -27,21 +27,17 @@ } -.profile-card__details { - margin-bottom: 16px; -} - .profile-card__name { - font-size: 16px; - font-weight: 500; - color: #2c3e50; + color: #6E6B86; + font-size: $size-font-large; + font-weight: $font-weight-semi-bold; margin-bottom: 5px; + text-transform: capitalize; } .profile-card__email { - font-size: 14px; - color: #7f8c8d; - margin-bottom: 5px; + font-size: $size-font-small; + color: #6E6B86; } .profile-card__logout { @@ -59,13 +55,18 @@ } .profile-card__logout-text { - text-decoration: underline; + color: #6E6B86; + font-size: $size-font-large; + &:hover { + text-decoration: underline; + } } .profile-gray-background { + border-radius: 8px 8px 0 0; min-height: 20px; position: absolute; - width: 350px; + width: 300px; height: 64px; top: 0; left: 0; diff --git a/ui/src/components/ProjectsHeader/index.tsx b/ui/src/components/ProjectsHeader/index.tsx index e52a4a05c..a65add9b6 100644 --- a/ui/src/components/ProjectsHeader/index.tsx +++ b/ui/src/components/ProjectsHeader/index.tsx @@ -82,7 +82,7 @@ const ProjectsHeader = ({ label: cta && cta?.title && (