Commit 80dea741 authored by Denis Kuznetsov's avatar Denis Kuznetsov Committed by Commit Bot

OOBE: Fix css styling for Polymer v2

By polymer specification all styling should be done inside <template>
element. Preprocessor embeds <link rel="stylesheet"> into resulting
HTML.

Bug: 955194
Change-Id: I91cbadf0b73cc771619a9041e2f7c662199f3740
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2010773
Commit-Queue: Denis Kuznetsov [CET] <antrim@chromium.org>
Reviewed-by: default avatarRoman Sorokin [CET] <rsorokin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#733441}
parent 67b67797
...@@ -5,14 +5,14 @@ ...@@ -5,14 +5,14 @@
<link rel="import" href="chrome://oobe/custom_elements.html"> <link rel="import" href="chrome://oobe/custom_elements.html">
<link rel="import" href="chrome://resources/cr_elements/cr_input/cr_input.html"> <link rel="import" href="chrome://resources/cr_elements/cr_input/cr_input.html">
<link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html"> <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
<link rel="stylesheet" href="gaia_card_parameters.css">
<dom-module id="enterprise-enrollment"> <dom-module id="enterprise-enrollment">
<template> <template>
<link rel="stylesheet" href="gaia_card_parameters.css">
<link rel="stylesheet" href="oobe_flex_layout.css">
<link rel="stylesheet" href="oobe_dialog_host.css">
<link rel="stylesheet" href="enterprise_enrollment.css">
<div id="oauth-enroll-step-contents"> <div id="oauth-enroll-step-contents">
<link rel="stylesheet" href="oobe_flex_layout.css">
<link rel="stylesheet" href="oobe_dialog_host.css">
<link rel="stylesheet" href="enterprise_enrollment.css">
<div id="step-signin" hidden$="[[!eq_(currentStep_, 'signin')]]"> <div id="step-signin" hidden$="[[!eq_(currentStep_, 'signin')]]">
<oobe-dialog class="gaia-dialog" role="dialog" <oobe-dialog class="gaia-dialog" role="dialog"
id="enrollment-gaia-dialog" has-buttons no-header id="enrollment-gaia-dialog" has-buttons no-header
......
...@@ -20,9 +20,8 @@ ...@@ -20,9 +20,8 @@
'disabled' - button is disabled when the attribute is set. 'disabled' - button is disabled when the attribute is set.
--> -->
<dom-module id="gaia-button"> <dom-module id="gaia-button">
<link rel="stylesheet" href="gaia_button.css">
<template> <template>
<link rel="stylesheet" href="gaia_button.css">
<cr-button id="button" disabled="[[disabled]]" on-click="onClick_" <cr-button id="button" disabled="[[disabled]]" on-click="onClick_"
noink$="[[link]]"> noink$="[[link]]">
<slot></slot> <slot></slot>
...@@ -45,9 +44,8 @@ ...@@ -45,9 +44,8 @@
'aria-label' - accessibility label. 'aria-label' - accessibility label.
--> -->
<dom-module id="gaia-icon-button"> <dom-module id="gaia-icon-button">
<link rel="stylesheet" href="gaia_icon_button.css">
<template> <template>
<link rel="stylesheet" href="gaia_icon_button.css">
<div> <div>
<cr-icon-button id="iconButton" iron-icon="[[icon]]" on-click="onClick_" <cr-icon-button id="iconButton" iron-icon="[[icon]]" on-click="onClick_"
disabled="[[disabled]]" aria-label$="[[ariaLabel]]"></cr-icon-button> disabled="[[disabled]]" aria-label$="[[ariaLabel]]"></cr-icon-button>
......
...@@ -24,10 +24,9 @@ ...@@ -24,10 +24,9 @@
with class |footer|. with class |footer|.
--> -->
<dom-module id="gaia-card"> <dom-module id="gaia-card">
<link rel="stylesheet" href="gaia_card.css">
<link rel="stylesheet" href="oobe_flex_layout.css">
<template> <template>
<link rel="stylesheet" href="gaia_card.css">
<link rel="stylesheet" href="oobe_flex_layout.css">
<div class="gaia-header vertical layout relative"> <div class="gaia-header vertical layout relative">
<div class="header-container flex vertical layout relative"> <div class="header-container flex vertical layout relative">
<slot name="header"></slot> <slot name="header"></slot>
......
...@@ -15,10 +15,9 @@ ...@@ -15,10 +15,9 @@
'email' - displayed email. 'email' - displayed email.
--> -->
<dom-module id="gaia-header"> <dom-module id="gaia-header">
<link rel="stylesheet" href="gaia_header.css">
<link rel="stylesheet" href="oobe_flex_layout.css">
<template> <template>
<link rel="stylesheet" href="gaia_header.css">
<link rel="stylesheet" href="oobe_flex_layout.css">
<img src="chrome://theme/IDR_LOGO_AVATAR_CIRCLE_BLUE_COLOR" alt <img src="chrome://theme/IDR_LOGO_AVATAR_CIRCLE_BLUE_COLOR" alt
class="self-start"> class="self-start">
<div id="email"><span>[[email]]<span></div> <div id="email"><span>[[email]]<span></div>
......
...@@ -39,10 +39,9 @@ ...@@ -39,10 +39,9 @@
'isInvalid' at the end. 'isInvalid' at the end.
--> -->
<dom-module id="gaia-input"> <dom-module id="gaia-input">
<link rel="stylesheet" href="gaia_input.css">
<link rel="stylesheet" href="oobe_flex_layout.css">
<template> <template>
<link rel="stylesheet" href="gaia_input.css">
<link rel="stylesheet" href="oobe_flex_layout.css">
<paper-input-container id="decorator" on-tap="onTap" <paper-input-container id="decorator" on-tap="onTap"
invalid="{{isInvalid}}" disabled$="[[disabled]]"> invalid="{{isInvalid}}" disabled$="[[disabled]]">
<label slot="label"> <label slot="label">
......
...@@ -24,10 +24,9 @@ ...@@ -24,10 +24,9 @@
--> -->
<dom-module id="gaia-input-form"> <dom-module id="gaia-input-form">
<link rel="stylesheet" href="gaia_input_form.css">
<link rel="stylesheet" href="oobe_flex_layout.css">
<template> <template>
<link rel="stylesheet" href="gaia_input_form.css">
<link rel="stylesheet" href="oobe_flex_layout.css">
<div on-keydown="onKeyDown_"> <div on-keydown="onKeyDown_">
<slot id="inputs" name="inputs"></slot> <slot id="inputs" name="inputs"></slot>
<div class="horizontal-reverse justified layout center"> <div class="horizontal-reverse justified layout center">
......
...@@ -42,11 +42,10 @@ ...@@ -42,11 +42,10 @@
--> -->
<dom-module id="gaia-password-changed"> <dom-module id="gaia-password-changed">
<link rel="stylesheet" href="gaia_password_changed.css">
<link rel="stylesheet" href="oobe_flex_layout.css">
<link rel="stylesheet" href="gaia_card_parameters.css">
<template> <template>
<link rel="stylesheet" href="gaia_password_changed.css">
<link rel="stylesheet" href="oobe_flex_layout.css">
<link rel="stylesheet" href="gaia_card_parameters.css">
<neon-animated-pages id="animatedPages" class="fit" <neon-animated-pages id="animatedPages" class="fit"
entry-animation="fade-in-animation" exit-animation="fade-out-animation" entry-animation="fade-in-animation" exit-animation="fade-out-animation"
on-neon-animation-finish="onAnimationFinish_" selected="0"> on-neon-animation-finish="onAnimationFinish_" selected="0">
......
...@@ -37,10 +37,9 @@ ...@@ -37,10 +37,9 @@
--> -->
<dom-module id="navigation-bar"> <dom-module id="navigation-bar">
<link rel="stylesheet" href="navigation_bar.css">
<link rel="stylesheet" href="oobe_flex_layout.css">
<template> <template>
<link rel="stylesheet" href="navigation_bar.css">
<link rel="stylesheet" href="oobe_flex_layout.css">
<div class="fit layout horizontal center"> <div class="fit layout horizontal center">
<gaia-icon-button id="backButton" icon="navigation-bar:arrow-back" <gaia-icon-button id="backButton" icon="navigation-bar:arrow-back"
hidden="[[!backVisible]]" disabled="[[disabled]]" on-tap="onBack_" hidden="[[!backVisible]]" disabled="[[disabled]]" on-tap="onBack_"
......
...@@ -3,17 +3,16 @@ ...@@ -3,17 +3,16 @@
<link rel="import" href="chrome://resources/cr_components/chromeos/network/onc_mojo.html"> <link rel="import" href="chrome://resources/cr_components/chromeos/network/onc_mojo.html">
<dom-module id="network-select-login"> <dom-module id="network-select-login">
<style>
:host {
display: inline-flex;
min-height: 0;
}
#networkSelect {
flex: 1;
}
</style>
<template> <template>
<style>
:host {
display: inline-flex;
}
#networkSelect {
flex: 1;
}
</style>
<network-select id="networkSelect" class="focus-on-show" <network-select id="networkSelect" class="focus-on-show"
show-scan-progress show-scan-progress
custom-items="[[getNetworkCustomItems_(isConnected)]]" custom-items="[[getNetworkCustomItems_(isConnected)]]"
......
...@@ -38,10 +38,9 @@ ...@@ -38,10 +38,9 @@
--> -->
<dom-module id="notification-card"> <dom-module id="notification-card">
<link rel="stylesheet" href="notification_card.css">
<link rel="stylesheet" href="oobe_flex_layout.css">
<template> <template>
<link rel="stylesheet" href="notification_card.css">
<link rel="stylesheet" href="oobe_flex_layout.css">
<div id="container" class="vertical layout center fit"> <div id="container" class="vertical layout center fit">
<div class="flex vertical layout center center-justified"> <div class="flex vertical layout center center-justified">
<template is="dom-if" if="[[type]]"> <template is="dom-if" if="[[type]]">
......
...@@ -39,10 +39,9 @@ ...@@ -39,10 +39,9 @@
entered password is incorrect. entered password is incorrect.
--> -->
<dom-module id="offline-gaia"> <dom-module id="offline-gaia">
<link rel="stylesheet" href="offline_gaia.css">
<template> <template>
<style include="cr-shared-style"></style> <style include="cr-shared-style"></style>
<link rel="stylesheet" href="offline_gaia.css">
<link rel="stylesheet" href="oobe_flex_layout.css"> <link rel="stylesheet" href="oobe_flex_layout.css">
<link rel="stylesheet" href="oobe_dialog_host.css"> <link rel="stylesheet" href="oobe_dialog_host.css">
<link rel="stylesheet" href="gaia_card_parameters.css"> <link rel="stylesheet" href="gaia_card_parameters.css">
......
...@@ -41,11 +41,10 @@ ...@@ -41,11 +41,10 @@
'focus' - If the current card is the first one, focuses password input. 'focus' - If the current card is the first one, focuses password input.
--> -->
<dom-module id="saml-confirm-password"> <dom-module id="saml-confirm-password">
<link rel="stylesheet" href="oobe_flex_layout.css">
<link rel="stylesheet" href="saml_confirm_password.css">
<link rel="stylesheet" href="gaia_card_parameters.css">
<template> <template>
<link rel="stylesheet" href="oobe_flex_layout.css">
<link rel="stylesheet" href="saml_confirm_password.css">
<link rel="stylesheet" href="gaia_card_parameters.css">
<style include="cr-shared-style"> <style include="cr-shared-style">
.cancel-button { .cancel-button {
margin-inline-end: 0; margin-inline-end: 0;
......
...@@ -3,11 +3,10 @@ ...@@ -3,11 +3,10 @@
found in the LICENSE file. --> found in the LICENSE file. -->
<dom-module id="gaia-signin"> <dom-module id="gaia-signin">
<link rel="stylesheet" href="oobe_dialog_host.css">
<link rel="stylesheet" href="oobe_flex_layout.css">
<link rel="stylesheet" href="screen_gaia_signin.css">
<template> <template>
<link rel="stylesheet" href="oobe_dialog_host.css">
<link rel="stylesheet" href="oobe_flex_layout.css">
<link rel="stylesheet" href="screen_gaia_signin.css">
<oobe-dialog id="signin-frame-dialog" class="gaia-dialog" role="dialog" <oobe-dialog id="signin-frame-dialog" class="gaia-dialog" role="dialog"
has-buttons no-header no-footer-padding has-buttons no-header no-footer-padding
show-buttons-overlay="[[!navigationEnabled_]]" show-buttons-overlay="[[!navigationEnabled_]]"
......
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