Commit 178575e5 authored by Esmael El-Moslimany's avatar Esmael El-Moslimany Committed by Commit Bot

WebUI: wrap CSS <style>'s include attribute

The issue https://github.com/Polymer/polymer/pull/3668 was fixed in
Polymer 2. We can now wrap the <style> include attribute value if the
80 character line limit has been reached.

Change-Id: I77d992e260d8ce203759b9cd1015438ac427990a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1639043Reviewed-by: default avatarDemetrios Papadopoulos <dpapad@chromium.org>
Commit-Queue: Esmael El-Moslimany <aee@chromium.org>
Cr-Commit-Position: refs/heads/master@{#665664}
parent 43043c98
...@@ -14,9 +14,8 @@ ...@@ -14,9 +14,8 @@
<dom-module id="audio-settings"> <dom-module id="audio-settings">
<template> <template>
<!-- TODO(michaelpg): Wrap the line below to fit within the 80-char limit. <style include="device-emulator-shared-styles cr-shared-style iron-flex
See https://github.com/Polymer/polymer/pull/3668. --> iron-flex-alignment iron-positioning">
<style include="device-emulator-shared-styles cr-shared-style iron-flex iron-flex-alignment iron-positioning">
</style> </style>
<cr-dialog id="editDialog"> <cr-dialog id="editDialog">
<div slot="title">[[currentEditableObject.deviceName]]</div> <div slot="title">[[currentEditableObject.deviceName]]</div>
......
...@@ -14,9 +14,8 @@ ...@@ -14,9 +14,8 @@
<dom-module id="bluetooth-settings"> <dom-module id="bluetooth-settings">
<template> <template>
<!-- TODO(michaelpg): Wrap the line below to fit within the 80-char limit. <style include="device-emulator-shared-styles cr-shared-style iron-flex
See https://github.com/Polymer/polymer/pull/3668. --> iron-flex-alignment iron-positioning">
<style include="device-emulator-shared-styles cr-shared-style iron-flex iron-flex-alignment iron-positioning">
</style> </style>
<cr-dialog id="editDialog"> <cr-dialog id="editDialog">
<div slot="title">[[currentEditableObject.alias]]</div> <div slot="title">[[currentEditableObject.alias]]</div>
......
...@@ -17,9 +17,8 @@ ...@@ -17,9 +17,8 @@
<dom-module id="device-emulator-pages"> <dom-module id="device-emulator-pages">
<template> <template>
<!-- TODO(michaelpg): Wrap the line below to fit within the 80-char limit. <style include="device-emulator-shared-styles iron-flex iron-flex-alignment
See https://github.com/Polymer/polymer/pull/3668. --> iron-positioning">
<style include="device-emulator-shared-styles iron-flex iron-flex-alignment iron-positioning">
:host { :host {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
......
...@@ -9,9 +9,8 @@ ...@@ -9,9 +9,8 @@
<dom-module id="input-device-settings"> <dom-module id="input-device-settings">
<template> <template>
<!-- TODO(michaelpg): Wrap the line below to fit within the 80-char limit. <style include="device-emulator-shared-styles iron-flex iron-flex-alignment
See https://github.com/Polymer/polymer/pull/3668. --> iron-positioning">
<style include="device-emulator-shared-styles iron-flex iron-flex-alignment iron-positioning">
.content > *:not(:first-child) { .content > *:not(:first-child) {
margin-top: 10px; margin-top: 10px;
} }
......
...@@ -13,7 +13,8 @@ ...@@ -13,7 +13,8 @@
<dom-module id="print-preview-advanced-settings-item"> <dom-module id="print-preview-advanced-settings-item">
<template> <template>
<style include="print-preview-shared md-select search-highlight-style cr-hidden-style"> <style include="print-preview-shared md-select search-highlight-style
cr-hidden-style">
:host { :host {
display: flex; display: flex;
min-height: 54px; min-height: 54px;
......
...@@ -35,7 +35,8 @@ ...@@ -35,7 +35,8 @@
<dom-module id="print-preview-destination-dialog"> <dom-module id="print-preview-destination-dialog">
<template> <template>
<style include="print-preview-shared action-link md-select cr-hidden-style throbber paper-button-style"> <style include="print-preview-shared action-link md-select cr-hidden-style
throbber paper-button-style">
#dialog { #dialog {
--cr-dialog-native: { --cr-dialog-native: {
height: calc(100vh - 2 * var(--print-preview-dialog-margin)); height: calc(100vh - 2 * var(--print-preview-dialog-margin));
......
...@@ -16,7 +16,8 @@ ...@@ -16,7 +16,8 @@
<dom-module id="print-preview-provisional-destination-resolver"> <dom-module id="print-preview-provisional-destination-resolver">
<template> <template>
<style include="print-preview-shared paper-button-style cr-hidden-style throbber"> <style include="print-preview-shared paper-button-style cr-hidden-style
throbber">
#dialog { #dialog {
--cr-dialog-native: { --cr-dialog-native: {
height: -webkit-fit-content; height: -webkit-fit-content;
......
...@@ -20,7 +20,8 @@ ...@@ -20,7 +20,8 @@
<dom-module id="network-proxy-section"> <dom-module id="network-proxy-section">
<template> <template>
<style include="internet-shared cr-hidden-style iron-flex iron-flex-alignment"> <style include="internet-shared cr-hidden-style iron-flex
iron-flex-alignment">
cr-policy-network-indicator { cr-policy-network-indicator {
margin-inline-end: 10px; margin-inline-end: 10px;
} }
......
...@@ -9,7 +9,8 @@ ...@@ -9,7 +9,8 @@
<!-- Common styles for Material Design settings. --> <!-- Common styles for Material Design settings. -->
<dom-module id="settings-shared"> <dom-module id="settings-shared">
<template> <template>
<style include="settings-icons paper-button-style cr-shared-style search-highlight-style"> <style include="settings-icons paper-button-style cr-shared-style
search-highlight-style">
/* Prevent action-links from being selected to avoid accidental /* Prevent action-links from being selected to avoid accidental
* selection when trying to click it. */ * selection when trying to click it. */
a[is=action-link] { a[is=action-link] {
......
...@@ -9,7 +9,8 @@ ...@@ -9,7 +9,8 @@
<dom-module id="control-bar"> <dom-module id="control-bar">
<template> <template>
<style include="shared-styles iron-flex iron-flex-alignment iron-positioning"> <style include="shared-styles iron-flex iron-flex-alignment
iron-positioning">
#container { #container {
align-items: center; align-items: center;
min-height: 32px; min-height: 32px;
......
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