Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(51)

Unified Diff: third_party/polymer/v1_0/chromium.patch

Issue 2407243004: Fix Polymer's Chrome-specific patch (Closed)
Patch Set: Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | third_party/polymer/v1_0/components-chromium/polymer/polymer-extracted.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/polymer/v1_0/chromium.patch
diff --git a/third_party/polymer/v1_0/chromium.patch b/third_party/polymer/v1_0/chromium.patch
index b1d41dffcdca2519244a7bdc33d27a8e703d9ae4..7649e0d618d00c196e56c8215702401ee017927b 100644
--- a/third_party/polymer/v1_0/chromium.patch
+++ b/third_party/polymer/v1_0/chromium.patch
@@ -9,17 +9,18 @@ index 7a24999..4eefcba 100644
-<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:400,300,300italic,400italic,500,500italic,700,700italic">
-<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto+Mono:400,700">
+<link rel="stylesheet" href="chrome://resources/css/roboto.css">
-diff --git a/components-chromium/polymer/polymer-extracted.js b/components-chromium/polymer/polymer-extracted.js
-index baf9ab3..985fe6c 100644
---- a/components-chromium/polymer/polymer-extracted.js
-+++ b/components-chromium/polymer/polymer-extracted.js
-@@ -2444,8 +2444,7 @@ _hasMixinRules: function (rules) {
- return rules[0].selector.indexOf(this.VAR_START) >= 0;
- },
- removeCustomProps: function (cssText) {
--cssText = this.removeCustomPropAssignment(cssText);
--return this.removeCustomPropApply(cssText);
-+return cssText;
- },
- removeCustomPropAssignment: function (cssText) {
- return cssText.replace(this._rx.customProp, '').replace(this._rx.mixinProp, '');
+diff --git a/components-chromium/paper-icon-button/paper-icon-button-light.html b/components-chromium/paper-icon-button/paper-icon-button-light.html
+index 2eaa665..7416f94 100644
+--- a/components-chromium/paper-icon-button/paper-icon-button-light.html
++++ b/components-chromium/paper-icon-button/paper-icon-button-light.html
+@@ -45,9 +45,10 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
+ paper-ripple {
+ opacity: 0.6;
+ color: currentColor;
++ @apply(--paper-icon-button-light-ripple);
+ }
+ </style>
+ <content></content>
+ </template>
+ </dom-module>
+
« no previous file with comments | « no previous file | third_party/polymer/v1_0/components-chromium/polymer/polymer-extracted.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698