Commit 00037259 authored by James Cook's avatar James Cook Committed by Commit Bot

chromeos: Fix styling for OOBE OS sync consent dialog

Update styles for the dialog used with SplitSettingsSync to match
go/cros-sync-mock. Remove an unused style from the legacy dialog.

Legacy dialog (unchanged):
https://screenshot.googleplex.com/1P8qoyMnKOX

SplitSettingsSync dialog (updated):
https://screenshot.googleplex.com/mXsGDhWqWsC

Bug: 1023854
Change-Id: Iba6aaad03db7d9d457d8d32a15db4e51cb0e33df
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2006487
Commit-Queue: James Cook <jamescook@chromium.org>
Reviewed-by: default avatarToni Baržić <tbarzic@chromium.org>
Cr-Commit-Position: refs/heads/master@{#733832}
parent 8dc34dc3
...@@ -32,3 +32,19 @@ cr-checkbox { ...@@ -32,3 +32,19 @@ cr-checkbox {
--cr-checkbox-label-padding-start: 12px; --cr-checkbox-label-padding-start: 12px;
} }
/* Styles used with SplitSettingsSync. */
#osSyncConsentFooter {
border-bottom: solid 1px var(--google-grey-300);
border-top: solid 1px var(--google-grey-300);
padding: 16px 0;
}
#osSyncConsentToggleName {
font-weight: 500;
margin-bottom: 4px;
}
#osSyncConsentToggleDescription {
color: var(--google-grey-700);
}
...@@ -29,8 +29,7 @@ ...@@ -29,8 +29,7 @@
src1x="chrome://oobe/logo_24px-1x.svg" src1x="chrome://oobe/logo_24px-1x.svg"
src2x="chrome://oobe/logo_24px-2x.svg"> src2x="chrome://oobe/logo_24px-2x.svg">
</hd-iron-icon> </hd-iron-icon>
<div class="overview-list-item-text flex layout vertical <div class="flex layout vertical center-justified">
center-justified">
<div role="heading" aria-level="2" class="overview-list-item-title" <div role="heading" aria-level="2" class="overview-list-item-title"
consent-description> consent-description>
[[i18nDynamic(locale, 'syncConsentScreenChromeSyncName')]] [[i18nDynamic(locale, 'syncConsentScreenChromeSyncName')]]
...@@ -44,8 +43,7 @@ ...@@ -44,8 +43,7 @@
<hd-iron-icon class="overview-list-item-icon" <hd-iron-icon class="overview-list-item-icon"
icon1x="sync-consent-32:googleg" icon2x="sync-consent-64:googleg"> icon1x="sync-consent-32:googleg" icon2x="sync-consent-64:googleg">
</hd-iron-icon> </hd-iron-icon>
<div class="overview-list-item-text flex layout vertical <div class="flex layout vertical center-justified">
center-justified">
<div role ="heading" aria-level="2" class="overview-list-item-title" <div role ="heading" aria-level="2" class="overview-list-item-title"
consent-description> consent-description>
[[i18nDynamic(locale, [[i18nDynamic(locale,
...@@ -82,19 +80,18 @@ ...@@ -82,19 +80,18 @@
[[i18nDynamic(locale, 'osSyncConsentTitle')]] [[i18nDynamic(locale, 'osSyncConsentTitle')]]
</h1> </h1>
<div slot="footer" class="layout vertical"> <div slot="footer" class="layout vertical">
<div class="overview-list-item flex layout horizontal center"> <div id="osSyncConsentFooter" class="flex layout horizontal center">
<div class="overview-list-item-text flex layout vertical <div class="flex layout vertical center-justified">
center-justified"> <div role="heading" aria-level="2" id="osSyncConsentToggleName"
<div role="heading" aria-level="2" class="overview-list-item-title" consent-description>
id="enableOsSyncLabel" consent-description>
[[i18nDynamic(locale, 'osSyncConsentToggleName')]] [[i18nDynamic(locale, 'osSyncConsentToggleName')]]
</div> </div>
<div class="overview-list-item-description" consent-description> <div id="osSyncConsentToggleDescription" consent-description>
[[i18nDynamic(locale, 'osSyncConsentToggleDescription')]] [[i18nDynamic(locale, 'osSyncConsentToggleDescription')]]
</div> </div>
</div> </div>
<cr-toggle id="enableOsSyncToggle" checked <cr-toggle id="enableOsSyncToggle" checked
aria-labelledby="enableOsSyncLabel"> aria-labelledby="osSyncConsentToggleName">
</cr-toggle> </cr-toggle>
</div> </div>
</div> </div>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment