Skip to content

Commit 81dceff

Browse files
author
Jan Miksovsky
committed
Upgrade to Polymer 1.1.
1 parent 87ff4eb commit 81dceff

File tree

2 files changed

+20
-17
lines changed

2 files changed

+20
-17
lines changed

basic-carousel.html

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -106,24 +106,26 @@
106106
<link rel="import" href="../basic-spread-items/basic-spread-items.html">
107107

108108
<dom-module id="basic-carousel">
109-
<style>
110-
:host {
111-
display: -webkit-flex;
112-
display: flex;
113-
}
109+
<template>
114110

115-
[target="child"] {
116-
display: -webkit-flex;
117-
display: flex;
118-
-webkit-flex: 1;
119-
flex: 1;
120-
}
111+
<style>
112+
:host {
113+
display: -webkit-flex;
114+
display: flex;
115+
}
116+
117+
[target="child"] {
118+
display: -webkit-flex;
119+
display: flex;
120+
-webkit-flex: 1;
121+
flex: 1;
122+
}
123+
124+
basic-spread-items {
125+
height: 100%;
126+
}
127+
</style>
121128

122-
basic-spread-items {
123-
height: 100%;
124-
}
125-
</style>
126-
<template>
127129
<basic-item-selection selection-required="true"></basic-item-selection>
128130
<basic-trackpad-direction target="child">
129131
<basic-swipe-direction target="child">
@@ -134,6 +136,7 @@
134136
</basic-sliding-viewport>
135137
</basic-swipe-direction>
136138
</basic-trackpad-direction>
139+
137140
</template>
138141
</dom-module>
139142

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"basic-swipe-direction": "basic-web-components/basic-swipe-direction#master",
2121
"basic-timer-selection": "basic-web-components/basic-timer-selection#master",
2222
"basic-trackpad-direction": "basic-web-components/basic-trackpad-direction#master",
23-
"polymer": "Polymer/polymer#^1.0.0"
23+
"polymer": "Polymer/polymer#^1.1"
2424
},
2525
"devDependencies": {
2626
"basic-framed-content": "basic-web-components/basic-framed-content#master",

0 commit comments

Comments
 (0)