Skip to content

Commit

Permalink
Merge pull request #3 from xliiv/update-depecations
Browse files Browse the repository at this point in the history
Switch to new way of using iron-flex-layout classes
  • Loading branch information
Protoss78 committed Feb 16, 2017
2 parents 8a23277 + e5164fa commit 652302c
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
],
"dependencies": {
"textfit": "STRML/textFit#^2.3.0",
"iron-resizable-behavior": "PolymerElements/iron-resizable-behavior#^1.0.0",
"iron-resizable-behavior": "PolymerElements/iron-resizable-behavior#^1.0.5",
"iron-flex-layout": "PolymerElements/iron-flex-layout#^1.0.3",
"paper-styles": "PolymerElements/paper-styles#^1.0.11",
"paper-card": "PolymerElements/paper-card#^1.1.1"
Expand Down
4 changes: 2 additions & 2 deletions demo/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
<meta name="mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-capable" content="yes">
<script src="../../webcomponentsjs/webcomponents-lite.js"></script>
<link rel="import" href="../../iron-flex-layout/iron-flex-layout.html">
<link rel="import" href="../../iron-flex-layout/iron-flex-layout-classes.html">
<link rel="import" href="../textfit-div.html">
<link rel="import" href="../../paper-card/paper-card.html">
<link rel="import" href="../../paper-styles/demo-pages.html">
<style is="custom-style">
<style is="custom-style" include="iron-flex">
.horizontal-section {
height: 400px;
min-width: 200px;
Expand Down
6 changes: 3 additions & 3 deletions textfit-div.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<link rel="import" href="../polymer/polymer.html">
<link rel="import" href="../iron-resizable-behavior/iron-resizable-behavior.html">
<link rel="import" href="../iron-flex-layout/classes/iron-flex-layout.html">
<script src="../textfit/textFit.js"></script>
<link rel="import" href="../iron-flex-layout/iron-flex-layout-classes.html">
<link rel="import" href="textfit-import.html">
<!--
### Example:
<div class="layout horizontal flex wrap">
Expand All @@ -17,7 +17,7 @@
@demo demo/index.html
-->
<dom-module id="textfit-div" class="flex">
<style>
<style include="iron-flex">
:host {
height: 100%;
width: 100%;
Expand Down
1 change: 1 addition & 0 deletions textfit-import.html
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<script src="../textfit/textFit.js"></script>

0 comments on commit 652302c

Please sign in to comment.