Skip to content

Commit

Permalink
[fyfre]Fix font sizes and dimensions for window style
Browse files Browse the repository at this point in the history
Adapt margins, font sizes and element dimensions.

Bug: 1374702
Change-Id: I8f99e3013bd90a19ed3d6b329897e2c0888f7c08
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4114020
Commit-Queue: Jack Yammine <jyammine@google.com>
Reviewed-by: Nicolas Dossou-Gbété <dgn@chromium.org>
Reviewed-by: Alex Ilin <alexilin@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1084895}
  • Loading branch information
Jack Yammine authored and Chromium LUCI CQ committed Dec 19, 2022
1 parent 8627845 commit c83b39a
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 5 deletions.
Expand Up @@ -230,6 +230,10 @@
min-width: 111px;
}

.window-button-container {
--cr-button-height: 36px;
}

#headerContainer.signin-intercept-design {
background: center 36px no-repeat
url(./images/sync_confirmation_signin_intercept_illustration.svg);
Expand Down Expand Up @@ -321,18 +325,28 @@

.tangible-sync #syncConfirmationHeading {
font-family: 'Google Sans', arial, sans-serif;
font-size: 1.25rem;
font-size: 2.25rem;
font-weight: 500;
line-height: 43px;
margin: 24px 0 16px;
}

.dialog-main-container.tangible-sync #syncConfirmationHeading {
font-size: 1.25rem;
line-height: 24px;
margin: 16px 0 12px;
margin: 16px 0 12px
}

#syncInfoTitle {
color: var(--sync-info-title-color);
font-size: 0.94rem;
font-size: 1.25rem;
line-height: 24px;
}

.dialog-main-container.tangible-sync #syncInfoTitle {
font-size: 0.94rem;
}

#syncBenefitsList {
background: var(--sync-benefits-list-color);
border-radius: 24px;
Expand All @@ -341,9 +355,14 @@
font-size: 0.81rem;
font-weight: 400;
line-height: 20px;
margin: 24px 0 16px;
padding: 24px;
row-gap: 16px;
}

.dialog-main-container.tangible-sync #syncBenefitsList {
margin: 16px 38px;
padding: 20px 24px;
row-gap: 16px;
}

.sync-benefit {
Expand All @@ -363,6 +382,9 @@
#syncInfoDesc {
font-size: 0.75rem;
line-height: 20px;
}

.dialog-main-container.tangible-sync #syncInfoDesc {
margin: 0 38px;
}

Expand Down Expand Up @@ -592,7 +614,8 @@ <h1 id="syncConfirmationHeading" consent-description>
</div>
<div class="action-row tangible-sync">
<paper-spinner-lite active="[[anyButtonClicked_]]"></paper-spinner-lite>
<div id="tangible-sync-button-container" class="action-container">
<div id="tangible-sync-button-container"
class$="action-container [[getButtonContainerClass_()]]">
<cr-button id="confirmButton" class="action-button" on-click="onConfirm_"
disabled="[[anyButtonClicked_]]" consent-confirmation
autofocus="[[isModalDialog_]]">
Expand Down
Expand Up @@ -164,6 +164,11 @@ export class SyncConfirmationAppElement extends SyncConfirmationAppElementBase {
'window-main-container';
}

private getButtonContainerClass_() {
return this.isModalDialog_ ? 'dialog-button-container' :
'window-button-container';
}

private getSigninInterceptDesignClass_(isSigninInterceptFre: boolean):
string {
return isSigninInterceptFre ? 'signin-intercept-design' : '';
Expand Down

0 comments on commit c83b39a

Please sign in to comment.