third_party/polymer/v1_0/chromium.patch - Issue 2407243004: Fix Polymer's Chrome-specific patch

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side 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 unified diff | Download patch

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/paper-icon-button/paper-icon-button-light.html b/components-chromium/paper-icon-button/paper-icon-button-light.html

13 index baf9ab3..985fe6c 100644	13 index 2eaa665..7416f94 100644

14 --- a/components-chromium/polymer/polymer-extracted.js	14 --- a/components-chromium/paper-icon-button/paper-icon-button-light.html

15 +++ b/components-chromium/polymer/polymer-extracted.js	15 +++ b/components-chromium/paper-icon-button/paper-icon-button-light.html

16 @@ -2444,8 +2444,7 @@ _hasMixinRules: function (rules) {	16 @@ -45,9 +45,10 @@ subject to an additional IP rights grant found at http://poly mer.github.io/PATEN

17 return rules[0].selector.indexOf(this.VAR_START) >= 0;	17 paper-ripple {

18 },	18 opacity: 0.6;

19 removeCustomProps: function (cssText) {	19 color: currentColor;

20 -cssText = this.removeCustomPropAssignment(cssText);	20 + @apply(--paper-icon-button-light-ripple);

21 -return this.removeCustomPropApply(cssText);	21 }

22 +return cssText;	22 </style>

23 },	23 <content></content>

24 removeCustomPropAssignment: function (cssText) {	24 </template>

25 return cssText.replace(this._rx.customProp, '').replace(this._rx.mixinProp, '') ;	25 </dom-module>

	26

OLD	NEW

« 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 »