Merge lp://qastaging/~sevilerow-team/sevilerow/sevilerow-app-theme-no-symlink into lp://qastaging/sevilerow
Proposed by
Chris Wayne
| Status: | Merged |
|---|---|
| Merged at revision: | 21 |
| Proposed branch: | lp://qastaging/~sevilerow-team/sevilerow/sevilerow-app-theme-no-symlink |
| Merge into: | lp://qastaging/sevilerow |
| Diff against target: |
3386 lines (+3083/-3) 48 files modified
system/custom/pre-session.d/02setupthemedir (+0/-3) system/custom/usr/share/themes/Ubuntu/Components/Themes/Ambiance/ActivityIndicatorStyle.qml (+38/-0) system/custom/usr/share/themes/Ubuntu/Components/Themes/Ambiance/BubbleShape.qml (+153/-0) system/custom/usr/share/themes/Ubuntu/Components/Themes/Ambiance/ButtonForeground.qml (+116/-0) system/custom/usr/share/themes/Ubuntu/Components/Themes/Ambiance/ButtonStyle.qml (+117/-0) system/custom/usr/share/themes/Ubuntu/Components/Themes/Ambiance/CheckBoxStyle.qml (+128/-0) system/custom/usr/share/themes/Ubuntu/Components/Themes/Ambiance/DialogForegroundStyle.qml (+30/-0) system/custom/usr/share/themes/Ubuntu/Components/Themes/Ambiance/HeaderStyle.qml (+94/-0) system/custom/usr/share/themes/Ubuntu/Components/Themes/Ambiance/ListItemOptionSelectorStyle.qml (+27/-0) system/custom/usr/share/themes/Ubuntu/Components/Themes/Ambiance/MainViewStyle.qml (+67/-0) system/custom/usr/share/themes/Ubuntu/Components/Themes/Ambiance/OptionSelectorStyle.qml (+35/-0) system/custom/usr/share/themes/Ubuntu/Components/Themes/Ambiance/Palette.qml (+45/-0) system/custom/usr/share/themes/Ubuntu/Components/Themes/Ambiance/PartialColorize.qml (+49/-0) system/custom/usr/share/themes/Ubuntu/Components/Themes/Ambiance/PartialColorizeUbuntuShape.qml (+36/-0) system/custom/usr/share/themes/Ubuntu/Components/Themes/Ambiance/PopoverForegroundStyle.qml (+39/-0) system/custom/usr/share/themes/Ubuntu/Components/Themes/Ambiance/ProgressBarStyle.qml (+78/-0) system/custom/usr/share/themes/Ubuntu/Components/Themes/Ambiance/ScrollbarStyle.qml (+486/-0) system/custom/usr/share/themes/Ubuntu/Components/Themes/Ambiance/SelectionCursorStyle.qml (+92/-0) system/custom/usr/share/themes/Ubuntu/Components/Themes/Ambiance/SheetForegroundStyle.qml (+104/-0) system/custom/usr/share/themes/Ubuntu/Components/Themes/Ambiance/SliderStyle.qml (+108/-0) system/custom/usr/share/themes/Ubuntu/Components/Themes/Ambiance/SwitchStyle.qml (+144/-0) system/custom/usr/share/themes/Ubuntu/Components/Themes/Ambiance/TabBarStyle.qml (+316/-0) system/custom/usr/share/themes/Ubuntu/Components/Themes/Ambiance/TextAreaStyle.qml (+62/-0) system/custom/usr/share/themes/Ubuntu/Components/Themes/Ambiance/TextCursorStyle.qml (+63/-0) system/custom/usr/share/themes/Ubuntu/Components/Themes/Ambiance/TextFieldStyle.qml (+20/-0) system/custom/usr/share/themes/Ubuntu/Components/Themes/Ambiance/ToolbarButtonStyle.qml (+59/-0) system/custom/usr/share/themes/Ubuntu/Components/Themes/Ambiance/ToolbarStyle.qml (+45/-0) system/custom/usr/share/themes/Ubuntu/Components/Themes/Ambiance/artwork/PageHeaderBaseDividerLight@18.sci (+5/-0) system/custom/usr/share/themes/Ubuntu/Components/Themes/Ambiance/artwork/bubble_shadow@20.sci (+7/-0) system/custom/usr/share/themes/Ubuntu/Components/Themes/Ambiance/artwork/bubble_shadow@30.sci (+7/-0) system/custom/usr/share/themes/Ubuntu/Components/Themes/Ambiance/artwork/bubble_shadow@8.sci (+7/-0) system/custom/usr/share/themes/Ubuntu/Components/Themes/Ambiance/artwork/clear@30.svg (+119/-0) system/custom/usr/share/themes/Ubuntu/Components/Themes/Ambiance/qmldir (+23/-0) system/custom/usr/share/themes/Ubuntu/Components/Themes/Palette.qml (+59/-0) system/custom/usr/share/themes/Ubuntu/Components/Themes/PaletteValues.qml (+72/-0) system/custom/usr/share/themes/Ubuntu/Components/Themes/SuruDark/ListItemOptionSelectorStyle.qml (+23/-0) system/custom/usr/share/themes/Ubuntu/Components/Themes/SuruDark/MainViewStyle.qml (+22/-0) system/custom/usr/share/themes/Ubuntu/Components/Themes/SuruDark/OptionSelectorStyle.qml (+23/-0) system/custom/usr/share/themes/Ubuntu/Components/Themes/SuruDark/Palette.qml (+41/-0) system/custom/usr/share/themes/Ubuntu/Components/Themes/SuruDark/parent_theme (+1/-0) system/custom/usr/share/themes/Ubuntu/Components/Themes/SuruDark/qmldir (+1/-0) system/custom/usr/share/themes/Ubuntu/Components/Themes/SuruGradient/ListItemOptionSelectorStyle.qml (+27/-0) system/custom/usr/share/themes/Ubuntu/Components/Themes/SuruGradient/MainViewStyle.qml (+22/-0) system/custom/usr/share/themes/Ubuntu/Components/Themes/SuruGradient/OptionSelectorStyle.qml (+27/-0) system/custom/usr/share/themes/Ubuntu/Components/Themes/SuruGradient/Palette.qml (+41/-0) system/custom/usr/share/themes/Ubuntu/Components/Themes/SuruGradient/parent_theme (+1/-0) system/custom/usr/share/themes/Ubuntu/Components/Themes/SuruGradient/qmldir (+1/-0) system/custom/usr/share/themes/Ubuntu/Components/Themes/qmldir (+3/-0) |
| To merge this branch: | bzr merge lp://qastaging/~sevilerow-team/sevilerow/sevilerow-app-theme-no-symlink |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Scott Sweeny (community) | Approve | ||
| Matt Fischer (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
The symlink method wont work, so we need to include the themes dir on our image until LP:1221813 is fixed. Also removing the /custom/
To post a comment you must log in.
Revision history for this message
| Chris Wayne (cwayne) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Tested by installing and ensuring the app theme style is changed as expected