Merge lp://staging/~dpm/help-app/web-layout into lp://staging/~ubuntu-touch-coreapps-drivers/help-app/trunk
Proposed by
David Planella
| Status: | Merged |
|---|---|
| Merged at revision: | 81 |
| Proposed branch: | lp://staging/~dpm/help-app/web-layout |
| Merge into: | lp://staging/~ubuntu-touch-coreapps-drivers/help-app/trunk |
| Diff against target: |
13802 lines (+8137/-4825) 20 files modified
edit-here/content/pages/apps.md (+57/-79) edit-here/content/pages/basic.md (+23/-31) edit-here/content/pages/faq.md (+2/-4) edit-here/content/pages/index.md (+4/-8) edit-here/content/pages/scopes.md (+8/-11) edit-here/content/pages/security.md (+20/-27) edit-here/content/pages/settings.md (+20/-27) edit-here/content/pages/store.md (+8/-11) edit-here/content/pages/ui.md (+25/-34) edit-here/po/de.po (+1151/-610) edit-here/po/es.po (+1168/-632) edit-here/po/fr.po (+1149/-609) edit-here/po/help.pot (+833/-546) edit-here/po/it.po (+1149/-609) edit-here/po/pt.po (+1261/-827) edit-here/po/ro.po (+1149/-609) edit-here/themes/web/templates/_footer.html (+62/-0) edit-here/themes/web/templates/_head.html (+17/-0) edit-here/themes/web/templates/_header.html (+8/-0) edit-here/themes/web/templates/base.html (+23/-151) |
| To merge this branch: | bzr merge lp://staging/~dpm/help-app/web-layout |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Daniel Holbach (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
Improvements to the web layout and markup. This is just the first step with the most basic modifications to the web template.
It's a big diff, but in a nutshell, the changes are:
- Modularized the web templates with includes, did some layout fixes
- Changed the Q&A markup to <h3> instead of definition lists to improve the layout. This works better with translations too: questions and answers are now separate in the .pot file
- Changed the title markup from ==== to ## - this makes python-markdown detect them as headers and puts only the text in the .pot file, instead of the === line too
To post a comment you must log in.
Revision history for this message
| Daniel Holbach (dholbach) wrote | # |
Revision history for this message
| David Planella (dpm) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
A few small things:
- the 'phone' build (make html) looks like <h3> and normal text are the same
- some of the assets are pulled from assets.u.c - this is a change from how
things worked up until now and I'm not sure we should do that (offline use)
Apart from that: great work - much much clearer.