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

[Matthew Allen]

[Alexandre Abreu (abreu-alexandre)]

Thank you for working on that,

it doesnt work though, there is no Label.html

see an additional comment inline

review: Needs Fixing

[Matthew Allen (whosdaz)]

> 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!

[Alexandre Abreu (abreu-alexandre)]

Could you remove the "<iframe src="../widgets/Toggles.htm" in examples/html5-theme/ui-gallery/index.html ?

I added a few inline comments below,

review: Needs Fixing

[Matthew Allen (whosdaz)]

> Could you remove the "<iframe src="../widgets/Toggles.htm" in
> examples/html5-theme/ui-gallery/index.html ?
>
> I added a few inline comments below,

What should the iFrame be changed to?
As I assume the frame itself needs to stay in the page??? As that's what's used to see each page???

[Alexandre Abreu (abreu-alexandre)]

Hi,

just remove it :)
the only necessary iframe is the widgets.hml one

On Thu, Dec 17, 2015 at 9:36 PM, MatthewAllen <email address hidden> wrote:

> > Could you remove the "<iframe src="../widgets/Toggles.htm" in
> > examples/html5-theme/ui-gallery/index.html ?
> >
> > I added a few inline comments below,
>
> What should the iFrame be changed to?
> As I assume the frame itself needs to stay in the page??? As that's what's
> used to see each page???
> --
>
> https://code.launchpad.net/~whosdaz/ubuntu-html5-theme/fixtypog/+merge/280859
> You are reviewing the proposed merge of
> lp:~whosdaz/ubuntu-html5-theme/fixtypog into lp:ubuntu-html5-theme.
>

[Matthew Allen (whosdaz)]

Hey,
Will do when I'm home - is that all?
Is the task approved after that?

On 18 Dec 2015 8:06 pm, "Alexandre Abreu" <email address hidden>
wrote:
>
> Hi,
>
> just remove it :)
> the only necessary iframe is the widgets.hml one
>
> On Thu, Dec 17, 2015 at 9:36 PM, MatthewAllen <email address hidden> wrote:
>
> > > Could you remove the "<iframe src="../widgets/Toggles.htm" in
> > > examples/html5-theme/ui-gallery/index.html ?
> > >
> > > I added a few inline comments below,
> >
> > What should the iFrame be changed to?
> > As I assume the frame itself needs to stay in the page??? As that's
what's
> > used to see each page???
> > --
> >
> >
https://code.launchpad.net/~whosdaz/ubuntu-html5-theme/fixtypog/+merge/280859
> > You are reviewing the proposed merge of
> > lp:~whosdaz/ubuntu-html5-theme/fixtypog into lp:ubuntu-html5-theme.
> >
>
> --
>
https://code.launchpad.net/~whosdaz/ubuntu-html5-theme/fixtypog/+merge/280859
> You are the owner of lp:~whosdaz/ubuntu-html5-theme/fixtypog.

[Alexandre Abreu (abreu-alexandre)]

> Is the task approved after that?

yes I looks ok

[Matthew Allen (whosdaz)]

Will fix it in about an hour with I get home, if you can approve my task
now so I can accept another it'd be much appreciated.

[lp:~whosdaz/ubuntu-html5-theme/fixtypog]

214. By Matthew Allen (<email address hidden>) on 2015-12-18

Fixed copyright messages

215. By Matthew Allen (<email address hidden>) on 2015-12-18

Removed index.html iFrame

Unmerged revisions

=== modified file 'examples/html5-theme/ui-gallery/index.html'
--- examples/html5-theme/ui-gallery/index.html	2015-04-30 20:06:20 +0000
+++ examples/html5-theme/ui-gallery/index.html	2015-12-18 11:09:01 +0000
@@ -1,29 +1,9 @@
-<!--
- Copyright (C) 2013 Adnane Belmadiaf <[e-mail]>
-
- This file is part of ubuntu-html5-ui-toolkit.
-
- This package is free software; you can redistribute it and/or modify
- it under the terms of the Lesser GNU General Public License as
- published by the Free Software Foundation; either version 3 of the
- License, or
- (at your option) any later version.
-
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this program. If not, see
- <http://www.gnu.org/licenses/>.
--->
+<!-- Copyright (C) Canonical Ltd --> 
 
 <!DOCTYPE html>
 <html>
 <head>
     <meta charset="utf-8">
-    <meta name="copyright" content="Adnane Belmadiaf <[e-mail]>">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
 
     <title>Ubuntu HTML5 SDK: UI Gallery</title>
@@ -69,7 +49,6 @@
         <div data-role="content">
 		<div data-role="tab" id="main">
 			<iframe src="widgets.html" frameborder="0" style="min-height: 600px; width: 300px; display: inline-block;" ></iframe>
-			<iframe src="../widgets/Typography.html" name="component" frameborder="0" style="min-height: 600px; width: calc(100% - 305px); display: inline-block;"></iframe>
 		</div>
         </div>
     </div>

=== modified file 'examples/html5-theme/ui-gallery/widgets.html'
--- examples/html5-theme/ui-gallery/widgets.html	2015-04-30 20:06:20 +0000
+++ examples/html5-theme/ui-gallery/widgets.html	2015-12-18 11:09:01 +0000
@@ -37,9 +37,6 @@
             <section data-role="list">
                 <ul data-role="listview">
                     <li>
-                        <a href="../widgets/Typography.html" target="component">Typography</a>
-                    </li>
-                    <li>
                         <a href="../widgets/Toggles.html" target="component">Toggles</a>
                     </li>
                     <li>
@@ -58,6 +55,9 @@
                         <a href="../widgets/UbuntuShape.html" target="component">Ubuntu Shape</a>
                     </li>
                     <li>
+                        <a href="../widgets/Label.html" target="component">Label</a>
+                    </li>
+                    <li>
                         <a href="../widgets/ListItems.html" target="component">List Items</a>
                     </li>
                     <li>

=== added file 'examples/html5-theme/widgets/Label.html'
--- examples/html5-theme/widgets/Label.html	1970-01-01 00:00:00 +0000
+++ examples/html5-theme/widgets/Label.html	2015-12-18 11:09:01 +0000
@@ -0,0 +1,47 @@
+<!--
+ Copyright (C) Canonical Ltd
+
+ This file is part of ubuntu-html5-ui-toolkit.
+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation; either version 3 of the
+ License, or
+ (at your option) any later version.
+
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this program. If not, see
+ <http://www.gnu.org/licenses/>.
+-->
+
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
+    <title>Ubuntu HTML5 UI SDK: Typography</title>
+    <link href="../../../0.1/ambiance/css/appTemplate.css" rel="stylesheet" type="text/css" />
+</head>
+
+<body>
+    <div data-role="mainview">
+        <div class="content">
+            <div class="inset">
+                <div class="large-font">Label</div><br>
+
+                <p class="xxsmall-font">xx-small</p><br>
+                <p class="xsmall-font">x-small</p><br>
+                <p class="small-font">small</p><br>
+                <p class="medium-font">medium</p><br>
+                <p class="large-font">large</p><br>
+                <p class="xlarge-font">x-large</p><br>
+            </div>
+       </div>
+    </div>
+</body>
+</html>

=== removed file 'examples/html5-theme/widgets/Typography.html'
--- examples/html5-theme/widgets/Typography.html	2014-02-26 10:30:41 +0000
+++ examples/html5-theme/widgets/Typography.html	1970-01-01 00:00:00 +0000
@@ -1,48 +0,0 @@
-<!--
- Copyright (C) Canonical Ltd
-
- This file is part of ubuntu-html5-ui-toolkit.
-
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation; either version 3 of the
- License, or
- (at your option) any later version.
-
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this program. If not, see
- <http://www.gnu.org/licenses/>.
--->
-
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8" />
-    <meta name="copyright" content="Adnane Belmadiaf <[e-mail]>">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
-    <title>Ubuntu HTML5 UI SDK: Typography</title>
-    <link href="../../../0.1/ambiance/css/appTemplate.css" rel="stylesheet" type="text/css" />
-</head>
-
-<body>
-    <div data-role="mainview">
-        <div class="content">
-            <div class="inset">
-                <p class="xlarge-font">Headings</p>
-                <p class="xlarge-font">Extra large Heading</p>
-                <p class="large-font">large Heading</p>
-                <p class="xlarge-font">Body text</p>
-                <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>
-                <p class="xlarge-font">Sub text</p>
-                <p class="xsmall-font">Lorem ipsum dolor sit amet.</p>
-                <p class="xxsmall-font">Lorem ipsum dolor sit amet.</p>
-            </div>
-       </div>
-    </div>
-</body>
-</html>