Ubuntu Community Web Themes

Merge lp://staging/~dooferlad/ubuntu-community-webthemes/linaro-small-theme into lp://staging/~linaro-connect-theme-devs/ubuntu-community-webthemes/light-django-linaro-theme

  1. linaro-small-theme
  2. Merge into light-django-linaro-theme
Proposed by Chris Johnston
Status: Merged
Approved by: Chris Johnston
Approved revision: 49
Merged at revision: 45
Proposed branch: lp://staging/~dooferlad/ubuntu-community-webthemes/linaro-small-theme
Merge into: lp://staging/~linaro-connect-theme-devs/ubuntu-community-webthemes/light-django-linaro-theme
Diff against target: 247 lines (+116/-31) (has conflicts)
5 files modified
media/css/core-grid.css (+73/-28)
media/css/core.css (+3/-0)
media/css/extra_styles.css (+33/-1)
media/css/old/default.css (+2/-2)
templates/website_base.html (+5/-0)
Text conflict in templates/website_base.html
To merge this branch: bzr merge lp://staging/~dooferlad/ubuntu-community-webthemes/linaro-small-theme
Reviewer Review Type Date Requested Status
Linaro Infrastructure Pending
Review via email: mp+103028@code.staging.launchpad.net
To post a comment you must log in.
lp://staging/~dooferlad/ubuntu-community-webthemes/linaro-small-theme updated
48. By James Tunnicliffe

More changes to make the site look nice at all screen widths

49. By James Tunnicliffe

Collapse padding on .row elements when screen width small

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