Skip to content

Commit 84734a7

Browse files
Merge pull request #57 from PixelsCommander/effects
Added effects attribute support
2 parents cae0926 + db549d3 commit 84734a7

53 files changed

Lines changed: 401 additions & 455 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

bower.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
"pixi": "~2.2.9",
1717
"webcomponents.js": "~0.5.5",
1818
"promise-polyfill": "~2.0.0",
19-
"jquery": "~2.1.3"
19+
"jquery": "~2.1.3",
20+
"tween.js": "git@github.com:sole/tween.js.git"
2021
},
2122
"keywords": ["web-components"]
2223
}

demo/advanced-content-webgl.html

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -172,17 +172,7 @@ <h1>SLIDER BELOW IS RENDERED IN WEBGL, DRAG IT</h1>
172172
</html-gl>
173173
</section>
174174
</div>
175-
176-
<script src="../bower_components/promise-polyfill/Promise.min.js"></script>
177-
<script src="../bower_components/webcomponents.js/CustomElements.min.js"></script>
178-
<script src="./js/vendor/velocity.js"></script>
179-
<script src="./js/vendor/html2canvas.js"></script>
180-
<script src="../bower_components/pixi/bin/pixi.dev.js"></script>
181-
<script src="../src/util.js"></script>
182-
<script src="../src/gl-element-resolver.js"></script>
183-
<script src="../src/gl-context.js"></script>
184-
<script src="../src/images-loaded.js"></script>
185-
<script src="../src/gl-element.js"></script>
175+
<script src="../dist/htmlgl.js"></script>
186176
<script src="./js/slider.js"></script>
187177
<script>
188178
window.addEventListener('load', function () {

demo/assets/css/appstyle.css

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
/** Generated by FG **/
2+
@font-face {
3+
font-family: 'Conv_InterstatePro-Bold';
4+
src: url('../fonts/InterstatePro-Bold.eot');
5+
src: local('☺'), url('../fonts/InterstatePro-Bold.woff') format('woff'), url('../fonts/InterstatePro-Bold.ttf') format('truetype'), url('../fonts/InterstatePro-Bold.svg') format('svg');
6+
font-weight: normal;
7+
font-style: normal;
8+
}
9+
/** Generated by FG **/
10+
@font-face {
11+
font-family: 'Conv_InterstatePro-Light';
12+
src: url('../fonts/InterstatePro-Light.eot');
13+
src: local('☺'), url('../fonts/InterstatePro-Light.woff') format('woff'), url('../fonts/InterstatePro-Light.ttf') format('truetype'), url('../fonts/InterstatePro-Light.svg') format('svg');
14+
font-weight: normal;
15+
font-style: normal;
16+
}
17+
/** Generated by FG **/
18+
@font-face {
19+
font-family: 'Conv_InterstatePro-ExtraLight';
20+
src: url('../fonts/InterstatePro-ExtraLight.eot');
21+
src: local('☺'), url('../fonts/InterstatePro-ExtraLight.woff') format('woff'), url('../fonts/InterstatePro-ExtraLight.ttf') format('truetype'), url('../fonts/InterstatePro-ExtraLight.svg') format('svg');
22+
font-weight: normal;
23+
font-style: normal;
24+
}
25+
/** Generated by FG **/
26+
@font-face {
27+
font-family: 'Conv_InterstatePro-Regular';
28+
src: url('../fonts/InterstatePro-Regular.eot');
29+
src: local('☺'), url('../fonts/InterstatePro-Regular.woff') format('woff'), url('../fonts/InterstatePro-Regular.ttf') format('truetype'), url('../fonts/InterstatePro-Regular.svg') format('svg');
30+
font-weight: normal;
31+
font-style: normal;
32+
}
33+
@font-face {
34+
font-family: "UPCDigital";
35+
src: url(../fonts/DAWN-UPCDiRg.ttf) format("truetype");
36+
font-weight: 400;
37+
}
38+
@font-face {
39+
font-family: 'UPCDigital-bold';
40+
src: url(../fonts/DAWN-UPCDiBd.ttf) format('truetype');
41+
}
42+
43+
body {
44+
box-sizing: border-box;
45+
padding: 20px 43px 0 43px;
46+
margin: 0;
47+
font-family: Conv_InterstatePro-Regular;
48+
font-weight: normal;
49+
font-size: 24px;
50+
color: #2c3e50;
51+
width: 100%;
52+
height: 100%;
53+
background-color: #ecf0f1;
54+
overflow-x: hidden;
55+
}
56+
57+
ul {
58+
list-style: none;
59+
}
60+
61+
li {
62+
text-align: center;
63+
display: inline-block;
64+
vertical-align:top;
65+
padding: 20px;
66+
}
67+
68+
p {
69+
width: 128px;
70+
margin-top: 15px;
71+
}

demo/assets/css/broadcasts-list.css

Lines changed: 0 additions & 85 deletions
This file was deleted.

demo/assets/css/font.css

Lines changed: 0 additions & 41 deletions
This file was deleted.

demo/assets/css/vodstore.css

Lines changed: 0 additions & 46 deletions
This file was deleted.
-60.4 KB
Binary file not shown.
7.8 KB

demo/assets/img/icons/amex.png

7.27 KB

demo/assets/img/icons/basket.png

5.06 KB

0 commit comments

Comments
 (0)