← Back to branch summary

~abreu-alexandre/ubuntu-html5-theme/fix-oxide-support-rtm-14.09

« back to all changes in this revision

Viewing changes to examples/html5-theme/ui-gallery/widgets.html

  • Committer: CI bot
  • Author(s): David Barth
  • Date: 2014-04-04 14:11:43 UTC
  • mfrom: (160.3.3 super-stack)
  • Revision ID: ps-jenkins@lists.canonical.com-20140404141143-fsdf0rlxbiux4y3w
This branch aggregates 3 branches to help resolve SASS/CSS conflicts on the same file:
- merge of fix.1286362
- merge of typography-update
- merge of the fix.gallery-dialog branch 

Show diffs side-by-side

added added

removed removed

Lines of Context:
examples/html5-theme/ui-gallery/widgets.html
37
37
            <section data-role="list">
38
38
                <ul data-role="listview">
39
39
                    <li>
 
40
                        <a href="../widgets/Typography.html" target="component">Typography</a>
 
41
                    </li>
 
42
                    <li>
40
43
                        <a href="../widgets/Toggles.html" target="component">Toggles</a>
41
44
                    </li>
42
45
                    <li>