Summit

Merge lp://staging/~daker/summit/fix.summit-colors into lp://staging/summit

  1. fix.summit-colors
  2. Merge into trunk
Proposed by Adnane Belmadiaf
Status: Merged
Approved by: Chris Johnston
Approved revision: 477
Merged at revision: 478
Proposed branch: lp://staging/~daker/summit/fix.summit-colors
Merge into: lp://staging/summit
Diff against target: 253 lines (+50/-32)
5 files modified
summit/common/utils.py (+11/-2)
summit/media/css/schedule.css (+4/-5)
summit/schedule/context_processors.py (+0/-1)
summit/schedule/models/trackmodel.py (+13/-0)
summit/schedule/render.py (+22/-24)
To merge this branch: bzr merge lp://staging/~daker/summit/fix.summit-colors
Reviewer Review Type Date Requested Status
Chris Johnston Approve
Review via email: mp+138597@code.staging.launchpad.net

Commit message

* Added friendly colors for the track block
* Css fixes
* Removed the empty context_processors file

Description of the change

Preview : http://i.imgur.com/wBfwe.png

To post a comment you must log in.
Revision history for this message
Chris Johnston (cjohnston) :
review: Approve
Revision history for this message
Tarmac WebDev (tarmac-webdev) wrote :

Attempt to merge into lp:summit failed due to conflicts:

text conflict in summit/common/utils.py

lp://staging/~daker/summit/fix.summit-colors updated
477. By Adnane Belmadiaf

- Merged trunk
- Fixed text conflicts
- Removed unused imports

Revision history for this message
Chris Johnston (cjohnston) :
review: Approve

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