Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 diff --git a/components-chromium/font-roboto/roboto.html b/components-chromium/f ont-roboto/roboto.html | 1 diff --git a/components-chromium/font-roboto/roboto.html b/components-chromium/f ont-roboto/roboto.html |
| 2 index 7a24999..4eefcba 100644 | 2 index 7a24999..4eefcba 100644 |
| 3 --- a/components-chromium/font-roboto/roboto.html | 3 --- a/components-chromium/font-roboto/roboto.html |
| 4 +++ b/components-chromium/font-roboto/roboto.html | 4 +++ b/components-chromium/font-roboto/roboto.html |
| 5 @@ -7,5 +7,4 @@ The complete set of contributors may be found at http://polymer. github.io/CONTRI | 5 @@ -7,5 +7,4 @@ The complete set of contributors may be found at http://polymer. github.io/CONTRI |
| 6 Code distributed by Google as part of the polymer project is also | 6 Code distributed by Google as part of the polymer project is also |
| 7 subject to an additional IP rights grant found at http://polymer.github.io/PATE NTS.txt | 7 subject to an additional IP rights grant found at http://polymer.github.io/PATE NTS.txt |
| 8 --> | 8 --> |
| 9 -<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:400 ,300,300italic,400italic,500,500italic,700,700italic"> | 9 -<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:400 ,300,300italic,400italic,500,500italic,700,700italic"> |
| 10 -<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto+Mon o:400,700"> | 10 -<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto+Mon o:400,700"> |
| 11 +<link rel="stylesheet" href="chrome://resources/css/roboto.css"> | 11 +<link rel="stylesheet" href="chrome://resources/css/roboto.css"> |
| 12 diff --git a/components-chromium/polymer/polymer-extracted.js b/components-chrom ium/polymer/polymer-extracted.js | 12 diff --git a/components-chromium/polymer/polymer-extracted.js b/components-chrom ium/polymer/polymer-extracted.js |
| 13 index baf9ab3..985fe6c 100644 | 13 index baf9ab3..985fe6c 100644 |
| 14 --- a/components-chromium/polymer/polymer-extracted.js | 14 --- a/components-chromium/polymer/polymer-extracted.js |
| 15 +++ b/components-chromium/polymer/polymer-extracted.js | 15 +++ b/components-chromium/polymer/polymer-extracted.js |
| 16 @@ -2444,8 +2444,7 @@ _hasMixinRules: function (rules) { | 16 @@ -2444,8 +2444,7 @@ _hasMixinRules: function (rules) { |
| 17 return rules[0].selector.indexOf(this.VAR_START) >= 0; | 17 return rules[0].selector.indexOf(this.VAR_START) >= 0; |
| 18 }, | 18 }, |
| 19 removeCustomProps: function (cssText) { | 19 removeCustomProps: function (cssText) { |
| 20 -cssText = this.removeCustomPropAssignment(cssText); | 20 -cssText = this.removeCustomPropAssignment(cssText); |
| 21 -return this.removeCustomPropApply(cssText); | 21 -return this.removeCustomPropApply(cssText); |
| 22 +return cssText; | 22 +return cssText; |
| 23 }, | 23 }, |
| 24 removeCustomPropAssignment: function (cssText) { | 24 removeCustomPropAssignment: function (cssText) { |
| 25 return cssText.replace(this._rx.customProp, '').replace(this._rx.mixinProp, '') ; | 25 return cssText.replace(this._rx.customProp, '').replace(this._rx.mixinProp, '') ; |
| 26 diff --git a/components-chromium/polymer/polymer-extracted.js b/components-chrom ium/polymer/polymer-extracted.js | 26 diff --git a/components-chromium/polymer/polymer-extracted.js b/components-chrom ium/polymer/polymer-extracted.js |
| 27 index 8446e8a..3f679f6 100644 | 27 index 627bdd3..7ba497c 100644 |
| 28 --- a/components-chromium/polymer/polymer-extracted.js | 28 --- a/components-chromium/polymer/polymer-extracted.js |
| 29 +++ b/components-chromium/polymer/polymer-extracted.js | 29 +++ b/components-chromium/polymer/polymer-extracted.js |
| 30 @@ -2475,7 +2475,7 @@ AT_START: '@' | 30 @@ -2521,7 +2521,7 @@ AT_START: '@' |
| 31 }(); | 31 var settings = Polymer.Settings; |
| 32 Polymer.StyleUtil = function () { | |
| 33 return { | 32 return { |
| 33 NATIVE_VARIABLES: Polymer.Settings.useNativeCSSProperties, | |
| 34 -MODULE_STYLES_SELECTOR: 'style, link[rel=import][type~=css], template', | 34 -MODULE_STYLES_SELECTOR: 'style, link[rel=import][type~=css], template', |
| 35 +MODULE_STYLES_SELECTOR: 'style:not([no-process]), link[rel=import][type~=css], template', | 35 +MODULE_STYLES_SELECTOR: 'style:not([no-process]), link[rel=import][type~=css], template', |
|
michaelpg
2016/07/21 23:12:27
do we still need this?
Dan Beam
2016/07/21 23:16:11
yeah, for now, really just because we actually hav
| |
| 36 INCLUDE_ATTR: 'include', | 36 INCLUDE_ATTR: 'include', |
| 37 toCssText: function (rules, callback, preserveProperties) { | 37 toCssText: function (rules, callback) { |
| 38 if (typeof rules === 'string') { | 38 if (typeof rules === 'string') { |
| 39 --- a/components-chromium/iron-collapse/iron-collapse-extracted.js | |
| 40 +++ b/components-chromium/iron-collapse/iron-collapse-extracted.js | |
| 41 @@ -96,7 +96,7 @@ Polymer({ | |
| 42 | |
| 43 /** | |
| 44 * Updates the size of the element. | |
| 45 - * @param {!String} size The new value for `maxWidth`/`maxHeight` as css pr operty value, usually `auto` or `0px`. | |
| 46 + * @param {string} size The new value for `maxWidth`/`maxHeight` as css pro perty value, usually `auto` or `0px`. | |
| 47 * @param {boolean=} animated if `true` updates the size with an animation, otherwise without. | |
| 48 */ | |
| 49 updateSize: function(size, animated) { | |
| OLD | NEW |