Merge lp://staging/~dpm/developer-ubuntu-com/django-cms-no-hero-wrapping into lp://staging/developer-ubuntu-com
Proposed by
David Planella
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Merged at revision: | 46 | ||||
| Proposed branch: | lp://staging/~dpm/developer-ubuntu-com/django-cms-no-hero-wrapping | ||||
| Merge into: | lp://staging/developer-ubuntu-com | ||||
| Diff against target: |
205 lines (+49/-22) (has conflicts) 11 files modified
README.md (+29/-2) developer_portal/settings.py (+0/-1) locale/developer_portal.pot (+1/-1) templates/base.html (+3/-5) templates/cms/plugins/picture.html (+3/-0) templates/cms/plugins/text.html (+7/-3) templates/default.html (+1/-1) templates/landing_page.html (+3/-2) templates/no_subnav.html (+1/-1) templates/website_base.html (+0/-5) templates/with_hero.html (+1/-1) Text conflict in README.md |
||||
| To merge this branch: | bzr merge lp://staging/~dpm/developer-ubuntu-com/django-cms-no-hero-wrapping | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Daniel Holbach (community) | Approve | ||
| Michael Hall | Pending | ||
|
Review via email:
|
|||
Description of the change
Fix the issue whereby the hero text was wrapped inside a row. The hero image positioning still needs fixing.
Along the way, simplified content blocks and markup a bit.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Good work. I fixed 2 small conflicts in the same commit.