third_party/polymer/v1_0/components-chromium/paper-slider/paper-slider.html - Issue 1287713002: [MD settings] merge polymer 1.0.11; hack for settings checkbox

Side by Side Diff: third_party/polymer/v1_0/components-chromium/paper-slider/paper-slider.html

Issue 1287713002: [MD settings] merge polymer 1.0.11; hack for settings checkbox (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 4 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

« chrome/browser/resources/settings/checkbox/checkbox.js ('K') | « third_party/polymer/v1_0/components-chromium/paper-slider/paper-slider.css ('k') | third_party/polymer/v1_0/components-chromium/paper-slider/paper-slider-extracted.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 <!--	1 <!--

2 @license	2 @license

3 Copyright (c) 2015 The Polymer Project Authors. All rights reserved.	3 Copyright (c) 2015 The Polymer Project Authors. All rights reserved.

4 This code may only be used under the BSD style license found at http://polymer.g ithub.io/LICENSE.txt	4 This code may only be used under the BSD style license found at http://polymer.g ithub.io/LICENSE.txt

5 The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt	5 The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt

6 The complete set of contributors may be found at http://polymer.github.io/CONTRI BUTORS.txt	6 The complete set of contributors may be found at http://polymer.github.io/CONTRI BUTORS.txt

7 Code distributed by Google as part of the polymer project is also	7 Code distributed by Google as part of the polymer project is also

8 subject to an additional IP rights grant found at http://polymer.github.io/PATEN TS.txt	8 subject to an additional IP rights grant found at http://polymer.github.io/PATEN TS.txt

9 --><html><head><link rel="import" href="../polymer/polymer.html">	9 --><html><head><link rel="import" href="../polymer/polymer.html">

10 <link rel="import" href="../paper-styles/paper-styles.html">	10 <link rel="import" href="../paper-styles/paper-styles.html">

(...skipping 29 matching lines...) Expand all Loading...
40 ----------------\|-------------\|----------	40 ----------------\|-------------\|----------

41 `--paper-slider-bar-color` \| The background color of the slider \| `transparent`	41 `--paper-slider-bar-color` \| The background color of the slider \| `transparent`

42 `--paper-slider-active-color` \| The progress bar color \| `--google-blue-700`	42 `--paper-slider-active-color` \| The progress bar color \| `--google-blue-700`

43 `--paper-slider-secondary-color` \| The secondary progress bar color \| `--google- blue-300`	43 `--paper-slider-secondary-color` \| The secondary progress bar color \| `--google- blue-300`

44 `--paper-slider-knob-color` \| The knob color \| `--google-blue-700`	44 `--paper-slider-knob-color` \| The knob color \| `--google-blue-700`

45 `--paper-slider-disabled-knob-color` \| The disabled knob color \| `--google-grey- 500`	45 `--paper-slider-disabled-knob-color` \| The disabled knob color \| `--google-grey- 500`

46 `--paper-slider-pin-color` \| The pin color \| `--google-blue-700`	46 `--paper-slider-pin-color` \| The pin color \| `--google-blue-700`

47 `--paper-slider-font-color` \| The pin's text color \| `#fff`	47 `--paper-slider-font-color` \| The pin's text color \| `#fff`

48 `--paper-slider-disabled-active-color` \| The disabled progress bar color \| `--go ogle-grey-500`	48 `--paper-slider-disabled-active-color` \| The disabled progress bar color \| `--go ogle-grey-500`

49 `--paper-slider-disabled-secondary-color` \| The disabled secondary progress bar color \| `--google-grey-300`	49 `--paper-slider-disabled-secondary-color` \| The disabled secondary progress bar color \| `--google-grey-300`

	50 `--paper-slider-knob-start-color` \| The fill color of the knob at the far left \| `transparent`

	51 `--paper-slider-knob-start-border-color` \| The border color of the knob at the f ar left \| `#c8c8c8`

	52 `--paper-slider-pin-start-color` \| The color of the pin at the far left \| `#c8c8 c8`

50	53

51 @group Paper Elements	54 @group Paper Elements

52 @element paper-slider	55 @element paper-slider

53 @demo demo/index.html	56 @demo demo/index.html

54 @hero hero.svg	57 @hero hero.svg

55 -->	58 -->

56	59

57 </head><body><dom-module id="paper-slider">	60 </head><body><dom-module id="paper-slider">

58	61

59 <link rel="import" type="css" href="paper-slider.css">	62 <link rel="import" type="css" href="paper-slider.css">

60	63

61 <template>	64 <template>

62 <div id="sliderContainer" class$="[[_getClassNames(disabled, pin, snaps, imm ediateValue, min, expand, dragging, transiting, editable)]]">	65 <div id="sliderContainer" class$="[[_getClassNames(disabled, pin, snaps, imm ediateValue, min, expand, dragging, transiting, editable)]]">

63	66

64 <div class="bar-container">	67 <div class="bar-container">

65 <paper-progress id="sliderBar" aria-hidden="true" min="[[min]]" max="[[m ax]]" step="[[step]]" value="[[immediateValue]]" secondary-progress="[[secondary Progress]]" on-down="_bardown" on-up="_resetKnob" on-track="_onTrack">	68 <paper-progress class$="[[_getProgressClass(transiting)]]" id="sliderBar " aria-hidden="true" min="[[min]]" max="[[max]]" step="[[step]]" value="[[immedi ateValue]]" secondary-progress="[[secondaryProgress]]" on-down="_bardown" on-up= "_resetKnob" on-track="_onTrack">

66 </paper-progress>	69 </paper-progress>

67 </div>	70 </div>

68	71

69 <template is="dom-if" if="[[snaps]]">	72 <template is="dom-if" if="[[snaps]]">

70 <div class="slider-markers horizontal layout">	73 <div class="slider-markers horizontal layout">

71 <template is="dom-repeat" items="[[markers]]">	74 <template is="dom-repeat" items="[[markers]]">

72 <div class="slider-marker flex"></div>	75 <div class="slider-marker flex"></div>

73 </template>	76 </template>

74 </div>	77 </div>

75 </template>	78 </template>

76	79

77 <div id="sliderKnob" class="center-justified center horizontal layout" on- down="_knobdown" on-up="_resetKnob" on-track="_onTrack" on-transitionend="_knobT ransitionEnd">	80 <div id="sliderKnob" class="center-justified center horizontal layout" on- down="_knobdown" on-up="_resetKnob" on-track="_onTrack" on-transitionend="_knobT ransitionEnd">

78 <paper-ripple id="ink" class="circle" center="" hidden$="[[!receivedFo cusFromKeyboard]]"></paper-ripple>	81 <paper-ripple center="" id="ink" class="circle" hidden$="[[!receivedFo cusFromKeyboard]]">

	82 </paper-ripple>

79 <div id="sliderKnobInner" value$="[[immediateValue]]"></div>	83 <div id="sliderKnobInner" value$="[[immediateValue]]"></div>

80 </div>	84 </div>

81 </div>	85 </div>

82	86

83 <template is="dom-if" if="[[editable]]">	87 <template is="dom-if" if="[[editable]]">

84 <paper-input id="input" class="slider-input" disabled$="[[disabled]]" on-c hange="_inputChange">	88 <paper-input id="input" class="slider-input" disabled$="[[disabled]]" on-c hange="_inputChange" value="[[_fixForInput(immediateValue)]]">

85 </paper-input>	89 </paper-input>

86 </template>	90 </template>

87 </template>	91 </template>

88	92

89 </dom-module>	93 </dom-module>

90	94

91 <script src="paper-slider-extracted.js"></script></body></html>	95 <script src="paper-slider-extracted.js"></script></body></html>

OLD	NEW