Commit fdeeb64b authored by Kyle Horimoto's avatar Kyle Horimoto Committed by Commit Bot

[CrOS MultiDevice] Use hybrid @apply syntax.

This CL changes "@apply(--foo);" to "@apply --foo;" for all affected
MultiDevice CSS. See [1] and [2] for context.

[1] https://www.polymer-project.org/2.0/docs/upgrade#shadow-dom-styles
[2] https://bugs.chromium.org/p/chromium/issues/detail?id=739532

Bug: 884058
Change-Id: Id7a0c3e479cae58bfea736093883c92ae44f1d61
Reviewed-on: https://chromium-review.googlesource.com/1242055Reviewed-by: default avatarDemetrios Papadopoulos <dpapad@chromium.org>
Commit-Queue: Kyle Horimoto <khorimoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#593781}
parent 95cbfdf9
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
} }
#feature-items-container { #feature-items-container {
@apply(--settings-list-frame-padding); @apply --settings-list-frame-padding;
} }
#forget-device-container { #forget-device-container {
......
...@@ -9,12 +9,12 @@ on the MultiDeviceSetup.uiMode property. --> ...@@ -9,12 +9,12 @@ on the MultiDeviceSetup.uiMode property. -->
<template> <template>
<style include="multidevice-setup-shared"> <style include="multidevice-setup-shared">
:host { :host {
@apply(--layout-end-justified); @apply --layout-end-justified;
@apply(--layout-horizontal); @apply --layout-horizontal;
} }
paper-button { paper-button {
@apply(--layout-center-center); @apply --layout-center-center;
text-transform: none; text-transform: none;
} }
</style> </style>
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<template> <template>
<style include="multidevice-setup-shared"> <style include="multidevice-setup-shared">
:host { :host {
@apply(--layout-vertical); @apply --layout-vertical;
box-sizing: border-box; box-sizing: border-box;
height: 100%; height: 100%;
padding: 60px 64px 32px 64px; padding: 60px 64px 32px 64px;
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<template> <template>
<style include="multidevice-setup-shared"> <style include="multidevice-setup-shared">
#user-info-container { #user-info-container {
@apply(--layout-horizontal); @apply --layout-horizontal;
border: 1px solid rgb(95, 99, 104); border: 1px solid rgb(95, 99, 104);
border-radius: 15px; border-radius: 15px;
color: rgb(95, 99, 104); color: rgb(95, 99, 104);
......
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
<template> <template>
<style include="multidevice-setup-shared"> <style include="multidevice-setup-shared">
#page-icon-container { #page-icon-container {
@apply(--layout-horizontal); @apply --layout-horizontal;
@apply(--layout-center-justified); @apply --layout-center-justified;
} }
#page-icon { #page-icon {
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<template> <template>
<style include="multidevice-setup-shared"> <style include="multidevice-setup-shared">
#selector-and-details-container { #selector-and-details-container {
@apply(--layout-horizontal); @apply --layout-horizontal;
} }
#deviceDropdown { #deviceDropdown {
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
} }
#page-icon-container { #page-icon-container {
@apply(--layout-horizontal); @apply --layout-horizontal;
@apply(--layout-center-justified); @apply --layout-center-justified;
} }
#page-icon { #page-icon {
...@@ -41,8 +41,8 @@ ...@@ -41,8 +41,8 @@
} }
.feature-detail { .feature-detail {
@apply(--layout-horizontal); @apply --layout-horizontal;
@apply(--layout-center); @apply --layout-center;
padding-bottom: 28px; padding-bottom: 28px;
padding-top: 21px; padding-top: 21px;
} }
......
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