Revert "WebUI: Break long style lines, remove addressed TODO."

This reverts commit aafc53d. Reason for revert: Caused style breakages, that only happen "optimize_webui = true", see crbug.com/796824 and crbug.com/796832. Original change's description: > WebUI: Break long style lines, remove addressed TODO. > > As of Polymer 1.11.2, breaking lines within style include="..." attributes is > allowed, see [1]. Removing obsolete TODOs. > > [1] Polymer/polymer#4902 > > Bug: None > Change-Id: I0156300cf60ed3d7af76ef755532b69aa0280704 > Reviewed-on: https://chromium-review.googlesource.com/833371 > Commit-Queue: Demetrios Papadopoulos <[email protected]> > Reviewed-by: Michael Giuffrida <[email protected]> > Cr-Commit-Position: refs/heads/master@{#525396} [email protected],[email protected] # Not skipping CQ checks because original CL landed > 1 day ago. Bug: 796824,796832 Change-Id: I85b9dd80b4fe15748d2339a04400073c9fafca12 Reviewed-on: https://chromium-review.googlesource.com/840802 Reviewed-by: Demetrios Papadopoulos <[email protected]> Commit-Queue: Demetrios Papadopoulos <[email protected]> Cr-Commit-Position: refs/heads/master@{#525840}
mirror · Dec 21, 2017 · fe4e2da · fe4e2da
1 parent ced3e25
commit fe4e2da
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 15 deletions.
diff --git a/chrome/browser/resources/chromeos/emulator/audio_settings.html b/chrome/browser/resources/chromeos/emulator/audio_settings.html
@@ -14,8 +14,9 @@
 
 <dom-module id="audio-settings">
   <template>
-    <style include="device-emulator-shared-styles cr-shared-style iron-flex
-        iron-flex-alignment iron-positioning">
+    <!-- TODO(michaelpg): Wrap the line below to fit within the 80-char limit.
+         See https://github.com/Polymer/polymer/pull/3668. -->
+    <style include="device-emulator-shared-styles cr-shared-style iron-flex iron-flex-alignment iron-positioning">
     </style>
     <dialog is="cr-dialog" id="editDialog">
       <div slot="title">[[currentEditableObject.deviceName]]</div>

diff --git a/chrome/browser/resources/chromeos/emulator/battery_settings.html b/chrome/browser/resources/chromeos/emulator/battery_settings.html
@@ -13,6 +13,8 @@
 
 <dom-module id="battery-settings">
   <template>
+    <!-- TODO(michaelpg): Wrap the line below to fit within the 80-char limit.
+         See https://github.com/Polymer/polymer/pull/3668. -->
     <style include="device-emulator-shared-styles iron-flex iron-flex-alignment
         iron-positioning md-select">
     </style>

diff --git a/chrome/browser/resources/chromeos/emulator/bluetooth_settings.html b/chrome/browser/resources/chromeos/emulator/bluetooth_settings.html
@@ -14,8 +14,9 @@
 
 <dom-module id="bluetooth-settings">
   <template>
-    <style include="device-emulator-shared-styles cr-shared-style iron-flex
-        iron-flex-alignment iron-positioning">
+    <!-- TODO(michaelpg): Wrap the line below to fit within the 80-char limit.
+         See https://github.com/Polymer/polymer/pull/3668. -->
+    <style include="device-emulator-shared-styles cr-shared-style iron-flex iron-flex-alignment iron-positioning">
     </style>
     <dialog is="cr-dialog" id="editDialog">
       <div slot="title">[[currentEditableObject.alias]]</div>

diff --git a/chrome/browser/resources/chromeos/emulator/device_emulator_pages.html b/chrome/browser/resources/chromeos/emulator/device_emulator_pages.html
@@ -21,8 +21,9 @@
 
 <dom-module id="device-emulator-pages">
   <template>
-    <style include="device-emulator-shared-styles iron-flex iron-flex-alignment
-        iron-positioning">
+    <!-- TODO(michaelpg): Wrap the line below to fit within the 80-char limit.
+         See https://github.com/Polymer/polymer/pull/3668. -->
+    <style include="device-emulator-shared-styles iron-flex iron-flex-alignment iron-positioning">
       :host {
         display: flex;
         flex-direction: column;

diff --git a/chrome/browser/resources/chromeos/emulator/input_device_settings.html b/chrome/browser/resources/chromeos/emulator/input_device_settings.html
@@ -7,8 +7,9 @@
 
 <dom-module id="input-device-settings">
   <template>
-    <style include="device-emulator-shared-styles iron-flex iron-flex-alignment
-         iron-positioning">
+    <!-- TODO(michaelpg): Wrap the line below to fit within the 80-char limit.
+         See https://github.com/Polymer/polymer/pull/3668. -->
+    <style include="device-emulator-shared-styles iron-flex iron-flex-alignment iron-positioning">
       .content > *:not(:first-child) {
         margin-top: 10px;
       }

diff --git a/chrome/browser/resources/md_extensions/detail_view.html b/chrome/browser/resources/md_extensions/detail_view.html
@@ -25,8 +25,7 @@
 
 <dom-module id="extensions-detail-view">
   <template>
-    <style include="iron-flex cr-shared-style cr-icons action-link
-        paper-button-style">
+    <style include="iron-flex cr-shared-style cr-icons action-link paper-button-style">
       :host {
         --iron-icon-fill-color: var(--paper-grey-600);
         display: block;
@@ -182,8 +181,8 @@
       }
 
       #size {
-        align-items: center;
         display: flex;
+        align-items: center;
       }
 
       paper-spinner-lite {

diff --git a/chrome/browser/resources/settings/internet_page/network_proxy_section.html b/chrome/browser/resources/settings/internet_page/network_proxy_section.html
@@ -20,8 +20,7 @@
 
 <dom-module id="network-proxy-section">
   <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 {
         -webkit-margin-end: 10px;
       }

diff --git a/chrome/browser/resources/settings/settings_shared_css.html b/chrome/browser/resources/settings/settings_shared_css.html
@@ -11,8 +11,7 @@
 <!-- Common styles for Material Design settings. -->
 <dom-module id="settings-shared">
   <template>
-    <style include="settings-icons paper-button-style paper-checkbox-style
-        paper-input-style paper-toggle-style cr-shared-style">
+    <style include="settings-icons paper-button-style paper-checkbox-style paper-input-style paper-toggle-style cr-shared-style">
       /* Prevent action-links from being selected to avoid accidental
        * selection when trying to click it. */
       a[is=action-link] {