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

Unified Diff: third_party/polymer/v1_0/components-chromium/paper-slider/paper-slider.css

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 side-by-side diff with in-line comments
Download patch
Index: third_party/polymer/v1_0/components-chromium/paper-slider/paper-slider.css
diff --git a/third_party/polymer/v1_0/components-chromium/paper-slider/paper-slider.css b/third_party/polymer/v1_0/components-chromium/paper-slider/paper-slider.css
index af769f4aeeb96d7e1d37d38cb03ee50398dfa6a4..d8282c38ed1b8349b3d71969f30802a51f07afce 100644
--- a/third_party/polymer/v1_0/components-chromium/paper-slider/paper-slider.css
+++ b/third_party/polymer/v1_0/components-chromium/paper-slider/paper-slider.css
@@ -19,20 +19,20 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
}
-:host(:not([disabled])) #sliderBar::shadow #activeProgress {
- background-color: var(--paper-slider-active-color, --google-blue-700);
+:host(:not([disabled])) #sliderBar {
+ --paper-progress-active-color: var(--paper-slider-active-color, --google-blue-700);
}
-:host(:not([disabled])) #sliderBar::shadow #secondaryProgress {
- background-color: var(--paper-slider-secondary-color, --google-blue-300);
+:host(:not([disabled])) #sliderBar {
+ --paper-progress-secondary-color: var(--paper-slider-secondary-color, --google-blue-300);
}
-:host([disabled]) #sliderBar::shadow #activeProgress {
- background-color: var(--paper-slider-disabled-active-color, --google-grey-500);
+:host([disabled]) #sliderBar {
+ --paper-progress-active-color: var(--paper-slider-disabled-active-color, --google-grey-500);
}
-:host([disabled]) #sliderBar::shadow #secondaryProgress {
- background-color: var(--paper-slider-disabled-secondary-color, --google-grey-300);
+:host([disabled]) #sliderBar {
+ --paper-progress-secondary-color: var(--paper-slider-disabled-secondary-color, --google-grey-300);
}
:host(:focus) {
@@ -116,11 +116,6 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
background-color: black;
}
-.transiting #sliderBar::shadow #activeProgress {
- -webkit-transition: -webkit-transform 0.08s ease;
- transition: transform 0.08s ease;
-}
-
#sliderKnob {
@apply(--layout-center-justified);
@apply(--layout-center);
@@ -153,10 +148,12 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
#sliderKnobInner {
width: 12px;
height: 12px;
- box-sizing: border-box;
- -moz-box-sizing: border-box;
border-radius: 50%;
background-color: var(--paper-slider-knob-color, --google-blue-700);
+
+ -moz-box-sizing: border-box;
+ box-sizing: border-box;
+
transition-property: height, width, background-color, border;
transition-duration: 0.1s;
transition-timing-function: ease;
@@ -165,13 +162,14 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
.expand:not(.pin) > #sliderKnob > #sliderKnobInner {
width: 100%;
height: 100%;
+
-webkit-transform: translateZ(0);
transform: translateZ(0);
}
.ring > #sliderKnob > #sliderKnobInner {
- background-color: transparent;
- border: 2px solid #c8c8c8;
+ background-color: var(--paper-slider-knob-start-color, transparent);
+ border: 2px solid var(--paper-slider-knob-start-border-color, #c8c8c8);
}
#sliderKnobInner::before {
@@ -187,6 +185,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
height: 26px;
margin-left: 3px;
border-radius: 50% 50% 50% 0;
+
-webkit-transform: rotate(-45deg) scale(0) translate(0);
transform: rotate(-45deg) scale(0) translate(0);
}
@@ -198,7 +197,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
}
.pin.ring > #sliderKnob > #sliderKnobInner::before {
- background-color: #c8c8c8;
+ background-color: var(--paper-slider-pin-start-color, #c8c8c8);
}
.pin.expand > #sliderKnob > #sliderKnobInner::before {
@@ -216,6 +215,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
text-align: center;
color: var(--paper-slider-font-color, #fff);
font-size: 10px;
+
-webkit-transform: scale(0) translate(0);
transform: scale(0) translate(0);
}
@@ -232,9 +232,10 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
overflow: hidden;
}
-.slider-input::shadow input {
- /* FIXME(ffu): should one be able set text-align directly on paper-input? */
- text-align: center;
+.slider-input {
+ --paper-input-container-input: {
+ text-align: center;
+ };
}
/* disabled state */

Powered by Google App Engine
This is Rietveld 408576698