merge from dev

This commit is contained in:
Luke Pulverenti 2016-01-14 12:04:42 -05:00
parent d96250df7f
commit bcfee41a57
318 changed files with 54424 additions and 6419 deletions

View file

@ -7,30 +7,26 @@ 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
-->
<link rel="import" href="../../../polymer/polymer.html">
<link rel="import" href="../../../paper-styles/paper-styles.html">
<link rel="import" href="../../../paper-styles/shadow.html">
<link rel="import" href="../../neon-animation-runner-behavior.html">
<link rel="import" href="../../animations/scale-up-animation.html">
<link rel="import" href="../../animations/fade-out-animation.html">
<dom-module id="my-dialog">
<style>
:host {
display: none;
padding: 16px;
background: white;
color: black;
margin: 0 auto;
@apply(--shadow-elevation-2dp);
}
</style>
<template>
<style>
:host {
display: none;
padding: 16px;
background: white;
color: black;
margin: 0 auto;
z-index: 100;
position: absolute;
@apply(--shadow-elevation-2dp);
}
</style>
<content></content>
</template>