merge from dev
This commit is contained in:
parent
9e1a2cf66a
commit
189942e289
298 changed files with 53049 additions and 5413 deletions
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "paper-toggle-button",
|
||||
"version": "1.0.13",
|
||||
"version": "1.0.14",
|
||||
"description": "A material design toggle button control",
|
||||
"authors": [
|
||||
"The Polymer Authors"
|
||||
|
@ -36,11 +36,11 @@
|
|||
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
|
||||
},
|
||||
"main": "paper-toggle-button.html",
|
||||
"_release": "1.0.13",
|
||||
"_release": "1.0.14",
|
||||
"_resolution": {
|
||||
"type": "version",
|
||||
"tag": "1.0.13",
|
||||
"commit": "dbc3924b8d9c16ee6376704dd80c39d12aee72c8"
|
||||
"tag": "v1.0.14",
|
||||
"commit": "131f32adf5ce831f94be7f80c436865b44d7cd95"
|
||||
},
|
||||
"_source": "git://github.com/PolymerElements/paper-toggle-button.git",
|
||||
"_target": "~1.0.5",
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "paper-toggle-button",
|
||||
"version": "1.0.13",
|
||||
"version": "1.0.14",
|
||||
"description": "A material design toggle button control",
|
||||
"authors": [
|
||||
"The Polymer Authors"
|
||||
|
|
|
@ -9,6 +9,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
|
|||
-->
|
||||
|
||||
<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-ripple/paper-ripple.html">
|
||||
|
@ -55,6 +56,8 @@ Custom property | Description | Default
|
|||
<style>
|
||||
:host {
|
||||
display: inline-block;
|
||||
@apply(--layout-horizontal);
|
||||
@apply(--layout-center);
|
||||
}
|
||||
|
||||
:host([disabled]) {
|
||||
|
@ -142,11 +145,13 @@ Custom property | Description | Default
|
|||
position: relative;
|
||||
width: 36px;
|
||||
height: 14px;
|
||||
/* The toggle button has an absolute position of -3px; The extra 1px
|
||||
/* accounts for the toggle button shadow box. */
|
||||
margin: 4px 1px;
|
||||
}
|
||||
|
||||
.toggle-label {
|
||||
position: relative;
|
||||
top: -2px;
|
||||
display: inline-block;
|
||||
vertical-align: middle;
|
||||
padding-left: var(--paper-toggle-button-label-spacing, 8px);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue