Ubuntu HTML5 UI SDK

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

  1. fixtypog
  2. Merge into trunk
Proposed by Matthew Allen
Status: Superseded
Proposed branch: lp:~whosdaz/ubuntu-html5-theme/fixtypog
Merge into: lp:ubuntu-html5-theme
Diff against target: 142 lines (+52/-52)
4 files modified
examples/html5-theme/ui-gallery/index.html (+1/-1)
examples/html5-theme/ui-gallery/widgets.html (+3/-3)
examples/html5-theme/widgets/Label.html (+48/-0)
examples/html5-theme/widgets/Typography.html (+0/-48)
To merge this branch: bzr merge lp:~whosdaz/ubuntu-html5-theme/fixtypog
Reviewer Review Type Date Requested Status
Alexandre Abreu Needs Fixing
Review via email: mp+280845@code.launchpad.net

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

To post a comment you must log in.
Revision history for this message
Alexandre Abreu (abreu-alexandre) wrote :

Thank you for working on that,

it doesnt work though, there is no Label.html

see an additional comment inline

review: Needs Fixing
Revision history for this message
Matthew Allen (whosdaz) wrote :

> Thank you for working on that,
>
> it doesnt work though, there is no Label.html
>
> see an additional comment inline

I must of made a mistake when committing it as the new file did not get added to the commit - my bad.
Fixing now!

lp:~whosdaz/ubuntu-html5-theme/fixtypog updated
213. By Matthew Allen (<email address hidden>)

Added Label.html

214. By Matthew Allen (<email address hidden>)

Fixed copyright messages

215. By Matthew Allen (<email address hidden>)

Removed index.html iFrame

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/index.html'
2--- examples/html5-theme/ui-gallery/index.html 2015-04-30 20:06:20 +0000
3+++ examples/html5-theme/ui-gallery/index.html 2015-12-17 15:02:01 +0000
4@@ -69,7 +69,7 @@
5 <div data-role="content">
6 <div data-role="tab" id="main">
7 <iframe src="widgets.html" frameborder="0" style="min-height: 600px; width: 300px; display: inline-block;" ></iframe>
8- <iframe src="../widgets/Typography.html" name="component" frameborder="0" style="min-height: 600px; width: calc(100% - 305px); display: inline-block;"></iframe>
9+ <iframe src="../widgets/Toggles.html" name="component" frameborder="0" style="min-height: 600px; width: calc(100% - 305px); display: inline-block;"></iframe>
10 </div>
11 </div>
12 </div>
13
14=== modified file 'examples/html5-theme/ui-gallery/widgets.html'
15--- examples/html5-theme/ui-gallery/widgets.html 2015-04-30 20:06:20 +0000
16+++ examples/html5-theme/ui-gallery/widgets.html 2015-12-17 15:02:01 +0000
17@@ -37,9 +37,6 @@
18 <section data-role="list">
19 <ul data-role="listview">
20 <li>
21- <a href="../widgets/Typography.html" target="component">Typography</a>
22- </li>
23- <li>
24 <a href="../widgets/Toggles.html" target="component">Toggles</a>
25 </li>
26 <li>
27@@ -58,6 +55,9 @@
28 <a href="../widgets/UbuntuShape.html" target="component">Ubuntu Shape</a>
29 </li>
30 <li>
31+ <a href="../widgets/Label.html" target="component">Label</a>
32+ </li>
33+ <li>
34 <a href="../widgets/ListItems.html" target="component">List Items</a>
35 </li>
36 <li>
37
38=== added file 'examples/html5-theme/widgets/Label.html'
39--- examples/html5-theme/widgets/Label.html 1970-01-01 00:00:00 +0000
40+++ examples/html5-theme/widgets/Label.html 2015-12-17 15:02:01 +0000
41@@ -0,0 +1,48 @@
42+<!--
43+ Copyright (C) Canonical Ltd
44+
45+ This file is part of ubuntu-html5-ui-toolkit.
46+
47+ This package is free software; you can redistribute it and/or modify
48+ it under the terms of the GNU Lesser General Public License as
49+ published by the Free Software Foundation; either version 3 of the
50+ License, or
51+ (at your option) any later version.
52+
53+ This package is distributed in the hope that it will be useful,
54+ but WITHOUT ANY WARRANTY; without even the implied warranty of
55+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
56+ GNU General Public License for more details.
57+
58+ You should have received a copy of the GNU Lesser General Public
59+ License along with this program. If not, see
60+ <http://www.gnu.org/licenses/>.
61+-->
62+
63+<!DOCTYPE html>
64+<html>
65+<head>
66+ <meta charset="utf-8" />
67+ <meta name="copyright" content="Adnane Belmadiaf <daker@ubuntu.com>">
68+ <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
69+ <title>Ubuntu HTML5 UI SDK: Typography</title>
70+ <link href="../../../0.1/ambiance/css/appTemplate.css" rel="stylesheet" type="text/css" />
71+</head>
72+
73+<body>
74+ <div data-role="mainview">
75+ <div class="content">
76+ <div class="inset">
77+ <div class="large-font">Label</div><br>
78+
79+ <p class="xxsmall-font">xx-small</p><br>
80+ <p class="xsmall-font">x-small</p><br>
81+ <p class="small-font">small</p><br>
82+ <p class="medium-font">medium</p><br>
83+ <p class="large-font">large</p><br>
84+ <p class="xlarge-font">x-large</p><br>
85+ </div>
86+ </div>
87+ </div>
88+</body>
89+</html>
90
91=== removed file 'examples/html5-theme/widgets/Typography.html'
92--- examples/html5-theme/widgets/Typography.html 2014-02-26 10:30:41 +0000
93+++ examples/html5-theme/widgets/Typography.html 1970-01-01 00:00:00 +0000
94@@ -1,48 +0,0 @@
95-<!--
96- Copyright (C) Canonical Ltd
97-
98- This file is part of ubuntu-html5-ui-toolkit.
99-
100- This package is free software; you can redistribute it and/or modify
101- it under the terms of the GNU Lesser General Public License as
102- published by the Free Software Foundation; either version 3 of the
103- License, or
104- (at your option) any later version.
105-
106- This package is distributed in the hope that it will be useful,
107- but WITHOUT ANY WARRANTY; without even the implied warranty of
108- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
109- GNU General Public License for more details.
110-
111- You should have received a copy of the GNU Lesser General Public
112- License along with this program. If not, see
113- <http://www.gnu.org/licenses/>.
114--->
115-
116-<!DOCTYPE html>
117-<html>
118-<head>
119- <meta charset="utf-8" />
120- <meta name="copyright" content="Adnane Belmadiaf <daker@ubuntu.com>">
121- <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
122- <title>Ubuntu HTML5 UI SDK: Typography</title>
123- <link href="../../../0.1/ambiance/css/appTemplate.css" rel="stylesheet" type="text/css" />
124-</head>
125-
126-<body>
127- <div data-role="mainview">
128- <div class="content">
129- <div class="inset">
130- <p class="xlarge-font">Headings</p>
131- <p class="xlarge-font">Extra large Heading</p>
132- <p class="large-font">large Heading</p>
133- <p class="xlarge-font">Body text</p>
134- <p class="small-font">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur vitae bibendum urna. Nulla facilisi. Nunc erat urna, ultricies id orci at, malesuada ornare orci. Cras urna risus, volutpat nec odio id, luctus ullamcorper dui. Nullam tincidunt a nisl in aliquet. Praesent dui velit, imperdiet et condimentum sit amet, tincidunt vel metus. Nunc blandit rutrum volutpat. Praesent leo ipsum, rhoncus sit amet felis non, faucibus cursus sem. Nulla sit amet auctor nisi, eu rhoncus diam. Nulla massa lacus, sagittis ut risus ut, lacinia pulvinar eros. Nullam ac ipsum lectus. Donec ut lacus justo. Donec adipiscing lectus vitae dui euismod congue. Fusce consequat turpis nec velit hendrerit bibendum at vel lacus. Mauris sodales velit neque, quis ultricies neque cursus ac. Nunc risus orci, pulvinar quis sodales id, luctus in est.</p>
135- <p class="xlarge-font">Sub text</p>
136- <p class="xsmall-font">Lorem ipsum dolor sit amet.</p>
137- <p class="xxsmall-font">Lorem ipsum dolor sit amet.</p>
138- </div>
139- </div>
140- </div>
141-</body>
142-</html>

Subscribers

People subscribed via source and target branches