Merge lp:~abreu-alexandre/ubuntu-html5-theme/ubuntu-shape-with-text into lp:ubuntu-html5-theme

[Alexandre Abreu]

need to add an example of shape + text inside

need to add an example of shape + text inside

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:137
http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-ci/102/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3232
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-trusty-amd64-ci/86
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-html5-theme-trusty-armhf-ci/86
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2842
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3234
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3234/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-html5-theme-ci/102/rebuild

review: Approve (continuous-integration)

[Adnane Belmadiaf (daker)]

LGTM.

review: Approve

=== modified file 'examples/html5-theme/widgets/UbuntuShape.html'
--- examples/html5-theme/widgets/UbuntuShape.html	2014-02-12 19:46:04 +0000
+++ examples/html5-theme/widgets/UbuntuShape.html	2014-02-13 19:55:30 +0000
@@ -65,6 +65,16 @@
 	</div>
       </div>
 
+
+      <div class="medium-font">
+	<span>Radius</span>
+	<div data-role="content" style="display: inline">
+          <div data-role="shape">
+	    <div style="display: table;"> <span style="display: table-cell; vertical-align: middle; text-align: center" class="small-font">small</span></div>
+          </div>
+	</div>
+      </div>
+
     </div>
 </body>
 </html>