Skip to content
This repository was archived by the owner on Jul 18, 2018. It is now read-only.

Commit

Permalink
WebUI: Break long style lines, remove addressed TODO.
Browse files Browse the repository at this point in the history
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}
  • Loading branch information
freshp86 authored and Commit Bot committed Dec 20, 2017
1 parent 831bb75 commit aafc53d
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 18 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,8 @@

<dom-module id="audio-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 cr-shared-style iron-flex iron-flex-alignment iron-positioning">
<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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@

<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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,8 @@

<dom-module id="bluetooth-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 cr-shared-style iron-flex iron-flex-alignment iron-positioning">
<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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,8 @@

<dom-module id="device-emulator-pages">
<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">
<style include="device-emulator-shared-styles iron-flex iron-flex-alignment
iron-positioning">
:host {
display: flex;
flex-direction: column;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@

<dom-module id="input-device-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">
<style include="device-emulator-shared-styles iron-flex iron-flex-alignment
iron-positioning">
.content > *:not(:first-child) {
margin-top: 10px;
}
Expand Down
5 changes: 3 additions & 2 deletions chrome/browser/resources/md_extensions/detail_view.html
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@

<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;
Expand Down Expand Up @@ -181,8 +182,8 @@
}

#size {
display: flex;
align-items: center;
display: flex;
}

paper-spinner-lite {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@

<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;
}
Expand Down
3 changes: 2 additions & 1 deletion chrome/browser/resources/settings/settings_shared_css.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
<!-- 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] {
Expand Down

0 comments on commit aafc53d

Please sign in to comment.