From bd3eb7482ee25c89994ec95ae72c50ec4f32969a Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Wed, 2 Nov 2016 16:02:14 +0100 Subject: [PATCH] fix(app): fix used colors --- tests/ui/modules/Common/Colors.qml | 17 ++++++----------- tests/ui/modules/Common/Styles/PopupStyle.qml | 2 +- .../ui/modules/Common/Styles/SearchBoxStyle.qml | 2 +- .../App/Styles/MainWindow/ContactsStyle.qml | 12 ++++++------ 4 files changed, 14 insertions(+), 19 deletions(-) diff --git a/tests/ui/modules/Common/Colors.qml b/tests/ui/modules/Common/Colors.qml index b05e8eef8..801d68025 100644 --- a/tests/ui/modules/Common/Colors.qml +++ b/tests/ui/modules/Common/Colors.qml @@ -5,27 +5,20 @@ import QtQuick 2.7 QtObject { property color a: 'transparent' - property color b: '#5E5E5F' // Pressed toolbar. - - property color d: '#5A585B' // Text color. - - property color e: '#DEDEDE' // Timeline separator - - property color f: '#808080' // Popup shadow. - - property color l: '#000000' // Text color. property color o: '#232323' // TextButtonA Hovered. - property color p: '#B1B1B1' // TextButtonB text Hovered. property color q: '#E6E6E6' - // ----------------------------------------------------------------- // OK. // ----------------------------------------------------------------- + property color b: '#5E5E5F' property color c: '#CBCBCB' + property color d: '#5A585B' + property color e: '#F3F3F3' + property color f: '#E8E8E8' property color g: '#6B7A86' property color g10: '#1A6B7A86' property color g20: '#336B7A86' @@ -35,8 +28,10 @@ QtObject { property color j75: '#BF4B5964' property color k: '#FFFFFF' property color k50: '#32FFFFFF' + property color l: '#000000' property color m: '#D1D1D1' property color n: '#C0C0C0' + property color p: '#E2E9EF' property color r: '#595759' property color s: '#D64D00' property color t: '#FF8600' diff --git a/tests/ui/modules/Common/Styles/PopupStyle.qml b/tests/ui/modules/Common/Styles/PopupStyle.qml index 6c81b05ed..6a8d7b0e0 100644 --- a/tests/ui/modules/Common/Styles/PopupStyle.qml +++ b/tests/ui/modules/Common/Styles/PopupStyle.qml @@ -14,7 +14,7 @@ QtObject { } property QtObject shadow: QtObject { - property color color: Colors.f + property color color: Colors.l property int horizontalOffset: 4 property int radius: 8 property int samples: 15 diff --git a/tests/ui/modules/Common/Styles/SearchBoxStyle.qml b/tests/ui/modules/Common/Styles/SearchBoxStyle.qml index 199a908a7..93aac9832 100644 --- a/tests/ui/modules/Common/Styles/SearchBoxStyle.qml +++ b/tests/ui/modules/Common/Styles/SearchBoxStyle.qml @@ -6,5 +6,5 @@ import Common 1.0 // =================================================================== QtObject { - property color shadowColor: Colors.f + property color shadowColor: Colors.l } diff --git a/tests/ui/views/App/Styles/MainWindow/ContactsStyle.qml b/tests/ui/views/App/Styles/MainWindow/ContactsStyle.qml index d0e3b0e83..03ad4a1d3 100644 --- a/tests/ui/views/App/Styles/MainWindow/ContactsStyle.qml +++ b/tests/ui/views/App/Styles/MainWindow/ContactsStyle.qml @@ -6,11 +6,11 @@ import Common 1.0 // =================================================================== QtObject { - property color backgroundColor: '#FFFFFF' + property color backgroundColor: Colors.k property int spacing: 20 property QtObject bar: QtObject { - property color backgroundColor: '#F3F3F3' + property color backgroundColor: Colors.e property int height: 60 property int leftMargin: 18 property int rightMargin: 18 @@ -27,12 +27,12 @@ QtObject { property int spacing: 15 property QtObject backgroundColor: QtObject { - property color normal: '#FFFFFF' - property color hovered: '#E2E9EF' + property color normal: Colors.k + property color hovered: Colors.p } property QtObject border: QtObject { - property color color: '#E8E8E8' + property color color: Colors.f property int width: 1 } @@ -42,7 +42,7 @@ QtObject { } property QtObject username: QtObject { - property color color: '#4B5964' + property color color: Colors.j property int width: 220 } }