Commit 07482865 authored by Roman Sorokin's avatar Roman Sorokin Committed by Commit Bot

OOBE: Make welcome illustration shrinkable as well

Also center similar to other illustrations

Bug: 1019879
Change-Id: I864c425d46694d9370d48636daf996c8b27d657e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1939407Reviewed-by: default avatarDenis Kuznetsov [CET] <antrim@chromium.org>
Commit-Queue: Roman Sorokin [CET] <rsorokin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#719612}
parent 904c9146
...@@ -12,9 +12,6 @@ ...@@ -12,9 +12,6 @@
} }
.welcome-illustration { .welcome-illustration {
align-items: center;
justify-content: center;
margin: auto;
user-select: none; user-select: none;
} }
......
...@@ -61,26 +61,31 @@ ...@@ -61,26 +61,31 @@
<link rel="stylesheet" href="oobe_flex_layout.css"> <link rel="stylesheet" href="oobe_flex_layout.css">
<link rel="stylesheet" href="oobe_welcome_dialog.css"> <link rel="stylesheet" href="oobe_welcome_dialog.css">
<style include="cr-shared-style"></style> <style include="cr-shared-style"></style>
<oobe-dialog has-buttons> <oobe-dialog has-buttons footer-shrinkable>
<h1 slot="title" id="title"> <h1 slot="title" id="title">
[[i18nDynamic(locale, 'welcomeScreenGreeting')]] [[i18nDynamic(locale, 'welcomeScreenGreeting')]]
</h1> </h1>
<div slot="footer" class="welcome-illustration layout vertical"> <div slot="footer" class="welcome-illustration flex layout vertical center
center-justified">
<if expr="chromeos and _google_chrome"> <if expr="chromeos and _google_chrome">
<video muted hidden oobe_devices="chromebox" <video muted hidden oobe_devices="chromebox"
oobe_orientations="portrait,landscape" oobe_types="intro" oobe_orientations="portrait,landscape" oobe_types="intro"
class="oobe-illustration"
src="../../../internal/resources/chromeos/animations/oobe-welcome/chromebox_intro_2x.webm"> src="../../../internal/resources/chromeos/animations/oobe-welcome/chromebox_intro_2x.webm">
</video> </video>
<video muted loop hidden oobe_devices="chromebox" <video muted loop hidden oobe_devices="chromebox"
oobe_orientations="portrait,landscape" oobe_types="loop" oobe_orientations="portrait,landscape" oobe_types="loop"
class="oobe-illustration"
src="../../../internal/resources/chromeos/animations/oobe-welcome/chromebox_loop_2x.webm"> src="../../../internal/resources/chromeos/animations/oobe-welcome/chromebox_loop_2x.webm">
</video> </video>
<video muted hidden oobe_devices="laptop_G" <video muted hidden oobe_devices="laptop_G"
oobe_orientations="portrait,landscape" oobe_types="intro" oobe_orientations="portrait,landscape" oobe_types="intro"
class="oobe-illustration"
src="../../../internal/resources/chromeos/animations/oobe-welcome/laptop_G_intro_2x.webm"> src="../../../internal/resources/chromeos/animations/oobe-welcome/laptop_G_intro_2x.webm">
</video> </video>
<video muted loop hidden oobe_devices="laptop_G" <video muted loop hidden oobe_devices="laptop_G"
oobe_orientations="portrait,landscape" oobe_types="loop" oobe_orientations="portrait,landscape" oobe_types="loop"
class="oobe-illustration"
src="../../../internal/resources/chromeos/animations/oobe-welcome/laptop_G_loop_2x.webm"> src="../../../internal/resources/chromeos/animations/oobe-welcome/laptop_G_loop_2x.webm">
</video> </video>
<video muted hidden oobe_devices="laptop" <video muted hidden oobe_devices="laptop"
...@@ -89,22 +94,27 @@ ...@@ -89,22 +94,27 @@
</video> </video>
<video muted loop hidden oobe_devices="laptop" <video muted loop hidden oobe_devices="laptop"
oobe_orientations="portrait,landscape" oobe_types="loop" oobe_orientations="portrait,landscape" oobe_types="loop"
class="oobe-illustration"
src="../../../internal/resources/chromeos/animations/oobe-welcome/laptop_loop_2x.webm"> src="../../../internal/resources/chromeos/animations/oobe-welcome/laptop_loop_2x.webm">
</video> </video>
<video muted hidden oobe_devices="tablet_G" <video muted hidden oobe_devices="tablet_G"
oobe_orientations="portrait,landscape" oobe_types="intro" oobe_orientations="portrait,landscape" oobe_types="intro"
class="oobe-illustration"
src="../../../internal/resources/chromeos/animations/oobe-welcome/tablet_G_intro_2x.webm"> src="../../../internal/resources/chromeos/animations/oobe-welcome/tablet_G_intro_2x.webm">
</video> </video>
<video muted loop hidden oobe_devices="tablet_G" <video muted loop hidden oobe_devices="tablet_G"
oobe_orientations="portrait,landscape" oobe_types="loop" oobe_orientations="portrait,landscape" oobe_types="loop"
class="oobe-illustration"
src="../../../internal/resources/chromeos/animations/oobe-welcome/tablet_G_loop_2x.webm"> src="../../../internal/resources/chromeos/animations/oobe-welcome/tablet_G_loop_2x.webm">
</video> </video>
<video muted hidden oobe_devices="tablet" <video muted hidden oobe_devices="tablet"
oobe_orientations="portrait,landscape" oobe_types="intro" oobe_orientations="portrait,landscape" oobe_types="intro"
class="oobe-illustration"
src="../../../internal/resources/chromeos/animations/oobe-welcome/tablet_intro_2x.webm"> src="../../../internal/resources/chromeos/animations/oobe-welcome/tablet_intro_2x.webm">
</video> </video>
<video muted loop hidden oobe_devices="tablet" <video muted loop hidden oobe_devices="tablet"
oobe_orientations="portrait,landscape" oobe_types="loop" oobe_orientations="portrait,landscape" oobe_types="loop"
class="oobe-illustration"
src="../../../internal/resources/chromeos/animations/oobe-welcome/tablet_loop_2x.webm"> src="../../../internal/resources/chromeos/animations/oobe-welcome/tablet_loop_2x.webm">
</video> </video>
</if> </if>
......
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