Alan Pope has proposed merging lp:~popey/ubuntu-filemanager-app/update-colours2 into lp:ubuntu-filemanager-app with lp:~fboucault/ubuntu-filemanager-app/migrate_toolkit_13 as a prerequisite.
Commit message: Change colour theme to match other core apps Requested reviews: Jenkins Bot (ubuntu-core-apps-jenkins-bot): continuous-integration Ubuntu File Manager Developers (ubuntu-filemanager-dev) For more details, see: https://code.launchpad.net/~popey/ubuntu-filemanager-app/update-colours2/+merge/284345 Change colour theme to match other core apps - this time without the pot file. -- Your team Ubuntu File Manager Developers is requested to review the proposed merge of lp:~popey/ubuntu-filemanager-app/update-colours2 into lp:ubuntu-filemanager-app.
=== modified file 'com.ubuntu.filemanager.desktop.in.in' --- com.ubuntu.filemanager.desktop.in.in 2014-08-13 08:36:53 +0000 +++ com.ubuntu.filemanager.desktop.in.in 2016-01-28 21:01:03 +0000 @@ -7,3 +7,5 @@ _Name=File Manager X-Ubuntu-Touch=true X-Ubuntu-Default-Department-ID=accessories +X-Ubuntu-Splash-Show-Header=true +X-Ubuntu-Splash-Color=#F5F5F5 === modified file 'src/app/qml/components/PathHistoryRow.qml' --- src/app/qml/components/PathHistoryRow.qml 2014-10-24 03:00:16 +0000 +++ src/app/qml/components/PathHistoryRow.qml 2016-01-28 21:01:03 +0000 @@ -15,9 +15,9 @@ * * Authored by: Akiva */ -import QtQuick 2.3 -import Ubuntu.Components 1.1 -import Ubuntu.Components.ListItems 1.0 +import QtQuick 2.4 +import Ubuntu.Components 1.3 +import Ubuntu.Components.ListItems 1.3 /* Full path of your current folder and recent history, that you can jump to by clicking its members */ Flickable { @@ -84,7 +84,7 @@ text: i18n.tr("Device") fontSize: flickable.textSize anchors.verticalCenter: parent.verticalCenter - color: folder === "/" ? "white" : UbuntuColors.warmGrey + color: UbuntuColors.darkGrey clip: true /* Maximum Width = Flickable Width */ width: if (contentWidth > flickable.width) { flickable.width } @@ -139,7 +139,7 @@ text: pathText(folder,index) fontSize: flickable.textSize anchors.verticalCenter: parent.verticalCenter - color: repeater.model === index + 1 ? "white" : UbuntuColors.warmGrey + color: repeater.model === index + 1 ? UbuntuColors.darkGrey : UbuntuColors.darkGrey clip: true /* Maximum Width = Flickable Width */ @@ -153,7 +153,7 @@ width: flickable.iconWidth anchors.verticalCenter: parent.verticalCenter anchors.right: label.left - color: "white" + color: UbuntuColors.darkGrey // clip: true } @@ -196,7 +196,7 @@ : pathText(repeater.memoryPath,index) fontSize: flickable.textSize anchors.verticalCenter: parent.verticalCenter - color: UbuntuColors.warmGrey + color: UbuntuColors.darkGrey clip: true /* Maximum Width = Flickable Width */ @@ -210,7 +210,7 @@ width: flickable.iconWidth anchors.verticalCenter: parent.verticalCenter anchors.right: memoryLabel.left - color: "white" + color: UbuntuColors.darkGrey // clip: true } === modified file 'src/app/qml/components/PlacesSidebar.qml' --- src/app/qml/components/PlacesSidebar.qml 2015-09-06 00:11:02 +0000 +++ src/app/qml/components/PlacesSidebar.qml 2016-01-28 21:01:03 +0000 @@ -15,16 +15,17 @@ * * Authored by: Michael Spencer <sonrisesoftw...@gmail.com> */ -import QtQuick 2.3 +import QtQuick 2.4 import QtGraphicalEffects 1.0 -import Ubuntu.Components 1.1 -import Ubuntu.Components.ListItems 1.0 -import Ubuntu.Components.Popups 1.0 +import Ubuntu.Components 1.3 +import Ubuntu.Components.ListItems 1.3 +import Ubuntu.Components.Popups 1.3 Sidebar { id: root //color: Qt.rgba(0.5,0.5,0.5,0.3) + color: "#F5F5F5" width: expanded ? (collapsed ? units.gu(8) : units.gu(22)) : 0 property bool collapsed: collapsedSidebar === modified file 'src/app/qml/filemanager.qml' --- src/app/qml/filemanager.qml 2015-11-02 18:01:09 +0000 +++ src/app/qml/filemanager.qml 2016-01-28 21:01:03 +0000 @@ -15,10 +15,10 @@ * * Authored by: Arto Jalkanen <ajalk...@gmail.com> */ -import QtQuick 2.3 -import Ubuntu.Components 1.1 +import QtQuick 2.4 +import Ubuntu.Components 1.3 import org.nemomobile.folderlistmodel 1.0 -import Ubuntu.Components.Popups 1.0 +import Ubuntu.Components.Popups 1.3 import Ubuntu.Unity.Action 1.1 as UnityActions import U1db 1.0 as U1db import Ubuntu.Content 0.1 @@ -32,7 +32,6 @@ // objectName for functional testing purposes (autopilot-qt5) objectName: "filemanager" applicationName: "com.ubuntu.filemanager" - useDeprecatedToolbar: false width: phone ? units.gu(40) : units.gu(100) height: units.gu(75) @@ -51,9 +50,9 @@ property bool showSidebar: width >= units.gu(50) - headerColor: "#464646" - backgroundColor: "#464646" - footerColor: "#464646" + headerColor: "#F5F5F5" + backgroundColor: "#F5F5F5" + footerColor: "#F5F5F5" QtObject { id: fileSelector === modified file 'src/app/qml/upstream/FakeHeader.qml' --- src/app/qml/upstream/FakeHeader.qml 2014-10-23 20:54:30 +0000 +++ src/app/qml/upstream/FakeHeader.qml 2016-01-28 21:01:03 +0000 @@ -14,8 +14,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -import QtQuick 2.3 -import Ubuntu.Components 1.1 +import QtQuick 2.4 +import Ubuntu.Components 1.3 Column { id: fakeHeader @@ -25,9 +25,9 @@ Rectangle { height: units.gu(7) width: parent.width - color: "#464646" + color: "#F5F5F5" } - + Rectangle { color: Qt.rgba(0.2,0.2,0.2,0.97) height: units.gu(2) === modified file 'src/app/qml/upstream/PageWithBottomEdge.qml' --- src/app/qml/upstream/PageWithBottomEdge.qml 2014-10-24 03:00:16 +0000 +++ src/app/qml/upstream/PageWithBottomEdge.qml 2016-01-28 21:01:03 +0000 @@ -62,8 +62,8 @@ */ -import QtQuick 2.2 -import Ubuntu.Components 1.1 +import QtQuick 2.4 +import Ubuntu.Components 1.3 Page { id: page @@ -176,7 +176,7 @@ z: 1 width: tipLabel.paintedWidth + units.gu(6) height: bottomEdge.tipHeight + units.gu(1) - color: "#464646" + color: "#F5F5F5" Label { id: tipLabel @@ -292,7 +292,7 @@ readonly property int pageStartY: fakeHeader.height z: 1 - color: "#606060" // "#797979" // Qt.rgba(0.2,0.2,0.2,0.97) + color: "#F5F5F5" // "#606060" // "#797979" // Qt.rgba(0.2,0.2,0.2,0.97) // color: Theme.palette.normal.background clip: true anchors {
-- Mailing list: https://launchpad.net/~ubuntu-touch-coreapps-reviewers Post to : ubuntu-touch-coreapps-reviewers@lists.launchpad.net Unsubscribe : https://launchpad.net/~ubuntu-touch-coreapps-reviewers More help : https://help.launchpad.net/ListHelp