Skip to content

[CMG-129], [CMG-136] #285

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.

Sign up for GitHub

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 1 commit into from
Sep 18, 2024
Merged

[CMG-129], [CMG-136] #285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ui/src/cmsData/projects.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
"type": "doc",
"_version": 12
},
"heading": "Welcome to Content Migrations",
"heading": "Welcome to Content Migration!",
"help_text": {
"type": "doc",
"attrs": {},
Expand Down
4 changes: 2 additions & 2 deletions ui/src/components/DestinationStack/Actions/LoadStacks.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
31 changes: 26 additions & 5 deletions ui/src/components/MainHeader/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
.mainheader {
[class*="Profile_card"] {
[class*="Dropdown__menu__list"] {
max-height: 203px;
padding: 0;
}

Expand Down Expand Up @@ -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,
Expand All @@ -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;
}
}
35 changes: 18 additions & 17 deletions ui/src/components/ProfileHeader/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 {
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ui/src/components/ProjectsHeader/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ const ProjectsHeader = ({
label: cta && cta?.title && (
<Button
buttonType={cta?.theme}
className="ml-10"
className="ml-10 create-project-cta"
onClick={handleModal}
version="v2"
size="medium"
Expand Down
4 changes: 4 additions & 0 deletions ui/src/pages/Projects/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
color: $color-font-base;
a {
color: $color-brand-primary-base;
text-decoration: underline;
}
}
}
Expand All @@ -55,4 +56,7 @@
.EmptyState__title {
padding-top: 15px;
}
}
.create-project-cta {
line-height: $line-height-default;
}