Merge lp://staging/~methanal-developers/methanal/expander-widget into lp://staging/methanal
Proposed by
Jonathan Jacobs
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Tristan Seligmann | ||||
| Approved revision: | 144 | ||||
| Merged at revision: | 162 | ||||
| Proposed branch: | lp://staging/~methanal-developers/methanal/expander-widget | ||||
| Merge into: | lp://staging/methanal | ||||
| Diff against target: |
968 lines (+383/-418) 9 files modified
methanal/js/Methanal/Widgets.js (+211/-149) methanal/static/styles/methanal-ie.css (+0/-17) methanal/static/styles/methanal-ie6.css (+0/-60) methanal/static/styles/methanal.css (+42/-95) methanal/themes/methanal-base/methanal-expander-header.html (+5/-0) methanal/themes/methanal-base/methanal-expander.html (+6/-0) methanal/themes/methanal-base/methanal-rollup.html (+0/-20) methanal/themes/methanal-base/methanal-simple-rollup.html (+0/-14) methanal/widgets.py (+119/-63) |
||||
| To merge this branch: | bzr merge lp://staging/~methanal-developers/methanal/expander-widget | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Tristan Seligmann | Approve | ||
|
Review via email:
|
|||
To post a comment you must log in.
Revision history for this message
| Tristan Seligmann (mithrandi) | # |
review:
Approve
Revision history for this message
| Jonathan Jacobs (jjacobs) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Looks like this will have to wait a bit before being merged into trunk, Fusion appears to rely on SimpleRollup for some stuff.