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 on 2015-03-17
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) 2015-03-17 Approve on 2015-03-17
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.
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.

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
1=== modified file 'edit-here/themes/phone/static/css/app.css'
2--- edit-here/themes/phone/static/css/app.css 2015-02-09 13:40:52 +0000
3+++ edit-here/themes/phone/static/css/app.css 2015-03-17 14:22:10 +0000
4@@ -0,0 +1,38 @@
5+article#content {
6+ padding-left: 15px;
7+ padding-right: 15px;
8+ padding-top: 10px;
9+}
10+
11+[data-role="content"] p {
12+ margin-bottom: .5rem;
13+}
14+
15+[data-role="content"] h1 {
16+ font-size: 1.5rem;
17+ line-height: 1.6;
18+
19+}
20+
21+[data-role="content"] h2 {
22+ font-size: 1.3rem;
23+ line-height: 1.4;
24+}
25+
26+[data-role="content"] h3 {
27+ font-size: 1.1rem;
28+ line-height: 1.3;
29+}
30+
31+article#content ul {
32+ font-size: 0.9rem;
33+ line-height: 1.6;
34+ list-style: disc;
35+ margin-bottom: .5rem;
36+ margin-left: 15px;
37+}
38+
39+a:link, a:visited {
40+ color: #DD4814;
41+ text-decoration: none;
42+}
43\ No newline at end of file
44
45=== modified file 'edit-here/themes/phone/templates/base.html'
46--- edit-here/themes/phone/templates/base.html 2015-02-20 16:08:07 +0000
47+++ edit-here/themes/phone/templates/base.html 2015-03-17 14:22:10 +0000
48@@ -4,18 +4,19 @@
49 <head>
50 <title>Ubuntu for devices - Help</title>
51 <meta name="description" content="Ubuntu for devices - Help">
52- <meta name="viewport" content="width=device-width, initial-scale=1,
53+ <meta name="viewport" content="width=device-width, initial-scale=1,
54 maximum-scale=1, user-scalable=0">
55 <meta charset="utf-8" />
56- <link rel="stylesheet" href="{{ THEME_STATIC_DIR }}/css/app.css" />
57-
58- <!--
59- Ubuntu UI javascript imports - Ambiance theme
60- 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.
61- -->
62+
63+
64+
65 <!-- Ubuntu UI Style imports - Ambiance theme -->
66 <link href="/usr/share/ubuntu-html5-ui-toolkit/0.1/ambiance/css/appTemplate.css" rel="stylesheet" type="text/css" />
67
68+ <!-- App-specific styles -->
69+ <link rel="stylesheet" href="{{ THEME_STATIC_DIR }}/css/app.css" />
70+
71+ <!-- Ubuntu UI javascript imports - Ambiance theme -->
72 <script src="/usr/share/ubuntu-html5-ui-toolkit/0.1/ambiance/js/fast-buttons.js"></script>
73 <script src="/usr/share/ubuntu-html5-ui-toolkit/0.1/ambiance/js/core.js"></script>
74 <script src="/usr/share/ubuntu-html5-ui-toolkit/0.1/ambiance/js/buttons.js"></script>
75@@ -24,7 +25,7 @@
76 <script src="/usr/share/ubuntu-html5-ui-toolkit/0.1/ambiance/js/pagestacks.js"></script>
77 <script src="/usr/share/ubuntu-html5-ui-toolkit/0.1/ambiance/js/tab.js"></script>
78 <script src="/usr/share/ubuntu-html5-ui-toolkit/0.1/ambiance/js/tabs.js"></script>
79-
80+
81 <script src="{{ THEME_STATIC_DIR }}/js/app.js"></script>
82
83 </head>
84@@ -36,7 +37,7 @@
85 </ul>
86 </header>
87
88- <div data-role="content">
89+ <div data-role="content">
90
91 <article id="content">
92 {# Main content block. Notice it has to pass through the
93@@ -45,7 +46,8 @@
94 #}
95 {% block content %}{% endblock %}
96 </article>
97- </div>
98- </div>
99+
100+ </div> <!-- content -->
101+ </div> <!-- mainview -->
102 </body>
103 </html>

Subscribers

People subscribed via source and target branches