lp:~tpeeters/ubuntu-ui-toolkit/30-optIn-tabsDrawer

Branch merges

Propose for merging

No branches dependent on this one.

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

Zsombor Egri: Approve on 2014-04-25

PS Jenkins bot: Approve (continuous-integration) on 2014-04-24

Diff: 560 lines (+318/-58)

10 files modified

components.api (+1/-0)
modules/Ubuntu/Components/Header.qml (+19/-2)
modules/Ubuntu/Components/MainView.qml (+9/-1)
modules/Ubuntu/Components/Page.qml (+1/-1)
modules/Ubuntu/Components/Themes/Ambiance/NewHeaderStyle.qml (+146/-0)
modules/Ubuntu/Components/Themes/Ambiance/qmldir (+1/-0)
tests/autopilot/ubuntuuitoolkit/emulators.py (+93/-20)
tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py (+42/-32)
tests/resources/navigation/SimpleTabs.qml (+2/-0)
tests/resources/navigation/Tabs.qml (+4/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1228042: Flickable anchor margins changes when you push/pop a page	Critical	Fix Released
Bug #1273187: Tabs in drawer	Critical	Fix Released

Link a bug report

Related blueprints

999. By Tim Peeters on 2014-04-24

merge staging :) 20- is in there now

998. By Tim Peeters on 2014-04-24

merge staging

997. By Tim Peeters on 2014-04-24

update copyright year

996. By Tim Peeters on 2014-04-24

fix test program

995. By Tim Peeters on 2014-04-24

update comments

994. By Tim Peeters on 2014-04-24

update imports of Ubuntu.Components to 1.0

993. By Tim Peeters on 2014-04-24

update components.api

992. By Tim Peeters on 2014-04-24

fix spelling in comment

991. By Tim Peeters on 2014-04-24

no need to document something obvious

990. By Tim Peeters on 2014-04-24

improve AP test and fix flake8 warning