Merge lp://qastaging/~nataliabidart/ubuntuone-control-panel/u1cp-windows-styling into lp://qastaging/ubuntuone-control-panel

Proposed by Natalia Bidart
Status: Merged
Approved by: Natalia Bidart
Approved revision: 301
Merged at revision: 300
Proposed branch: lp://qastaging/~nataliabidart/ubuntuone-control-panel/u1cp-windows-styling
Merge into: lp://qastaging/ubuntuone-control-panel
Diff against target: 115 lines (+29/-18)
5 files modified
data/qt/linux.qss (+16/-0)
data/qt/ubuntuone.qss (+0/-16)
data/qt/windows.qss (+11/-0)
ubuntuone/controlpanel/gui/qt/main/__init__.py (+1/-1)
ubuntuone/controlpanel/gui/qt/main/tests/test_main.py (+1/-1)
To merge this branch: bzr merge lp://qastaging/~nataliabidart/ubuntuone-control-panel/u1cp-windows-styling
Reviewer Review Type Date Requested Status
Brian Curtin (community) Approve
Roberto Alsina (community) Approve
Review via email: mp+99525@code.qastaging.launchpad.net

Commit message

- Isolate linux specific styling hacks to avoid weird side effects on windows
  (LP: #961229).

To post a comment you must log in.
299. By Natalia Bidart

- Isolate linux specific styling hacks to avoid weird side effects on windows
  (LP: #961229).

300. By Natalia Bidart

- Also fix tests :-).

Revision history for this message
Roberto Alsina (ralsina) wrote :

+1

review: Approve
301. By Natalia Bidart

Merged trunk in.

Revision history for this message
Brian Curtin (brian.curtin) wrote :

+1, IRL test on Windows looks fine.

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