Merge lp://staging/~dholbach/help-app/1425984 into lp://staging/~ubuntu-touch-coreapps-drivers/help-app/trunk

Proposed by Daniel Holbach
Status: Merged
Merged at revision: 58
Proposed branch: lp://staging/~dholbach/help-app/1425984
Merge into: lp://staging/~ubuntu-touch-coreapps-drivers/help-app/trunk
Diff against target: 2566 lines (+2418/-3)
20 files modified
.bzrignore (+1/-0)
HACKING (+11/-0)
Makefile (+4/-2)
edit-here/Makefile (+7/-0)
edit-here/pelicanconf.py (+1/-1)
edit-here/themes/web/static/css/core-print.css (+1/-0)
edit-here/themes/web/static/css/global-responsive.css (+352/-0)
edit-here/themes/web/static/css/styles.css (+9/-0)
edit-here/themes/web/static/css/ubuntu-styles.css (+1/-0)
edit-here/themes/web/static/img/logo-ubuntu-orange.svg (+60/-0)
edit-here/themes/web/static/js/Imager.js (+389/-0)
edit-here/themes/web/static/js/core.js (+231/-0)
edit-here/themes/web/static/js/global.js (+111/-0)
edit-here/themes/web/static/js/modernizr.2.7.1.js (+4/-0)
edit-here/themes/web/static/js/respond.min.js (+6/-0)
edit-here/themes/web/static/js/scratch.js (+512/-0)
edit-here/themes/web/static/js/yui-combined.min.js (+497/-0)
edit-here/themes/web/templates/base.html (+207/-0)
edit-here/themes/web/templates/index.html (+5/-0)
edit-here/themes/web/templates/page.html (+9/-0)
To merge this branch: bzr merge lp://staging/~dholbach/help-app/1425984
Reviewer Review Type Date Requested Status
Nicholas Skaggs (community) Approve
Review via email: mp+251116@code.staging.launchpad.net

Description of the change

Initial theme for 'web'. Kick off a web build by running 'make html'.

To post a comment you must log in.
60. By Daniel Holbach

remove top-leve 'make serve' - it wasn't that useful

Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

I can't speak much to how it should look, but it builds cleanly, the content is there and it's certainly viewable.

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

Great. Merging.

Let's fix theme problems in separate bugs as soon as we get aware of them. :-)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches