Commit 326359a9 authored by Dave Schuyler's avatar Dave Schuyler Committed by Commit Bot

[MD settings] hyphenate image-set

This CL changes label imageset to image-set (or ImageSet), because afaik
image-set is a html/css concept and imageset is not.

TBR=tommycli@chromium.org

Bug: None
Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: Iac23276f11b27f8863b3f7aaf864c8986f647fd9
Reviewed-on: https://chromium-review.googlesource.com/582194
Commit-Queue: Dave Schuyler <dschuyler@chromium.org>
Reviewed-by: default avatarHector Carmona <hcarmona@chromium.org>
Cr-Commit-Position: refs/heads/master@{#488814}
parent 14ec221a
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
<div id="picture-subpage-trigger" class="settings-box first two-line"> <div id="picture-subpage-trigger" class="settings-box first two-line">
<template is="dom-if" if="[[syncStatus]]"> <template is="dom-if" if="[[syncStatus]]">
<div id="profile-icon" on-tap="onPictureTap_" actionable <div id="profile-icon" on-tap="onPictureTap_" actionable
style="background-image: [[getIconImageset_(profileIconUrl_)]]"> style="background-image: [[getIconImageSet_(profileIconUrl_)]]">
</div> </div>
<if expr="not chromeos"> <if expr="not chromeos">
<div class="middle two-line no-min-width" <div class="middle two-line no-min-width"
......
...@@ -454,10 +454,10 @@ Polymer({ ...@@ -454,10 +454,10 @@ Polymer({
/** /**
* @param {string} iconUrl * @param {string} iconUrl
* @return {string} A CSS imageset for multiple scale factors. * @return {string} A CSS image-set for multiple scale factors.
* @private * @private
*/ */
getIconImageset_: function(iconUrl) { getIconImageSet_: function(iconUrl) {
return cr.icon.getImage(iconUrl); return cr.icon.getImage(iconUrl);
}, },
......
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
ignore-modified-key-events="[[ignoreModifiedKeyEvents]]"> ignore-modified-key-events="[[ignoreModifiedKeyEvents]]">
<template is="dom-repeat" items="[[avatars]]"> <template is="dom-repeat" items="[[avatars]]">
<paper-button class="avatar" title="[[item.label]]" <paper-button class="avatar" title="[[item.label]]"
style$="background-image: [[getIconImageset_(item.url)]]" style$="background-image: [[getIconImageSet_(item.url)]]"
on-tap="onAvatarTap_"> on-tap="onAvatarTap_">
</paper-button> </paper-button>
</template> </template>
......
...@@ -49,10 +49,10 @@ Polymer({ ...@@ -49,10 +49,10 @@ Polymer({
/** /**
* @param {string} iconUrl * @param {string} iconUrl
* @return {string} A CSS imageset for multiple scale factors. * @return {string} A CSS image-set for multiple scale factors.
* @private * @private
*/ */
getIconImageset_: function(iconUrl) { getIconImageSet_: function(iconUrl) {
return cr.icon.getImage(iconUrl); return cr.icon.getImage(iconUrl);
}, },
......
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