OpenERP Community Backports (Web)

Merge lp://staging/~camptocamp/ocb-web/webclient-width-large into lp://staging/ocb-web

  1. webclient-width-large
  2. Merge into 7.0
Proposed by Nicolas Bessi - Camptocamp
Status: Merged
Merged at revision: 3922
Proposed branch: lp://staging/~camptocamp/ocb-web/webclient-width-large
Merge into: lp://staging/ocb-web
Diff against target: 89 lines (+13/-9)
2 files modified
addons/web/static/src/css/base.css (+7/-4)
addons/web/static/src/css/base.sass (+6/-5)
To merge this branch: bzr merge lp://staging/~camptocamp/ocb-web/webclient-width-large
Reviewer Review Type Date Requested Status
Holger Brunn (Therp) Approve
Stefan Rijnhart (Opener) Pending
Nicolas Bessi - Camptocamp Pending
Review via email: mp+162032@code.staging.launchpad.net

This proposal supersedes a proposal from 2013-04-29.

Description of the change

Hello,

I have updated sass file and regenrated css file. I also improved a little bit original fix.

To post a comment you must log in.
Revision history for this message
Stefan Rijnhart (Opener) (stefan-opener) wrote : Posted in a previous version of this proposal

Thanks!

review: Approve (test)
Revision history for this message
Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount) wrote : Posted in a previous version of this proposal

LGTM

review: Approve
Revision history for this message
Stefan Rijnhart (Opener) (stefan-opener) wrote : Posted in a previous version of this proposal

Thanks for the merge Nicolas! Seems like we both missed the fact that the sass file was not updated. Vincent, can you please add the changes to the sass file from which the css is generated, and then actually regenerate the css file from the sass?

I'll reset the status of this MP.

review: Needs Fixing
Revision history for this message
Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount) wrote : Posted in a previous version of this proposal

Right your are… I was to fast.
I will update the saas file.

Revision history for this message
Holger Brunn (Therp) (hbrunn) wrote :

seems fine now

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