lp:~tpeeters/ubuntu-ui-toolkit/10-headAnimate

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu-ui-toolkit/staging at revision 1218

PS Jenkins bot: Approve (continuous-integration) on 2014-08-26

Zsombor Egri: Pending requested 2014-08-26

Diff: 1044 lines (+391/-124)

16 files modified

modules/Ubuntu/Components/AppHeader.qml (+5/-0)
modules/Ubuntu/Components/Icon10.qml (+1/-1)
modules/Ubuntu/Components/MainView.qml (+1/-0)
modules/Ubuntu/Components/PageStack.qml (+7/-6)
modules/Ubuntu/Components/PageWrapperUtils.js (+3/-1)
modules/Ubuntu/Components/Styles/PageHeadStyle.qml (+2/-0)
modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml (+166/-29)
tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_header.py (+19/-0)
tests/autopilot/ubuntuuitoolkit/tests/components/test_header.py (+2/-0)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_tabs.TabsTestCase.deprecated_TabBar.qml (+61/-0)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_tabs.TabsTestCase.new_header.qml (+43/-0)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_tabs.py (+14/-56)
tests/resources/header/header.qml (+4/-6)
tests/resources/navigation/MyCustomPage.qml (+17/-25)
tests/unit_x11/tst_components/tst_headActions.qml (+13/-0)
tests/unit_x11/tst_components/tst_pagestack_new_header.qml (+33/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1213. By Tim Peeters on 2014-08-26

merge sourceOverflow

1212. By Tim Peeters on 2014-08-26

clean

1211. By Tim Peeters on 2014-08-26

merge staging

1210. By Tim Peeters on 2014-08-22

kick jenkins

1209. By Tim Peeters on 2014-08-21

fix source issue

1208. By Tim Peeters on 2014-08-21

merge 07-tabsUnitTests

1207. By Tim Peeters on 2014-08-21

merge staging

1206. By Tim Peeters on 2014-08-20

merge staging

1205. By Tim Peeters on 2014-08-20

flake8

1204. By Tim Peeters on 2014-08-19

kick jenkins