Ubuntu Help App

Merge lp:~dpm/help-app/phone-theme-fixes into lp:~ubuntu-touch-coreapps-drivers/help-app/trunk

  1. phone-theme-fixes
  2. Merge into trunk
Proposed by David Planella
Status: Merged
Merged at revision: 103
Proposed branch: lp:~dpm/help-app/phone-theme-fixes
Merge into: lp:~ubuntu-touch-coreapps-drivers/help-app/trunk
Diff against target: 103 lines (+51/-11)
2 files modified
edit-here/themes/phone/static/css/app.css (+38/-0)
edit-here/themes/phone/templates/base.html (+13/-11)
To merge this branch: bzr merge lp:~dpm/help-app/phone-theme-fixes
Reviewer Review Type Date Requested Status
Daniel Holbach (community) Approve
Review via email: mp+253209@code.launchpad.net

Description of the change

Basic styling for the phone theme.

To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote :

Great work. It looks so much nicer.

A small thing: it looks like for the new branch placement of images is a bit off - with lp:~dholbach/help-app/1430735-pt5 that's in app/www/settings.de.html

If you want we can land this in a separate branch or bug... just let me know.

Revision history for this message
Daniel Holbach (dholbach) wrote :

Please land this soon, we can take care of the image placing in a separate bug. No problem.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'edit-here/themes/phone/static/css/app.css'
--- edit-here/themes/phone/static/css/app.css 2015-02-09 13:40:52 +0000
+++ edit-here/themes/phone/static/css/app.css 2015-03-17 14:22:10 +0000
@@ -0,0 +1,38 @@
1article#content {
2 padding-left: 15px;
3 padding-right: 15px;
4 padding-top: 10px;
5}
6
7[data-role="content"] p {
8 margin-bottom: .5rem;
9}
10
11[data-role="content"] h1 {
12 font-size: 1.5rem;
13 line-height: 1.6;
14
15}
16
17[data-role="content"] h2 {
18 font-size: 1.3rem;
19 line-height: 1.4;
20}
21
22[data-role="content"] h3 {
23 font-size: 1.1rem;
24 line-height: 1.3;
25}
26
27article#content ul {
28 font-size: 0.9rem;
29 line-height: 1.6;
30 list-style: disc;
31 margin-bottom: .5rem;
32 margin-left: 15px;
33}
34
35a:link, a:visited {
36 color: #DD4814;
37 text-decoration: none;
38}
0\ No newline at end of file39\ No newline at end of file
140
=== modified file 'edit-here/themes/phone/templates/base.html'
--- edit-here/themes/phone/templates/base.html 2015-02-20 16:08:07 +0000
+++ edit-here/themes/phone/templates/base.html 2015-03-17 14:22:10 +0000
@@ -4,18 +4,19 @@
4 <head>4 <head>
5 <title>Ubuntu for devices - Help</title>5 <title>Ubuntu for devices - Help</title>
6 <meta name="description" content="Ubuntu for devices - Help">6 <meta name="description" content="Ubuntu for devices - Help">
7 <meta name="viewport" content="width=device-width, initial-scale=1, 7 <meta name="viewport" content="width=device-width, initial-scale=1,
8 maximum-scale=1, user-scalable=0">8 maximum-scale=1, user-scalable=0">
9 <meta charset="utf-8" />9 <meta charset="utf-8" />
10 <link rel="stylesheet" href="{{ THEME_STATIC_DIR }}/css/app.css" />10
1111
12 <!-- 12
13 Ubuntu UI javascript imports - Ambiance theme
14 Ubuntu provides building blocks that you can use in your application. For more information, you can check out the documentation at http://design.ubuntu.com/apps.
15 -->
16 <!-- Ubuntu UI Style imports - Ambiance theme -->13 <!-- Ubuntu UI Style imports - Ambiance theme -->
17 <link href="/usr/share/ubuntu-html5-ui-toolkit/0.1/ambiance/css/appTemplate.css" rel="stylesheet" type="text/css" />14 <link href="/usr/share/ubuntu-html5-ui-toolkit/0.1/ambiance/css/appTemplate.css" rel="stylesheet" type="text/css" />
1815
16 <!-- App-specific styles -->
17 <link rel="stylesheet" href="{{ THEME_STATIC_DIR }}/css/app.css" />
18
19 <!-- Ubuntu UI javascript imports - Ambiance theme -->
19 <script src="/usr/share/ubuntu-html5-ui-toolkit/0.1/ambiance/js/fast-buttons.js"></script>20 <script src="/usr/share/ubuntu-html5-ui-toolkit/0.1/ambiance/js/fast-buttons.js"></script>
20 <script src="/usr/share/ubuntu-html5-ui-toolkit/0.1/ambiance/js/core.js"></script>21 <script src="/usr/share/ubuntu-html5-ui-toolkit/0.1/ambiance/js/core.js"></script>
21 <script src="/usr/share/ubuntu-html5-ui-toolkit/0.1/ambiance/js/buttons.js"></script>22 <script src="/usr/share/ubuntu-html5-ui-toolkit/0.1/ambiance/js/buttons.js"></script>
@@ -24,7 +25,7 @@
24 <script src="/usr/share/ubuntu-html5-ui-toolkit/0.1/ambiance/js/pagestacks.js"></script>25 <script src="/usr/share/ubuntu-html5-ui-toolkit/0.1/ambiance/js/pagestacks.js"></script>
25 <script src="/usr/share/ubuntu-html5-ui-toolkit/0.1/ambiance/js/tab.js"></script>26 <script src="/usr/share/ubuntu-html5-ui-toolkit/0.1/ambiance/js/tab.js"></script>
26 <script src="/usr/share/ubuntu-html5-ui-toolkit/0.1/ambiance/js/tabs.js"></script>27 <script src="/usr/share/ubuntu-html5-ui-toolkit/0.1/ambiance/js/tabs.js"></script>
27 28
28 <script src="{{ THEME_STATIC_DIR }}/js/app.js"></script>29 <script src="{{ THEME_STATIC_DIR }}/js/app.js"></script>
2930
30 </head>31 </head>
@@ -36,7 +37,7 @@
36 </ul>37 </ul>
37 </header>38 </header>
3839
39 <div data-role="content">40 <div data-role="content">
4041
41 <article id="content">42 <article id="content">
42 {# Main content block. Notice it has to pass through the43 {# Main content block. Notice it has to pass through the
@@ -45,7 +46,8 @@
45 #}46 #}
46 {% block content %}{% endblock %}47 {% block content %}{% endblock %}
47 </article>48 </article>
48 </div>49
49 </div>50 </div> <!-- content -->
51 </div> <!-- mainview -->
50 </body>52 </body>
51</html>53</html>

Subscribers

People subscribed via source and target branches