Commit c9758e26 authored by Alexander Alekseev's avatar Alexander Alekseev Committed by Commit Bot

Chrome OS OOBE: Fix Polymer layout classes for OOBE.

This Cl prepares for bug 596743 and has fixes to clear for
https://chromium-review.googlesource.com/c/chromium/src/+/1269235 landing.

Bug: 892757
Change-Id: I9858ec633158310c805430f1f070b5cff730f94f
Reviewed-on: https://chromium-review.googlesource.com/c/1282462
Commit-Queue: Alexander Alekseev <alemate@chromium.org>
Reviewed-by: default avatarWenzhao (Colin) Zang <wzang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#600149}
parent 15e3a60b
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
<dom-module id="discover-card"> <dom-module id="discover-card">
<template> <template>
<style include="iron-flex iron-flex-alignment iron-positioning"></style> <style include="iron-flex iron-flex-alignment iron-positioning"></style>
<link rel="stylesheet" href="../oobe_iron_flex_layout_fix.css">
<link rel="stylesheet" href="../oobe_fonts.css"> <link rel="stylesheet" href="../oobe_fonts.css">
<link rel="stylesheet" href="discover_card.css"> <link rel="stylesheet" href="discover_card.css">
<div class="fit layout vertical center end-justified"> <div class="fit layout vertical center end-justified">
......
<link rel="import" href="chrome://resources/html/i18n_behavior.html"> <link rel="import" href="chrome://resources/html/i18n_behavior.html">
<link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-flex-layout-classes.html">
<!-- <!--
Discover App object. Manages all Discover UI behavior. Discover App object. Manages all Discover UI behavior.
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
<style <style
include="iron-flex iron-flex-alignment iron-positioning paper-button-style cr-icons cr-shared-style"> include="iron-flex iron-flex-alignment iron-positioning paper-button-style cr-icons cr-shared-style">
</style> </style>
<link rel="stylesheet" href="../oobe_iron_flex_layout_fix.css">
<oobe-dialog id="discoverWelcome" role="dialog" no-header no-footer-padding <oobe-dialog id="discoverWelcome" role="dialog" no-header no-footer-padding
aria-label$="[[i18nDynamic(locale, 'discoverWelcomeTitle')]]"> aria-label$="[[i18nDynamic(locale, 'discoverWelcomeTitle')]]">
<div slot="footer" class="flex layout vertical center"> <div slot="footer" class="flex layout vertical center">
......
<link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-flex-layout-classes.html">
<link rel="import" href="chrome://resources/cr_elements/shared_style_css.html"> <link rel="import" href="chrome://resources/cr_elements/shared_style_css.html">
<link rel="import" href="chrome://resources/html/i18n_behavior.html"> <link rel="import" href="chrome://resources/html/i18n_behavior.html">
......
...@@ -62,6 +62,7 @@ ...@@ -62,6 +62,7 @@
<style include="iron-flex iron-flex-alignment iron-positioning <style include="iron-flex iron-flex-alignment iron-positioning
cr-shared-style"> cr-shared-style">
</style> </style>
<link rel="stylesheet" href="../../oobe_iron_flex_layout_fix.css">
<style include="settings-shared"></style> <style include="settings-shared"></style>
<link rel="stylesheet" href="discover_module_pin_setup.css"> <link rel="stylesheet" href="discover_module_pin_setup.css">
<oobe-dialog id="loading" role="dialog" no-header no-footer-padding <oobe-dialog id="loading" role="dialog" no-header no-footer-padding
......
<link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-flex-layout-classes.html">
<link rel="import" href="chrome://resources/cr_elements/shared_style_css.html"> <link rel="import" href="chrome://resources/cr_elements/shared_style_css.html">
<link rel="import" href="chrome://resources/html/i18n_behavior.html"> <link rel="import" href="chrome://resources/html/i18n_behavior.html">
......
<link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-flex-layout-classes.html">
<link rel="import" href="chrome://resources/cr_elements/shared_style_css.html"> <link rel="import" href="chrome://resources/cr_elements/shared_style_css.html">
<link rel="import" href="chrome://resources/html/i18n_behavior.html"> <link rel="import" href="chrome://resources/html/i18n_behavior.html">
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
<style <style
include="shared-style iron-flex iron-flex-alignment iron-positioning"> include="shared-style iron-flex iron-flex-alignment iron-positioning">
</style> </style>
<link rel="stylesheet" href="oobe_iron_flex_layout_fix.css">
<oobe-dialog id="license-selection-prompt-card" has-buttons> <oobe-dialog id="license-selection-prompt-card" has-buttons>
<hd-iron-icon slot="oobe-icon" <hd-iron-icon slot="oobe-icon"
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
<dom-module id="hd-iron-icon"> <dom-module id="hd-iron-icon">
<template> <template>
<style include="iron-flex iron-flex-alignment iron-positioning"></style> <style include="iron-flex iron-flex-alignment iron-positioning"></style>
<link rel="stylesheet" href="oobe_iron_flex_layout_fix.css">
<link rel="stylesheet" href="hd-iron-icon.css"> <link rel="stylesheet" href="hd-iron-icon.css">
<div class="flex layout vertical"> <div class="flex layout vertical">
<iron-icon id="icon1x" icon="[[icon1x]]"></iron-icon> <iron-icon id="icon1x" icon="[[icon1x]]"></iron-icon>
......
...@@ -48,6 +48,7 @@ ...@@ -48,6 +48,7 @@
<template> <template>
<style include="md-select iron-flex iron-flex-alignment iron-positioning"> <style include="md-select iron-flex iron-flex-alignment iron-positioning">
</style> </style>
<link rel="stylesheet" href="oobe_iron_flex_layout_fix.css">
<link rel="stylesheet" href="offline_ad_login.css"> <link rel="stylesheet" href="offline_ad_login.css">
<oobe-dialog id="unlockStep" hidden="[[!unlockPasswordStep]]" <oobe-dialog id="unlockStep" hidden="[[!unlockPasswordStep]]"
aria-label$="[[adWelcomeMessage]]" has-buttons> aria-label$="[[adWelcomeMessage]]" has-buttons>
......
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
<style <style
include="shared-style iron-flex iron-flex-alignment iron-positioning"> include="shared-style iron-flex iron-flex-alignment iron-positioning">
</style> </style>
<link rel="stylesheet" href="oobe_iron_flex_layout_fix.css">
<div id="elementBox" class="layout horizontal"> <div id="elementBox" class="layout horizontal">
<div class="flex layout vertical center-justified"> <div class="flex layout vertical center-justified">
<div id="titleContainer"> <div id="titleContainer">
......
...@@ -53,6 +53,7 @@ ...@@ -53,6 +53,7 @@
<dom-module id="oobe-text-button"> <dom-module id="oobe-text-button">
<template> <template>
<style include="iron-flex iron-flex-alignment iron-positioning"></style> <style include="iron-flex iron-flex-alignment iron-positioning"></style>
<link rel="stylesheet" href="oobe_iron_flex_layout_fix.css">
<style include="paper-button-style cr-icons cr-shared-style"></style> <style include="paper-button-style cr-icons cr-shared-style"></style>
<link rel="stylesheet" href="oobe_fonts.css"> <link rel="stylesheet" href="oobe_fonts.css">
<link rel="stylesheet" href="oobe_text_buttons.css"> <link rel="stylesheet" href="oobe_text_buttons.css">
...@@ -88,6 +89,7 @@ ...@@ -88,6 +89,7 @@
<dom-module id="oobe-back-button"> <dom-module id="oobe-back-button">
<template> <template>
<style include="iron-flex iron-flex-alignment iron-positioning"></style> <style include="iron-flex iron-flex-alignment iron-positioning"></style>
<link rel="stylesheet" href="oobe_iron_flex_layout_fix.css">
<style include="paper-button-style cr-icons cr-shared-style"></style> <style include="paper-button-style cr-icons cr-shared-style"></style>
<link rel="stylesheet" href="oobe_fonts.css"> <link rel="stylesheet" href="oobe_fonts.css">
<link rel="stylesheet" href="oobe_text_buttons.css"> <link rel="stylesheet" href="oobe_text_buttons.css">
...@@ -110,6 +112,7 @@ ...@@ -110,6 +112,7 @@
<dom-module id="oobe-next-button"> <dom-module id="oobe-next-button">
<template> <template>
<style include="iron-flex iron-flex-alignment iron-positioning"></style> <style include="iron-flex iron-flex-alignment iron-positioning"></style>
<link rel="stylesheet" href="oobe_iron_flex_layout_fix.css">
<style include="paper-button-style cr-icons cr-shared-style"></style> <style include="paper-button-style cr-icons cr-shared-style"></style>
<link rel="stylesheet" href="oobe_fonts.css"> <link rel="stylesheet" href="oobe_fonts.css">
<link rel="stylesheet" href="oobe_text_buttons.css"> <link rel="stylesheet" href="oobe_text_buttons.css">
...@@ -146,6 +149,7 @@ ...@@ -146,6 +149,7 @@
<dom-module id="oobe-welcome-secondary-button"> <dom-module id="oobe-welcome-secondary-button">
<template> <template>
<style include="iron-flex iron-flex-alignment iron-positioning"></style> <style include="iron-flex iron-flex-alignment iron-positioning"></style>
<link rel="stylesheet" href="oobe_iron_flex_layout_fix.css">
<style include="paper-button-style cr-icons cr-shared-style"></style> <style include="paper-button-style cr-icons cr-shared-style"></style>
<link rel="stylesheet" href="oobe_fonts.css"> <link rel="stylesheet" href="oobe_fonts.css">
<link rel="stylesheet" href="oobe_text_buttons.css"> <link rel="stylesheet" href="oobe_text_buttons.css">
......
/* Copyright 2018 The Chromium Authors. All rights reserved.
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file. */
/**
* This fixes the issue with polymer 1.0 layout classes.
* (see https://crbug.com/892757)
*/
.layout.horizontal,
.layout.horizontal-reverse,
.layout.inline,
.layout.vertical,
.layout.vertical-reverse {
min-height: 0;
}
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