Skip to content

Dev #80

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 2 commits into from
May 3, 2024
Merged

Dev #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
837faef
Refactor: Some ADA occurences
sayalijoshi27 May 2, 2024
17d0f0f
Merge pull request #79 from contentstack/feature/CMG-102
AishDani May 2, 2024
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
8 changes: 4 additions & 4 deletions ui/src/cmsData/region_login.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"is_dir": false,
"parent_uid": null,
"_version": 1,
"title": "aws.svg"
"title": "AWS"
},
"service_title": "Amazon Web Services",
"region_title": "North America",
Expand All @@ -43,7 +43,7 @@
"is_dir": false,
"parent_uid": null,
"_version": 1,
"title": "Azure_icon.svg"
"title": "Azure"
},
"service_title": "Microsoft Azure",
"region_title": "North America",
Expand All @@ -66,7 +66,7 @@
"is_dir": false,
"parent_uid": null,
"_version": 1,
"title": "aws.svg"
"title": "AWS"
},
"service_title": "Amazon Web Services",
"region_title": "Europe",
Expand All @@ -89,7 +89,7 @@
"is_dir": false,
"parent_uid": null,
"_version": 1,
"title": "Azure_icon.svg"
"title": "Azure"
},
"service_title": "Microsoft Azure",
"region_title": "Europe",
Expand Down
6 changes: 3 additions & 3 deletions ui/src/pages/Home/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ const Home = () => {

return (
<div className="d-flex vh-100 align-items-center justify-content-center flex-column">
{heading && <Heading tagName="h0" text={heading} className="pb-2" />}
{description && <p className="pb-4">{parse(description)}</p>}
{heading && <Heading tagName="h1" text={heading} className="pb-2" />}
{description && parse(description)}

{cta && cta?.title && (
<Link to={cta?.url as string} className="btn primary-btn pb-0">
<Link to={cta?.url as string} className="btn primary-btn pb-0 mt-3">
<Button version="v2">{cta?.title}</Button>
</Link>
)}
Expand Down
3 changes: 2 additions & 1 deletion ui/src/pages/RegionalLogin/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ const RegionalLogin = () => {
<div className="d-flex vh-100 align-items-center justify-content-center flex-column">
<div className="container mx-auto">
<div className="text-center">
{heading && <Heading tagName="h0" text={heading} className="pb-2" />}
{heading && <Heading tagName="h1" text={heading} className="pb-2" />}
{description && description != '' && (
<div className="textStone600 pt-3">{parse(description as string)}</div>
)}
Expand Down Expand Up @@ -103,6 +103,7 @@ const RegionalLogin = () => {
region?.service_title as string
)
}
aria-label={`${region?.cta?.title} with ${region?.service_title} ${region?.region_title}`}
>
<span className="link-basic-icon link-arrow">{region?.cta?.title}</span>
</a>
Expand Down
7 changes: 5 additions & 2 deletions ui/src/scss/App.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ h3,
h4,
h5,
h6 {
color: $color-font-base;
color: $color-font-black;
}
p {
color: $color-font-base;
Expand All @@ -302,7 +302,10 @@ p {
// -webkit-box-orient: vertical;
// overflow: hidden;
}

h1 {
font-size: 2.125rem;
font-weight: $font-weight-bold;
}
.pb-32 {
padding-bottom: $px-32;
}
Expand Down
2 changes: 2 additions & 0 deletions ui/src/scss/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ $size-font-4-xl: 1.875rem; /* 30px[H3] */
$size-font-5-xl: 2.25rem; /* 36px[H2] */
$size-font-6-xl: 2.625rem; /* 42px[H1] */

$font-base: 16;

$font-weight-regular: 400;
$font-weight-medium: 500;
$font-weight-semi-bold: 600;
Expand Down