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

@ -17,17 +17,19 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
<script src="../../../webcomponentsjs/webcomponents-lite.js"></script>
<link rel="import" href="../../../paper-styles/paper-styles.html">
<link rel="import" href="../../../iron-flex-layout/iron-flex-layout.html">
<link rel="import" href="../../neon-animated-pages.html">
<link rel="import" href="../../neon-animations.html">
<link rel="import" href="../../../paper-styles/typography.html">
<link rel="import" href="x-card.html">
<link rel="import" href="x-cards-list.html">
<style>
<style is="custom-style">
body {
padding: 15px;
@apply(--layout-fullbleed);
@apply(--paper-font-common-base);
}
neon-animated-pages {
@ -64,38 +66,40 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
left: 30px;
}
.card-contents {
@apply(--layout-vertical);
@apply(--layout-center-center);
@apply(--layout-fit);
}
.button-container {
@apply(--layout-flex);
@apply(--layout-horizontal);
@apply(--layout-around-justified);
}
</style>
</head>
<body class="fullbleed">
<body>
<template is="dom-bind">
<neon-animated-pages id="pages" selected="0">
<x-cards-list id="list">
<div class="fit layout vertical center-center">
<div class="card-contents">
<h2>Choose a subject</h2>
<div class="flex layout horizontal around-justified large">
<div class="button-container large">
<div class="blue raised button" on-click="_onPolymerClick">
POLYMER
</div>
<div class="blue raised button" on-click="_onAngularClick">
ANGULAR
</div>
</div>
</div>
</x-cards-list>
<x-card>
<div class="fit layout vertical center-center">
<div class="card-contents">
<div class="raised back button" on-click="_onBackClick">
BACK
</div>
@ -108,14 +112,11 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
</p>
</div>
</x-card>
<x-card>
<div class="fit layout vertical center-center">
<div class="card-contents">
<div class="raised back button" on-click="_onBackClick">
BACK
</div>
@ -128,12 +129,10 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
</p>
</div>
</x-card>
</neon-animated-pages>
</neon-animated-pages>
</template>
<script>

View file

@ -9,26 +9,24 @@ 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="../../neon-shared-element-animatable-behavior.html">
<dom-module id="x-card">
<style>
:host {
display: block;
overflow: hidden;
}
#placeholder {
opacity: 0;
background-color: grey;
}
</style>
<template>
<style>
:host {
display: block;
overflow: hidden;
}
#placeholder {
opacity: 0;
background-color: grey;
@apply(--layout-fit);
}
</style>
<div id="placeholder" class="fit"></div>
<div id="placeholder"></div>
<div id="container">
<content select="div"></content>
</div>

View file

@ -9,26 +9,25 @@ 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="../../neon-shared-element-animatable-behavior.html">
<dom-module id="x-cards-list">
<style>
:host {
display: block;
overflow: hidden;
}
#placeholder {
opacity: 0;
background-color: grey;
}
</style>
<template>
<style>
:host {
display: block;
overflow: hidden;
}
<div id="placeholder" class="fit"></div>
#placeholder {
opacity: 0;
background-color: grey;
@apply(--layout-fit);
}
</style>
<div id="placeholder"></div>
<div id="container">
<content select="div"></content>
</div>