Viewing all changes in revision 1178.
- Committer: Gerry Boland
- Date: 2015-04-27 11:04:48 UTC
- mfrom: (1000.444.42 staging)
- Revision ID: gerry.boland@canonical.com-20150427110448-jmjwyez9x79juwxa
Merge current staging branch
- files added:
- documentation/autopilot-helpers/_build
- documentation/autopilot-helpers/_build/html
- documentation/autopilot-helpers/_build/html/_modules
- documentation/autopilot-helpers/_build/html/_sources
- documentation/autopilot-helpers/_build/html/_static
- documentation/autopilot-helpers/_build/json
- documentation/autopilot-helpers/_build/json/_modules
- documentation/autopilot-helpers/_build/json/_sources
- documentation/autopilot-helpers/_build/json/_static
- modules/Ubuntu/Components/Themes/1.2
- modules/Ubuntu/Components/Themes/1.3
- modules/Ubuntu/Components/Themes/Ambiance/1.2
- modules/Ubuntu/Components/Themes/Ambiance/1.3
- modules/Ubuntu/Components/Themes/SuruDark/1.2
- modules/Ubuntu/Components/Themes/SuruDark/1.3
- tests/unit_x11/tst_subtheming/themes/CustomTheme/1.3
- tests/unit_x11/tst_subtheming/themes/TestModule/TestTheme/1.3
- files removed:
- modules/Ubuntu/Components/StyledItem.qml
- files renamed:
- modules/Ubuntu/Components/Themes/Palette.qml => modules/Ubuntu/Components/Themes/1.3/Palette.qml
- modules/Ubuntu/Components/Themes/PaletteValues.qml => modules/Ubuntu/Components/Themes/1.3/PaletteValues.qml
- modules/Ubuntu/Components/Themes/Ambiance/ActivityIndicatorStyle.qml => modules/Ubuntu/Components/Themes/Ambiance/1.3/ActivityIndicatorStyle.qml
- modules/Ubuntu/Components/Themes/Ambiance/BubbleShape.qml => modules/Ubuntu/Components/Themes/Ambiance/1.3/BubbleShape.qml
- modules/Ubuntu/Components/Themes/Ambiance/ButtonForeground.qml => modules/Ubuntu/Components/Themes/Ambiance/1.3/ButtonForeground.qml
- modules/Ubuntu/Components/Themes/Ambiance/ButtonStyle.qml => modules/Ubuntu/Components/Themes/Ambiance/1.3/ButtonStyle.qml
- modules/Ubuntu/Components/Themes/Ambiance/CheckBoxStyle.qml => modules/Ubuntu/Components/Themes/Ambiance/1.3/CheckBoxStyle.qml
- modules/Ubuntu/Components/Themes/Ambiance/ComboButtonStyle.qml => modules/Ubuntu/Components/Themes/Ambiance/1.3/ComboButtonStyle.qml
- modules/Ubuntu/Components/Themes/Ambiance/DatePickerStyle.qml => modules/Ubuntu/Components/Themes/Ambiance/1.3/DatePickerStyle.qml
- modules/Ubuntu/Components/Themes/Ambiance/DialerHandStyle.qml => modules/Ubuntu/Components/Themes/Ambiance/1.3/DialerHandStyle.qml
- modules/Ubuntu/Components/Themes/Ambiance/DialerStyle.qml => modules/Ubuntu/Components/Themes/Ambiance/1.3/DialerStyle.qml
- modules/Ubuntu/Components/Themes/Ambiance/DialogForegroundStyle.qml => modules/Ubuntu/Components/Themes/Ambiance/1.3/DialogForegroundStyle.qml
- modules/Ubuntu/Components/Themes/Ambiance/HeadDividerStyle.qml => modules/Ubuntu/Components/Themes/Ambiance/1.3/HeadDividerStyle.qml
- modules/Ubuntu/Components/Themes/Ambiance/HeaderStyle.qml => modules/Ubuntu/Components/Themes/Ambiance/1.3/HeaderStyle.qml
- modules/Ubuntu/Components/Themes/Ambiance/HighlightMagnifier.qml => modules/Ubuntu/Components/Themes/Ambiance/1.3/HighlightMagnifier.qml
- modules/Ubuntu/Components/Themes/Ambiance/ListItemOptionSelectorStyle.qml => modules/Ubuntu/Components/Themes/Ambiance/1.3/ListItemOptionSelectorStyle.qml
- modules/Ubuntu/Components/Themes/Ambiance/ListItemStyle.qml => modules/Ubuntu/Components/Themes/Ambiance/1.3/ListItemStyle.qml
- modules/Ubuntu/Components/Themes/Ambiance/MainViewStyle.qml => modules/Ubuntu/Components/Themes/Ambiance/1.3/MainViewStyle.qml
- modules/Ubuntu/Components/Themes/Ambiance/OptionSelectorStyle.qml => modules/Ubuntu/Components/Themes/Ambiance/1.3/OptionSelectorStyle.qml
- modules/Ubuntu/Components/Themes/Ambiance/OverflowPanel.qml => modules/Ubuntu/Components/Themes/Ambiance/1.3/OverflowPanel.qml
- modules/Ubuntu/Components/Themes/Ambiance/PageHeadButton.qml => modules/Ubuntu/Components/Themes/Ambiance/1.3/PageHeadButton.qml
- modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml => modules/Ubuntu/Components/Themes/Ambiance/1.3/PageHeadStyle.qml
- modules/Ubuntu/Components/Themes/Ambiance/Palette.qml => modules/Ubuntu/Components/Themes/Ambiance/1.3/Palette.qml
- modules/Ubuntu/Components/Themes/Ambiance/PartialColorize.qml => modules/Ubuntu/Components/Themes/Ambiance/1.3/PartialColorize.qml
- modules/Ubuntu/Components/Themes/Ambiance/PickerDelegateStyle.qml => modules/Ubuntu/Components/Themes/Ambiance/1.3/PickerDelegateStyle.qml
- modules/Ubuntu/Components/Themes/Ambiance/PickerStyle.qml => modules/Ubuntu/Components/Themes/Ambiance/1.3/PickerStyle.qml
- modules/Ubuntu/Components/Themes/Ambiance/PopoverForegroundStyle.qml => modules/Ubuntu/Components/Themes/Ambiance/1.3/PopoverForegroundStyle.qml
- modules/Ubuntu/Components/Themes/Ambiance/ProgressBarStyle.qml => modules/Ubuntu/Components/Themes/Ambiance/1.3/ProgressBarStyle.qml
- modules/Ubuntu/Components/Themes/Ambiance/ProgressionVisualStyle.qml => modules/Ubuntu/Components/Themes/Ambiance/1.3/ProgressionVisualStyle.qml
- modules/Ubuntu/Components/Themes/Ambiance/PullToRefreshStyle.qml => modules/Ubuntu/Components/Themes/Ambiance/1.3/PullToRefreshStyle.qml
- modules/Ubuntu/Components/Themes/Ambiance/ScrollbarStyle.qml => modules/Ubuntu/Components/Themes/Ambiance/1.3/ScrollbarStyle.qml
- modules/Ubuntu/Components/Themes/Ambiance/SheetForegroundStyle.qml => modules/Ubuntu/Components/Themes/Ambiance/1.3/SheetForegroundStyle.qml
- modules/Ubuntu/Components/Themes/Ambiance/SliderStyle.qml => modules/Ubuntu/Components/Themes/Ambiance/1.3/SliderStyle.qml
- modules/Ubuntu/Components/Themes/Ambiance/SwitchStyle.qml => modules/Ubuntu/Components/Themes/Ambiance/1.3/SwitchStyle.qml
- modules/Ubuntu/Components/Themes/Ambiance/TabBarStyle.qml => modules/Ubuntu/Components/Themes/Ambiance/1.3/TabBarStyle.qml
- modules/Ubuntu/Components/Themes/Ambiance/TextAreaStyle.qml => modules/Ubuntu/Components/Themes/Ambiance/1.3/TextAreaStyle.qml
- modules/Ubuntu/Components/Themes/Ambiance/TextCursorStyle.qml => modules/Ubuntu/Components/Themes/Ambiance/1.3/TextCursorStyle.qml
- modules/Ubuntu/Components/Themes/Ambiance/TextFieldStyle.qml => modules/Ubuntu/Components/Themes/Ambiance/1.3/TextFieldStyle.qml
- modules/Ubuntu/Components/Themes/Ambiance/ToolbarButtonStyle.qml => modules/Ubuntu/Components/Themes/Ambiance/1.3/ToolbarButtonStyle.qml
- modules/Ubuntu/Components/Themes/Ambiance/ToolbarStyle.qml => modules/Ubuntu/Components/Themes/Ambiance/1.3/ToolbarStyle.qml
- modules/Ubuntu/Components/Themes/SuruDark/MainViewStyle.qml => modules/Ubuntu/Components/Themes/SuruDark/1.3/MainViewStyle.qml
- modules/Ubuntu/Components/Themes/SuruDark/OptionSelectorStyle.qml => modules/Ubuntu/Components/Themes/SuruDark/1.3/OptionSelectorStyle.qml
- modules/Ubuntu/Components/Themes/SuruDark/Palette.qml => modules/Ubuntu/Components/Themes/SuruDark/1.3/Palette.qml
- modules/Ubuntu/Components/Themes/SuruDark/TabBarStyle.qml => modules/Ubuntu/Components/Themes/SuruDark/1.3/TabBarStyle.qml
- files modified:
- components.api
expand all
collapse all
added
removed
documentation/autopilot-helpers/_build/html/_static/ajax-loader.gif
documentation/autopilot-helpers/_build/html/_static/comment-bright.png
documentation/autopilot-helpers/_build/html/_static/comment-close.png
documentation/autopilot-helpers/_build/html/_static/comment.png
documentation/autopilot-helpers/_build/html/_static/down-pressed.png
documentation/autopilot-helpers/_build/html/_static/down.png
documentation/autopilot-helpers/_build/html/_static/file.png
documentation/autopilot-helpers/_build/html/_static/minus.png
documentation/autopilot-helpers/_build/html/_static/plus.png
documentation/autopilot-helpers/_build/html/_static/up-pressed.png
documentation/autopilot-helpers/_build/html/_static/up.png
documentation/images/surudark-theme-13.png
documentation/images/surudark-theme.png
