Merge lp:~abreu-alexandre/ubuntu-html5-theme/fix-gallery-examples into lp:ubuntu-html5-theme

Proposed by Alexandre Abreu
Status: Merged
Approved by: Alexandre Abreu
Approved revision: 205
Merged at revision: 205
Proposed branch: lp:~abreu-alexandre/ubuntu-html5-theme/fix-gallery-examples
Merge into: lp:ubuntu-html5-theme
Diff against target: 65 lines (+23/-9)
2 files modified
examples/html5-theme/ui-gallery/index.html (+22/-8)
examples/html5-theme/ui-gallery/widgets.html (+1/-1)
To merge this branch: bzr merge lp:~abreu-alexandre/ubuntu-html5-theme/fix-gallery-examples
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Ubuntu HTML5 Theme Developers Pending
Review via email: mp+258412@code.launchpad.net

Commit message

Fix gallery & component showcase

Description of the change

Fix gallery & component showcase

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'examples/html5-theme/ui-gallery/index.html'
2--- examples/html5-theme/ui-gallery/index.html 2014-02-25 13:51:45 +0000
3+++ examples/html5-theme/ui-gallery/index.html 2015-05-06 16:41:06 +0000
4@@ -32,15 +32,25 @@
5 <!-- Ubuntu UI javascript imports - Ambiance theme -->
6 <script src="../../../0.1/ambiance/js/fast-buttons.js"></script>
7 <script src="../../../0.1/ambiance/js/core.js"></script>
8+ <script src="../../../0.1/ambiance/js/header.js"></script>
9+ <script src="../../../0.1/ambiance/js/button.js"></script>
10+ <script src="../../../0.1/ambiance/js/dialogs.js"></script>
11+ <script src="../../../0.1/ambiance/js/list.js"></script>
12 <script src="../../../0.1/ambiance/js/page.js"></script>
13+ <script src="../../../0.1/ambiance/js/progress.js"></script>
14+ <script src="../../../0.1/ambiance/js/shape.js"></script>
15+ <script src="../../../0.1/ambiance/js/popover.js"></script>
16+ <script src="../../../0.1/ambiance/js/pagestacks.js"></script>
17+ <script src="../../../0.1/ambiance/js/actionsbar.js"></script>
18+ <script src="../../../0.1/ambiance/js/tab.js"></script>
19 <script src="../../../0.1/ambiance/js/tabs.js"></script>
20- <script src="../../../0.1/ambiance/js/pagestacks.js"></script>
21+ <script src="../../../0.1/ambiance/js/toolbars.js"></script>
22
23 <script>
24- var UI = new UbuntuUI();
25- window.onload = function() {
26- UI.init();
27- };
28+ window.onload = function() {
29+ var UI = new UbuntuUI();
30+ UI.init();
31+ }
32 </script>
33
34 </head>
35@@ -50,13 +60,17 @@
36
37 <header data-role="header">
38 <ul data-role="tabs">
39- <li data-role="tabitem" data-page="main">Ubuntu HTML5 UI Toolkit</li>
40+ <li data-role="tabitem" data-page="main">
41+ Ubuntu HTML5 UI Toolkit
42+ </li>
43 </ul>
44 </header>
45
46 <div data-role="content">
47- <iframe src="widgets.html" frameborder="0" style="min-height: 600px; width: 300px; display: inline-block;" ></iframe>
48- <iframe src="../widgets/Typography.html" name="component" frameborder="0" style="min-height: 600px; width: calc(100% - 305px); display: inline-block;"></iframe>
49+ <div data-role="tab" id="main">
50+ <iframe src="widgets.html" frameborder="0" style="min-height: 600px; width: 300px; display: inline-block;" ></iframe>
51+ <iframe src="../widgets/Typography.html" name="component" frameborder="0" style="min-height: 600px; width: calc(100% - 305px); display: inline-block;"></iframe>
52+ </div>
53 </div>
54 </div>
55 </body>
56
57=== modified file 'examples/html5-theme/ui-gallery/widgets.html'
58--- examples/html5-theme/ui-gallery/widgets.html 2014-02-25 13:51:45 +0000
59+++ examples/html5-theme/ui-gallery/widgets.html 2015-05-06 16:41:06 +0000
60@@ -1,5 +1,5 @@
61 <!--
62- Copyright (C) 2013 Adnane Belmadiaf <daker@ubuntu.com>
63+ Copyright (C) 2013-2015 Adnane Belmadiaf <daker@ubuntu.com>
64
65 This file is part of ubuntu-html5-ui-toolkit.
66

Subscribers

People subscribed via source and target branches