Skip to content

Commit 01fd30b

Browse files
committed
Merge pull request #270 from abdonrd/sort_imports_alphabetically
Sort imports alphabetically and remove/add some spaces
2 parents 6563409 + dc92a53 commit 01fd30b

File tree

6 files changed

+17
-23
lines changed

6 files changed

+17
-23
lines changed

paper-input-behavior.html

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
Code distributed by Google as part of the polymer project is also
88
subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
99
-->
10+
1011
<link rel="import" href="../polymer/polymer.html">
11-
<link rel="import" href="../iron-behaviors/iron-control-state.html">
1212
<link rel="import" href="../iron-a11y-keys-behavior/iron-a11y-keys-behavior.html">
13+
<link rel="import" href="../iron-behaviors/iron-control-state.html">
1314

1415
<script>
15-
1616
/**
1717
* Use `Polymer.PaperInputBehavior` to implement inputs with `<paper-input-container>`. This
1818
* behavior is implemented by `<paper-input>`. It exposes a number of properties from
@@ -24,7 +24,6 @@
2424
* @polymerBehavior Polymer.PaperInputBehavior
2525
*/
2626
Polymer.PaperInputBehaviorImpl = {
27-
2827
properties: {
2928
/**
3029
* Fired when the input changes due to user interaction.
@@ -408,6 +407,7 @@
408407
this._shiftTabPressed = false;
409408
}, 1);
410409
},
410+
411411
/**
412412
* If `autoValidate` is true, then validates the element.
413413
*/
@@ -488,7 +488,6 @@
488488
});
489489
}
490490
}
491-
492491
};
493492

494493
/** @polymerBehavior */
@@ -497,5 +496,4 @@
497496
Polymer.IronA11yKeysBehavior,
498497
Polymer.PaperInputBehaviorImpl
499498
];
500-
501499
</script>

paper-input-char-counter.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
----------------|-------------|----------
3030
`--paper-input-char-counter` | Mixin applied to the element | `{}`
3131
-->
32+
3233
<dom-module id="paper-input-char-counter">
3334
<template>
34-
3535
<style>
3636
:host {
3737
display: inline-block;
@@ -47,7 +47,6 @@
4747
</style>
4848

4949
<span>[[_charCounterStr]]</span>
50-
5150
</template>
5251
</dom-module>
5352

paper-input-container.html

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
-->
1010

1111
<link rel="import" href="../polymer/polymer.html">
12+
<link rel="import" href="../iron-flex-layout/iron-flex-layout.html">
1213
<link rel="import" href="../paper-styles/color.html">
13-
<link rel="import" href="../paper-styles/typography.html">
1414
<link rel="import" href="../paper-styles/default-theme.html">
15-
<link rel="import" href="../iron-flex-layout/iron-flex-layout.html">
15+
<link rel="import" href="../paper-styles/typography.html">
1616

1717
<!--
1818
`<paper-input-container>` is a container for a `<label>`, an `<input is="iron-input">` or
@@ -92,9 +92,9 @@
9292
This element is `display:block` by default, but you can set the `inline` attribute to make it
9393
`display:inline-block`.
9494
-->
95+
9596
<dom-module id="paper-input-container">
9697
<template>
97-
9898
<style>
9999
:host {
100100
display: block;
@@ -123,16 +123,15 @@
123123
}
124124

125125
.focused-line {
126-
height: 2px;
127126
@apply(--layout-fit);
128127

128+
background: var(--paper-input-container-focus-color, --default-primary-color);
129+
height: 2px;
129130
-webkit-transform-origin: center center;
130131
transform-origin: center center;
131132
-webkit-transform: scale3d(0,1,1);
132133
transform: scale3d(0,1,1);
133134

134-
background: var(--paper-input-container-focus-color, --default-primary-color);
135-
136135
@apply(--paper-input-container-underline-focus);
137136
}
138137

@@ -147,7 +146,6 @@
147146

148147
.underline.is-invalid .focused-line {
149148
background: var(--paper-input-container-invalid-color, --google-red-500);
150-
151149
-webkit-transform: none;
152150
transform: none;
153151
-webkit-transition: -webkit-transform 0.25s;
@@ -157,8 +155,9 @@
157155
}
158156

159157
.unfocused-line {
160-
height: 1px;
161158
@apply(--layout-fit);
159+
160+
height: 1px;
162161
background: var(--paper-input-container-color, --secondary-text-color);
163162

164163
@apply(--paper-input-container-underline);
@@ -178,9 +177,10 @@
178177
}
179178

180179
.input-content {
181-
position: relative;
182180
@apply(--layout-horizontal);
183181
@apply(--layout-center);
182+
183+
position: relative;
184184
}
185185

186186
.input-content ::content label,
@@ -203,7 +203,6 @@
203203
transform: translateY(-75%) scale(0.75);
204204
-webkit-transition: -webkit-transform 0.25s;
205205
transition: transform 0.25s;
206-
207206
-webkit-transform-origin: left top;
208207
transform-origin: left top;
209208

@@ -303,6 +302,7 @@
303302
<div class="label-and-input-container" id="labelAndInputContainer">
304303
<content select=":not([add-on]):not([prefix]):not([suffix])"></content>
305304
</div>
305+
306306
<content select="[suffix]"></content>
307307
</div>
308308

@@ -314,7 +314,6 @@
314314
<div class$="[[_computeAddOnContentClass(focused,invalid)]]">
315315
<content id="addOnContent" select="[add-on]"></content>
316316
</div>
317-
318317
</template>
319318
</dom-module>
320319

paper-input-error.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
`--paper-input-container-invalid-color` | The foreground color of the error | `--google-red-500`
3232
`--paper-input-error` | Mixin applied to the error | `{}`
3333
-->
34+
3435
<dom-module id="paper-input-error">
3536
<template>
36-
3737
<style>
3838
:host {
3939
display: inline-block;
@@ -54,7 +54,6 @@
5454
</style>
5555

5656
<content></content>
57-
5857
</template>
5958
</dom-module>
6059

paper-input.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
Code distributed by Google as part of the polymer project is also
88
subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
99
-->
10+
1011
<link rel="import" href="../polymer/polymer.html">
1112
<link rel="import" href="../iron-form-element-behavior/iron-form-element-behavior.html">
1213
<link rel="import" href="../iron-input/iron-input.html">
@@ -67,7 +68,6 @@
6768

6869
<dom-module id="paper-input">
6970
<template>
70-
7171
<style>
7272
:host {
7373
display: block;
@@ -141,7 +141,6 @@
141141
</template>
142142

143143
</paper-input-container>
144-
145144
</template>
146145
</dom-module>
147146

paper-textarea.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
Code distributed by Google as part of the polymer project is also
88
subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
99
-->
10+
1011
<link rel="import" href="../polymer/polymer.html">
1112
<link rel="import" href="../iron-autogrow-textarea/iron-autogrow-textarea.html">
1213
<link rel="import" href="paper-input-behavior.html">
@@ -68,7 +69,6 @@
6869
</template>
6970

7071
</paper-input-container>
71-
7272
</template>
7373
</dom-module>
7474

0 commit comments

Comments
 (0)