1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00

update polymer

This commit is contained in:
Luke Pulverenti 2015-10-07 21:49:40 -04:00
parent 8119b930e4
commit cbb6337b41
74 changed files with 2195 additions and 1393 deletions

View file

@ -1,6 +1,6 @@
{
"name": "paper-button",
"version": "1.0.7",
"version": "1.0.8",
"description": "Material design button",
"authors": [
"The Polymer Authors"
@ -37,11 +37,11 @@
"iron-test-helpers": "polymerelements/iron-test-helpers#^1.0.0",
"paper-styles": "polymerelements/paper-styles#^1.0.0"
},
"_release": "1.0.7",
"_release": "1.0.8",
"_resolution": {
"type": "version",
"tag": "v1.0.7",
"commit": "6f4599ab8615af533afdd50e710baa702fe6f84c"
"tag": "v1.0.8",
"commit": "08553a8c5e4d27fc6180bbcfb952f86b38b51345"
},
"_source": "git://github.com/PolymerElements/paper-button.git",
"_target": "~1.0.1",

View file

@ -1,6 +1,6 @@
{
"name": "paper-button",
"version": "1.0.7",
"version": "1.0.8",
"description": "Material design button",
"authors": [
"The Polymer Authors"

View file

@ -44,7 +44,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
}
paper-button[toggles] {
transition: background-color 0.3s;
transition: all 0.3s;
}
paper-button[toggles][active] {

View file

@ -15,8 +15,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
<link rel="import" href="../iron-flex-layout/iron-flex-layout.html">
<!--
Material Design: <a href="http://www.google.com/design/spec/components/buttons.html">Buttons</a>
Material design: [Buttons](https://www.google.com/design/spec/components/buttons.html)
`paper-button` is a button. When the user touches the button, a ripple effect emanates
from the point of contact. It may be flat or raised. A raised button is styled with a
@ -76,9 +75,9 @@ Custom property | Description | Default
-->
<dom-module id="paper-button">
<template>
<template strip-whitespace>
<style>
<style include="paper-material">
:host {
display: inline-block;
position: relative;
@ -102,12 +101,12 @@ Custom property | Description | Default
@apply(--paper-button);
}
:host([raised]) .keyboard-focus {
:host([raised].keyboard-focus) {
font-weight: bold;
@apply(--paper-button-raised-keyboard-focus);
}
:host(:not([raised])) .keyboard-focus {
:host(:not([raised]).keyboard-focus) {
font-weight: bold;
@apply(--paper-button-flat-keyboard-focus);
}
@ -121,32 +120,15 @@ Custom property | Description | Default
@apply(--paper-button-disabled);
}
:host([noink]) paper-ripple {
display: none;
}
paper-ripple {
color: var(--paper-button-ink-color);
}
paper-material {
border-radius: inherit;
@apply(--layout-fit);
}
.content > ::content * {
:host > ::content * {
text-transform: inherit;
}
</style>
<paper-ripple></paper-ripple>
<paper-material elevation="[[_elevation]]" animated></paper-material>
<div class$="[[_computeContentClass(receivedFocusFromKeyboard)]]">
<content></content>
</div>
<content></content>
</template>
</dom-module>
@ -172,18 +154,10 @@ Custom property | Description | Default
_calculateElevation: function() {
if (!this.raised) {
this._elevation = 0;
this.elevation = 0;
} else {
Polymer.PaperButtonBehaviorImpl._calculateElevation.apply(this);
}
},
_computeContentClass: function(receivedFocusFromKeyboard) {
var className = 'content ';
if (receivedFocusFromKeyboard) {
className += ' keyboard-focus';
}
return className;
}
});
</script>

View file

@ -46,7 +46,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
Polymer.Base.async(function() {
try {
expect(button._elevation).to.be.eql(1);
expect(button.elevation).to.be.eql(1);
done();
} catch (e) {
done(e);