Commit 01e90fe0 authored by Denis Kuznetsov's avatar Denis Kuznetsov Committed by Commit Bot

Apply CSS to slot fallback values in OOBE

Bug: 955194
Change-Id: Ida5215d2f46985370da3407df968673546aab651
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2066848Reviewed-by: default avatarMaksim Ivanov <emaxx@chromium.org>
Reviewed-by: default avatarRoman Sorokin [CET] <rsorokin@chromium.org>
Commit-Queue: Denis Kuznetsov [CET] <antrim@chromium.org>
Cr-Commit-Position: refs/heads/master@{#743952}
parent da7d0093
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
<div id="container" <div id="container"
class="flex layout horizontal center center-justified self-stretch"> class="flex layout horizontal center center-justified self-stretch">
<slot name="text"> <slot name="text">
<div>[[i18nDynamic(locale, textKey)]]</div> <div class="fallback">[[i18nDynamic(locale, textKey)]]</div>
</slot> </slot>
</div> </div>
</cr-button> </cr-button>
...@@ -113,7 +113,7 @@ ...@@ -113,7 +113,7 @@
icon2x="oobe-buttons-40:arrow-forward"> icon2x="oobe-buttons-40:arrow-forward">
</hd-iron-icon> </hd-iron-icon>
<slot name="text"> <slot name="text">
<div>[[i18nDynamic(locale, textKey)]]</div> <div class="fallback">[[i18nDynamic(locale, textKey)]]</div>
</slot> </slot>
</div> </div>
</cr-button> </cr-button>
...@@ -132,7 +132,7 @@ ...@@ -132,7 +132,7 @@
aria-label$="[[labelForAria_]]" class="action-button"> aria-label$="[[labelForAria_]]" class="action-button">
<div class="flex horizontal layout start center"> <div class="flex horizontal layout start center">
<slot name="text"> <slot name="text">
<div>[[i18nDynamic(locale, textKey)]]</div> <div class="fallback">[[i18nDynamic(locale, textKey)]]</div>
</slot> </slot>
<hd-iron-icon <hd-iron-icon
icon1x="oobe-buttons-20:arrow-forward" icon1x="oobe-buttons-20:arrow-forward"
...@@ -179,7 +179,7 @@ ...@@ -179,7 +179,7 @@
class="oobe-icon" hidden> class="oobe-icon" hidden>
</hd-iron-icon> </hd-iron-icon>
<slot name="text"> <slot name="text">
<div>[[i18nDynamic(locale, textKey)]]</div> <div class="fallback">[[i18nDynamic(locale, textKey)]]</div>
</slot> </slot>
</div> </div>
</div> </div>
......
...@@ -35,7 +35,11 @@ ...@@ -35,7 +35,11 @@
padding-top: 20px; padding-top: 20px;
} }
#oobe-title ::slotted(h1) { /*
* TODO(https://crbug.com/703984): remove the fallback class when fixed.
*/
#oobe-title ::slotted(h1),
#oobe-title .fallback {
color: var(--oobe-header-text-color); color: var(--oobe-header-text-color);
@apply --oobe-header-font; @apply --oobe-header-font;
margin: 0; margin: 0;
...@@ -45,7 +49,11 @@ ...@@ -45,7 +49,11 @@
padding-top: 8px; padding-top: 8px;
} }
#oobe-subtitle ::slotted(*) { /*
* TODO(https://crbug.com/703984): remove the fallback class when fixed.
*/
#oobe-subtitle ::slotted(*),
#oobe-subtitle .fallback {
color: var(--oobe-subheader-text-color); color: var(--oobe-subheader-text-color);
line-height: var(--subtitle-line-height); line-height: var(--subtitle-line-height);
margin: 0; margin: 0;
......
...@@ -83,12 +83,12 @@ ...@@ -83,12 +83,12 @@
<div id="oobe-title" class="slot-container layout vertical <div id="oobe-title" class="slot-container layout vertical
end-justified"> end-justified">
<slot name="title"> <slot name="title">
<h1>[[i18nDynamic(locale, titleKey)]]</h1> <h1 class="fallback">[[i18nDynamic(locale, titleKey)]]</h1>
</slot> </slot>
</div> </div>
<div id="oobe-subtitle" class="slot-container layout vertical"> <div id="oobe-subtitle" class="slot-container layout vertical">
<slot name="subtitle"> <slot name="subtitle">
<div>[[i18nDynamic(locale, subtitleKey)]]</div> <div class="fallback">[[i18nDynamic(locale, subtitleKey)]]</div>
</slot> </slot>
</div> </div>
<div id="oobe-progress" class="slot-container layout vertical"> <div id="oobe-progress" class="slot-container layout vertical">
......
...@@ -14,7 +14,8 @@ ...@@ -14,7 +14,8 @@
width: 512px; width: 512px;
} }
#help-dialog-title ::slotted(h1) { #help-dialog-title ::slotted(h1),
#help-dialog-title .fallback {
color: var(--oobe-header-text-color); color: var(--oobe-header-text-color);
@apply --oobe-help-dialog-header-font; @apply --oobe-help-dialog-header-font;
margin: 0; margin: 0;
......
...@@ -27,7 +27,7 @@ The dialog provides two properties that can be set directly from HTML. ...@@ -27,7 +27,7 @@ The dialog provides two properties that can be set directly from HTML.
<!-- Title --> <!-- Title -->
<div id="help-dialog-title"> <div id="help-dialog-title">
<slot name="title"> <slot name="title">
<h1>[[i18nDynamic(locale, titleKey)]]</h1> <h1 class="fallback">[[i18nDynamic(locale, titleKey)]]</h1>
</slot> </slot>
</div> </div>
<!-- Content to be shown --> <!-- Content to be shown -->
......
...@@ -6,11 +6,11 @@ ...@@ -6,11 +6,11 @@
margin: 0 4px; /* So that two adjacent buttons are 8px separated. */ margin: 0 4px; /* So that two adjacent buttons are 8px separated. */
} }
/* Default slot data is not selected by ::slotted() selector, see /*
* https://crbug.com/703984. * TODO(https://crbug.com/703984): remove the fallback class when fixed.
*/ */
:host ::slotted(*), :host ::slotted(*),
#text { .fallback {
font-family: var(--oobe-button-font-family); font-family: var(--oobe-button-font-family);
font-size: 12px; font-size: 12px;
} }
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