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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/polymer/v1_0/components-chromium/paper-input/paper-input-container.html

Issue 1766433002: Roll Polymer to 1.3.1 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 9 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 | « third_party/polymer/v1_0/components-chromium/paper-input/paper-input-char-counter-extracted.js ('k') | third_party/polymer/v1_0/components-chromium/paper-input/paper-input-error.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/polymer/v1_0/components-chromium/paper-input/paper-input-container.html
diff --git a/third_party/polymer/v1_0/components-chromium/paper-input/paper-input-container.html b/third_party/polymer/v1_0/components-chromium/paper-input/paper-input-container.html
index a7deb38f995f1fcac4c19685526a898433b915ec..3dd7c0035fb915466022db012bf9042e6b9218db 100644
--- a/third_party/polymer/v1_0/components-chromium/paper-input/paper-input-container.html
+++ b/third_party/polymer/v1_0/components-chromium/paper-input/paper-input-container.html
@@ -8,7 +8,6 @@ Code distributed by Google as part of the polymer project is also
subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
--><html><head><link rel="import" href="../polymer/polymer.html">
<link rel="import" href="../iron-flex-layout/iron-flex-layout.html">
-<link rel="import" href="../paper-styles/color.html">
<link rel="import" href="../paper-styles/default-theme.html">
<link rel="import" href="../paper-styles/typography.html">
@@ -72,8 +71,8 @@ The following custom properties and mixins are available for styling:
Custom property | Description | Default
----------------|-------------|----------
`--paper-input-container-color` | Label and underline color when the input is not focused | `--secondary-text-color`
-`--paper-input-container-focus-color` | Label and underline color when the input is focused | `--default-primary-color`
-`--paper-input-container-invalid-color` | Label and underline color when the input is is invalid | `--google-red-500`
+`--paper-input-container-focus-color` | Label and underline color when the input is focused | `--primary-color`
+`--paper-input-container-invalid-color` | Label and underline color when the input is is invalid | `--error-color`
`--paper-input-container-input-color` | Input foreground color | `--primary-text-color`
`--paper-input-container` | Mixin applied to the container | `{}`
`--paper-input-container-disabled` | Mixin applied to the container when it's disabled | `{}`
@@ -123,8 +122,9 @@ This element is `display:block` by default, but you can set the `inline` attribu
.focused-line {
@apply(--layout-fit);
- background: var(--paper-input-container-focus-color, --default-primary-color);
+ background: var(--paper-input-container-focus-color, --primary-color);
height: 2px;
+
-webkit-transform-origin: center center;
transform-origin: center center;
-webkit-transform: scale3d(0,1,1);
@@ -143,7 +143,7 @@ This element is `display:block` by default, but you can set the `inline` attribu
}
.underline.is-invalid .focused-line {
- background: var(--paper-input-container-invalid-color, --google-red-500);
+ background: var(--paper-input-container-invalid-color, --error-color);
-webkit-transform: none;
transform: none;
-webkit-transition: -webkit-transform 0.25s;
@@ -155,8 +155,8 @@ This element is `display:block` by default, but you can set the `inline` attribu
.unfocused-line {
@apply(--layout-fit);
- height: 1px;
background: var(--paper-input-container-color, --secondary-text-color);
+ height: 1px;
@apply(--paper-input-container-underline);
}
@@ -172,6 +172,7 @@ This element is `display:block` by default, but you can set the `inline` attribu
.label-and-input-container {
@apply(--layout-flex-auto);
@apply(--layout-relative);
+
width: 100%;
max-width: 100%;
}
@@ -192,26 +193,26 @@ This element is `display:block` by default, but you can set the `inline` attribu
width: 100%;
font: inherit;
color: var(--paper-input-container-color, --secondary-text-color);
+ -webkit-transition: -webkit-transform 0.25s, width 0.25s;
+ transition: transform 0.25s, width 0.25s;
+ -webkit-transform-origin: left top;
+ transform-origin: left top;
@apply(--paper-font-common-nowrap);
@apply(--paper-font-subhead);
@apply(--paper-input-container-label);
+ @apply(--paper-transition-easing);
}
.input-content.label-is-floating ::content label,
.input-content.label-is-floating ::content .paper-input-label {
-webkit-transform: translateY(-75%) scale(0.75);
transform: translateY(-75%) scale(0.75);
- -webkit-transition: -webkit-transform 0.25s, width 0.25s;
- transition: transform 0.25s, width 0.25s;
- -webkit-transform-origin: left top;
- transform-origin: left top;
/* Since we scale to 75/100 of the size, we actually have 100/75 of the
original space now available */
width: 133%;
- @apply(--paper-transition-easing);
@apply(--paper-input-container-label-floating);
}
@@ -227,14 +228,14 @@ This element is `display:block` by default, but you can set the `inline` attribu
.input-content.label-is-highlighted ::content label,
.input-content.label-is-highlighted ::content .paper-input-label {
- color: var(--paper-input-container-focus-color, --default-primary-color);
+ color: var(--paper-input-container-focus-color, --primary-color);
@apply(--paper-input-container-label-focus);
}
.input-content.is-invalid ::content label,
.input-content.is-invalid ::content .paper-input-label {
- color: var(--paper-input-container-invalid-color, --google-red-500);
+ color: var(--paper-input-container-invalid-color, --error-color);
}
.input-content.label-is-hidden ::content label,
@@ -264,12 +265,14 @@ This element is `display:block` by default, but you can set the `inline` attribu
::content [prefix] {
@apply(--paper-font-subhead);
+
@apply(--paper-input-prefix);
@apply(--layout-flex-none);
}
::content [suffix] {
@apply(--paper-font-subhead);
+
@apply(--paper-input-suffix);
@apply(--layout-flex-none);
}
@@ -288,11 +291,11 @@ This element is `display:block` by default, but you can set the `inline` attribu
}
.add-on-content.is-invalid ::content * {
- color: var(--paper-input-container-invalid-color, --google-red-500);
+ color: var(--paper-input-container-invalid-color, --error-color);
}
.add-on-content.is-highlighted ::content * {
- color: var(--paper-input-container-focus-color, --default-primary-color);
+ color: var(--paper-input-container-focus-color, --primary-color);
}
</style>
« no previous file with comments | « third_party/polymer/v1_0/components-chromium/paper-input/paper-input-char-counter-extracted.js ('k') | third_party/polymer/v1_0/components-chromium/paper-input/paper-input-error.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698