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

Side by Side Diff: third_party/polymer/v1_0/chromium.patch

Issue 2839293002: Roll some polymer elements and remove stuff from chromium.patch (Closed)
Patch Set: . Created 3 years, 7 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
OLDNEW
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/paper-input/paper-textarea-extracted.js b/compo nents-chromium/paper-input/paper-textarea-extracted.js 12 diff --git a/components-chromium/paper-input/paper-textarea-extracted.js b/compo nents-chromium/paper-input/paper-textarea-extracted.js
13 index 78a2a9ec621c..8b776dd790ea 100644 13 index 78a2a9ec621c..8b776dd790ea 100644
14 --- a/components-chromium/paper-input/paper-textarea-extracted.js 14 --- a/components-chromium/paper-input/paper-textarea-extracted.js
15 +++ b/components-chromium/paper-input/paper-textarea-extracted.js 15 +++ b/components-chromium/paper-input/paper-textarea-extracted.js
16 @@ -43,8 +43,8 @@ Polymer({ 16 @@ -43,8 +43,8 @@ Polymer({
17 } 17 }
18 }, 18 },
19 19
20 - _ariaLabelledByChanged: function(ariaLabelledBy) { 20 - _ariaLabelledByChanged: function(ariaLabelledBy) {
21 - this.$.input.textarea.setAttribute('aria-labelledby', ariaLabelledBy); 21 - this.$.input.textarea.setAttribute('aria-labelledby', ariaLabelledBy);
22 + _ariaLabelledByChanged: function() { 22 + _ariaLabelledByChanged: function() {
23 + this.$.input.textarea.setAttribute('aria-label', this.label); 23 + this.$.input.textarea.setAttribute('aria-label', this.label);
24 }, 24 },
25 25
26 _ariaDescribedByChanged: function(ariaDescribedBy) { 26 _ariaDescribedByChanged: function(ariaDescribedBy) {
27 diff --git a/components-chromium/paper-icon-button/paper-icon-button-light-extra cted.js b/components-chromium/paper-icon-button/paper-icon-button-light-extracte d.js
28 index bac589c7274c..bc25f54320fb 100644
29 --- a/components-chromium/paper-icon-button/paper-icon-button-light-extracted.js
30 +++ b/components-chromium/paper-icon-button/paper-icon-button-light-extracted.js
31 @@ -14,11 +14,11 @@ Polymer({
32 },
33
34 _rippleDown: function() {
35 - this.getRipple().downAction();
36 + this.getRipple().uiDownAction();
37 },
38
39 _rippleUp: function() {
40 - this.getRipple().upAction();
41 + this.getRipple().uiUpAction();
42 },
43
44 /**
45 diff --git a/components-chromium/paper-radio-button/paper-radio-button.html b/co mponents-chromium/paper-radio-button/paper-radio-button.html
46 index 0ff7f4232e57..b62924ef135d 100644
47 --- a/components-chromium/paper-radio-button/paper-radio-button.html
48 +++ b/components-chromium/paper-radio-button/paper-radio-button.html
49 @@ -42,6 +42,7 @@ Custom property | Description | Default
50 `--paper-radio-button-label-color` | Label color | `--primary-text-color`
51 `--paper-radio-button-label-spacing` | Spacing between the label and the button | `10px`
52 `--paper-radio-button-radio-container` | A mixin applied to the internal radio container | `{}`
53 +`--paper-radio-button-label` | A mixin applied to the internal label | `{}`
54
55 This element applies the mixin `--paper-font-common-base` but does not import ` paper-styles/typography.html`.
56 In order to apply the `Roboto` font to this element, make sure you've imported `paper-styles/typography.html`.
57 @@ -141,6 +142,8 @@ In order to apply the `Roboto` font to this element, make su re you've imported `
58 margin-left: var(--paper-radio-button-label-spacing, 10px);
59 white-space: normal;
60 color: var(--paper-radio-button-label-color, --primary-text-color);
61 +
62 + @apply(--paper-radio-button-label);
63 }
64
65 :host-context([dir="rtl"]) #radioLabel {
OLDNEW
« no previous file with comments | « third_party/polymer/v1_0/bower.json ('k') | third_party/polymer/v1_0/components-chromium/paper-icon-button/bower.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698