Ubuntu HTML5 UI SDK

Merge lp:~whosdaz/ubuntu-html5-theme/fixnav into lp:ubuntu-html5-theme

  1. fixnav
  2. Merge into trunk
Proposed by Matthew Allen on 2015-12-17
Status: Superseded
Proposed branch: lp:~whosdaz/ubuntu-html5-theme/fixnav
Merge into: lp:ubuntu-html5-theme
Diff against target: 90 lines (+62/-1)
2 files modified
examples/html5-theme/ui-gallery/widgets.html (+4/-1)
examples/html5-theme/widgets/Navigation.html (+58/-0)
To merge this branch: bzr merge lp:~whosdaz/ubuntu-html5-theme/fixnav
Reviewer Review Type Date Requested Status
Alexandre Abreu Needs Fixing on 2015-12-17
David Barth 2015-12-17 Pending
Review via email: mp+280828@code.launchpad.net

This proposal supersedes a proposal from 2015-12-15.

This proposal has been superseded by a proposal from 2015-12-17.

To post a comment you must log in.
David Barth (dbarth) wrote : Posted in a previous version of this proposal

Hi Matthew,

The content feels correct. But the icons are broken when I test them. The <img links to pre-installed image files, which are actually not installed.

It would be better to have relative URLs to the theme directory / branch. Moving foward, the theme is not pre-installed on the system anymore but bundled into an application (click) package.

You can check the "ubuntu-html5-theme" tool at the root of the branch. It is used by app developers to download and install the theme directly in their application directory.

review: Needs Fixing
Alexandre Abreu (abreu-alexandre) wrote :

I added some comments inline,

Also could you remove the changes to Typography.html?

Could you also make the links to external http pages (developer.ubuntu.com & design) open as _blank targets?

review: Needs Fixing
Matthew Allen (whosdaz) wrote :

> I added some comments inline,
>
> Also could you remove the changes to Typography.html?
>
> Could you also make the links to external http pages (developer.ubuntu.com &
> design) open as _blank targets?

Will do, thankyou very much :)

lp:~whosdaz/ubuntu-html5-theme/fixnav updated on 2015-12-17
216. By Matthew Allen (<email address hidden>) on 2015-12-17

Fixed HTML Title & Fixed Copyright Notice

217. By Matthew Allen (<email address hidden>) on 2015-12-17

Added _Blank target attirbute to <a>

Unmerged revisions

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/widgets.html'
2--- examples/html5-theme/ui-gallery/widgets.html 2015-04-30 20:06:20 +0000
3+++ examples/html5-theme/ui-gallery/widgets.html 2015-12-17 15:24:09 +0000
4@@ -1,5 +1,5 @@
5 <!--
6- Copyright (C) 2013-2015 Adnane Belmadiaf <daker@ubuntu.com>
7+Copyright 2015 Canonical Ltd.
8
9 This file is part of ubuntu-html5-ui-toolkit.
10
11@@ -40,6 +40,9 @@
12 <a href="../widgets/Typography.html" target="component">Typography</a>
13 </li>
14 <li>
15+ <a href="../widgets/Navigation.html" target="component">Navigation</a>
16+ </li>
17+ <li>
18 <a href="../widgets/Toggles.html" target="component">Toggles</a>
19 </li>
20 <li>
21
22=== added file 'examples/html5-theme/widgets/Navigation.html'
23--- examples/html5-theme/widgets/Navigation.html 1970-01-01 00:00:00 +0000
24+++ examples/html5-theme/widgets/Navigation.html 2015-12-17 15:24:09 +0000
25@@ -0,0 +1,58 @@
26+<!-- Copyright 2015 Canonical Ltd. -->
27+
28+
29+<!DOCTYPE html>
30+<html>
31+<head>
32+ <meta charset="utf-8" />
33+ <meta name="copyright" content="Adnane Belmadiaf <daker@ubuntu.com>">
34+ <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
35+ <title>Ubuntu UI HTML5: Navigation</title>
36+ <link href="../../../0.1/ambiance/css/appTemplate.css" rel="stylesheet" type="text/css" />
37+</head>
38+
39+<body>
40+ <div data-role="mainview">
41+
42+ <div data-role="content">
43+
44+ <!-- Sections -->
45+
46+ <!-- Overview -->
47+ <div class="medium-font">In Ubuntu we use three predominant navigation structures:</div>
48+ <div class="medium-font" style="font-weight: 900;">- flat</div>
49+ <div class="medium-font" style="font-weight: 900;">- contextual</div>
50+ <div class="medium-font" style="font-weight: 900;">- deep</div>
51+ <br><br>
52+
53+ <!-- Tabs (flat) -->
54+ <div style="padding-bottom: 40px">
55+ <div class="large-font">Tabs (flat)</div>
56+ <br><br>
57+ <a style="color: #dd4814; font-size: 1rem "Ubuntu";" href="https://developer.ubuntu.com/api/apps/html5/sdk-14.10/UbuntuUI.Tabs/">API Documentation</a>
58+ <br><br>
59+ <a style="color: #dd4814; font-size: 1rem "Ubuntu";" href="http://design.ubuntu.com/apps/patterns/navigation">Design guidelines</a>
60+ <br>
61+ <img src="nav1.png">
62+ <!-- Expansion (Contextual) -->
63+ <div class="large-font">Expansion (contextual)</div>
64+ <br><br>
65+ <a style="color: #dd4814; font-size: 1rem "Ubuntu";" href="http://design.ubuntu.com/apps/patterns/navigation">Design guidelines</a>
66+ <br>
67+ <img src="nav2.png">
68+
69+ <!-- Page stack (deep) -->
70+ <div class="large-font">Page stack (deep)</div>
71+ <br><br>
72+ <a style="color: #dd4814; font-size: 1rem "Ubuntu";" href="https://developer.ubuntu.com/api/apps/html5/sdk-14.10/UbuntuUI.Pagestack/">API Documentation</a>
73+ <br><br>
74+ <a style="color: #dd4814; font-size: 1rem "Ubuntu";" href="http://design.ubuntu.com/apps/patterns/navigation">Design guidelines</a>
75+ <br>
76+ <img src="nav3.png">
77+ </div>
78+
79+
80+ </div>
81+ </div>
82+</body>
83+</html>
84
85=== added file 'examples/html5-theme/widgets/nav1.png'
86Binary files examples/html5-theme/widgets/nav1.png 1970-01-01 00:00:00 +0000 and examples/html5-theme/widgets/nav1.png 2015-12-17 15:24:09 +0000 differ
87=== added file 'examples/html5-theme/widgets/nav2.png'
88Binary files examples/html5-theme/widgets/nav2.png 1970-01-01 00:00:00 +0000 and examples/html5-theme/widgets/nav2.png 2015-12-17 15:24:09 +0000 differ
89=== added file 'examples/html5-theme/widgets/nav3.png'
90Binary files examples/html5-theme/widgets/nav3.png 1970-01-01 00:00:00 +0000 and examples/html5-theme/widgets/nav3.png 2015-12-17 15:24:09 +0000 differ

Subscribers

People subscribed via source and target branches