Merge lp://qastaging/~azzar1/unity/fix-748101 into lp://qastaging/unity

Proposed by Andrea Azzarone
Status: Merged
Approved by: Andrea Azzarone
Approved revision: no longer in the source branch.
Merged at revision: 2096
Proposed branch: lp://qastaging/~azzar1/unity/fix-748101
Merge into: lp://qastaging/unity
Diff against target: 137 lines (+52/-1)
5 files modified
plugins/unityshell/src/PlacesGroup.cpp (+14/-0)
plugins/unityshell/src/StaticCairoText.cpp (+7/-1)
plugins/unityshell/src/StaticCairoText.h (+2/-0)
tests/autopilot/autopilot/emulators/unity/dash.py (+5/-0)
tests/autopilot/autopilot/tests/test_dash.py (+24/-0)
To merge this branch: bzr merge lp://qastaging/~azzar1/unity/fix-748101
Reviewer Review Type Date Requested Status
Alex Launi (community) Approve
Marco Trevisan (Treviño) Approve
Thomi Richards (community) Approve
Andrea Cimitan (community) design Approve
Review via email: mp+95139@code.qastaging.launchpad.net

Description of the change

= The Problem =

See: https://bugs.launchpad.net/unity/+bug/748101.

= The Fix =

Keep in consideration the baseline to align the labels inside the category header.

= Testing =

AP test: ./tools/autopilot run autopilot.tests.test_dash.DashVisualTests.test_see_more_result_alignment

To post a comment you must log in.
Revision history for this message
Andrea Cimitan (cimi) :
review: Approve (design)
Revision history for this message
Thomi Richards (thomir-deactivatedaccount) :
review: Approve
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Looks good.

review: Approve
Revision history for this message
Alex Launi (alexlauni) wrote :

AP test looks good.

review: Approve
Revision history for this message
Unity Merger (unity-merger) wrote :

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/427/console reported an error when processing this lp:~andyrock/unity/fix-748101 branch.
Not merging it.

Revision history for this message
Unity Merger (unity-merger) wrote :

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

text conflict in tests/autopilot/autopilot/tests/test_dash.py

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.