Commit cf61cd40 authored by Ronan's avatar Ronan

feat(Colors): use k color only on backgrounds like home, settings, ...

parent 42375e9d
......@@ -73,7 +73,10 @@ class Colors : public QObject {
ADD_COLOR(i, "#FE5E00");
ADD_COLOR(j, "#4B5964");
// Popups, home, call, assistant and settings background.
ADD_COLOR(k, "#FFFFFF");
ADD_COLOR(l, "#000000");
// Primary color for clicked items.
......@@ -85,7 +88,7 @@ class Colors : public QObject {
// Progress bar.
ADD_COLOR(p, "#17A81A");
// Field background.
// Fields, backgrounds and text color on some items.
ADD_COLOR(q, "#FFFFFF");
// Field error.
......@@ -95,9 +98,9 @@ class Colors : public QObject {
ADD_COLOR_WITH_ALPHA(g, 20);
ADD_COLOR_WITH_ALPHA(g, 90);
ADD_COLOR_WITH_ALPHA(i, 30);
ADD_COLOR_WITH_ALPHA(k, 50);
ADD_COLOR_WITH_ALPHA(l, 50);
ADD_COLOR_WITH_ALPHA(l, 80);
ADD_COLOR_WITH_ALPHA(q, 50);
public:
Colors (QObject *parent = Q_NULLPTR);
......
......@@ -20,7 +20,6 @@ QtObject {
property color j: '#000000'
property color j75: '#000000'
property color k: '#000000'
property color k50: '#000000'
property color l: '#000000'
property color l50: '#000000'
property color l80: '#000000'
......
......@@ -22,7 +22,7 @@ QtObject {
}
property QtObject text: QtObject {
property color color: Colors.k
property color color: Colors.q
property int pointSize: Units.dp * 8
}
}
......@@ -14,9 +14,9 @@ QtObject {
}
property QtObject textColor: QtObject {
property color disabled: Colors.k
property color hovered: Colors.k
property color normal: Colors.k
property color pressed: Colors.k
property color disabled: Colors.q
property color hovered: Colors.q
property color normal: Colors.q
property color pressed: Colors.q
}
}
......@@ -14,9 +14,9 @@ QtObject {
}
property QtObject textColor: QtObject {
property color disabled: Colors.k
property color hovered: Colors.k
property color normal: Colors.k
property color pressed: Colors.k
property color disabled: Colors.q
property color hovered: Colors.q
property color normal: Colors.q
property color pressed: Colors.q
}
}
......@@ -38,7 +38,7 @@ QtObject {
property QtObject delegate: QtObject {
property QtObject color: QtObject {
property color hovered: Colors.o
property color normal: Colors.k
property color normal: Colors.q
}
property QtObject contentItem: QtObject {
......
......@@ -7,7 +7,7 @@ import Units 1.0
// =============================================================================
QtObject {
property color backgroundColor: Colors.k
property color backgroundColor: Colors.q
property QtObject fileChooserButton: QtObject {
property int margins: 6
......@@ -15,7 +15,7 @@ QtObject {
}
property QtObject hoverContent: QtObject {
property color backgroundColor: Colors.k
property color backgroundColor: Colors.q
property QtObject text: QtObject {
property color color: Colors.i
......
......@@ -25,7 +25,7 @@ QtObject {
property QtObject color: QtObject {
property color checked: Colors.i
property color disabled: Colors.e
property color normal: Colors.k
property color normal: Colors.q
}
}
......@@ -44,7 +44,7 @@ QtObject {
property QtObject color: QtObject {
property color disabled: Colors.e
property color pressed: Colors.c
property color normal: Colors.k
property color normal: Colors.q
}
}
}
......@@ -28,10 +28,10 @@ QtObject {
property int rightPadding: 10
property QtObject color: QtObject {
property color disabled: Colors.k
property color hovered: Colors.k
property color normal: Colors.k
property color pressed: Colors.k
property color disabled: Colors.q
property color hovered: Colors.q
property color normal: Colors.q
property color pressed: Colors.q
property color selected: Colors.i
}
}
......
......@@ -32,8 +32,8 @@ QtObject {
property int pointSize: Units.dp * 11
property QtObject color: QtObject {
property color normal: Colors.k50
property color selected: Colors.k
property color normal: Colors.q50
property color selected: Colors.q
}
}
}
......
......@@ -20,7 +20,7 @@ QtObject {
}
property QtObject text: QtObject {
property color color: Colors.k
property color color: Colors.q
property int pointSize: Units.dp * 9
}
}
......
......@@ -15,7 +15,7 @@ QtObject {
property QtObject color: QtObject {
property color hovered: Colors.o
property color normal: Colors.k
property color normal: Colors.q
property color pressed: Colors.o
}
}
......
......@@ -6,6 +6,6 @@ import Colors 1.0
// =============================================================================
QtObject {
property color color: Colors.k
property color color: Colors.q
property int width: 130
}
......@@ -8,7 +8,7 @@ import Units 1.0
QtObject {
property color backgroundColor: Colors.g
property color color: Colors.k
property color color: Colors.q
property int arrowSize: 8
property int delay: 1000
property int pointSize: Units.dp * 9
......
......@@ -25,12 +25,12 @@ QtObject {
property QtObject sipAddressColor: QtObject {
property color normal: Colors.n
property color selected: Colors.k
property color selected: Colors.q
}
property QtObject usernameColor: QtObject {
property color normal: Colors.j
property color selected: Colors.k
property color selected: Colors.q
}
}
}
......@@ -7,7 +7,7 @@ import Units 1.0
// =============================================================================
QtObject {
property color color: Colors.k
property color color: Colors.q
property QtObject sectionHeading: QtObject {
property int padding: 5
......@@ -84,7 +84,7 @@ QtObject {
}
property QtObject text: QtObject {
property color color: Colors.k
property color color: Colors.q
}
}
......
......@@ -10,7 +10,7 @@ QtObject {
property color backgroundColor: Colors.d
property QtObject initials: QtObject {
property color color: Colors.k
property color color: Colors.q
property int pointSize: Units.dp * 10
property int ratio: 30
}
......
......@@ -16,7 +16,7 @@ QtObject {
}
property QtObject text: QtObject {
property color color: Colors.k
property color color: Colors.q
property int pointSize: Units.dp * 7
}
}
......@@ -23,7 +23,7 @@ QtObject {
}
property QtObject text: QtObject {
property color color: Colors.k
property color color: Colors.q
property int pointSize: Units.dp * 10
}
}
......
......@@ -15,7 +15,7 @@ QtObject {
property QtObject button: QtObject {
property QtObject color: QtObject {
property color normal: Colors.k
property color normal: Colors.q
property color pressed: Colors.i
}
......
......@@ -7,7 +7,7 @@ import Units 1.0
// =============================================================================
QtObject {
property color color: Colors.k
property color color: Colors.q
property QtObject contact: QtObject {
property int height: 60
......@@ -21,14 +21,14 @@ QtObject {
property QtObject sipAddress: QtObject {
property QtObject color: QtObject {
property color normal: Colors.n
property color selected: Colors.k
property color selected: Colors.q
}
}
property QtObject username: QtObject {
property QtObject color: QtObject {
property color normal: Colors.j
property color selected: Colors.k
property color selected: Colors.q
}
}
}
......
......@@ -14,7 +14,7 @@ QtObject {
property QtObject color: QtObject {
property color hovered: Colors.o
property color normal: Colors.k
property color normal: Colors.q
}
property QtObject indicator: QtObject {
......@@ -46,8 +46,8 @@ QtObject {
property int pointSize: Units.dp * 9
property QtObject color: QtObject {
property color normal: Colors.k
property color pressed: Colors.k
property color normal: Colors.q
property color pressed: Colors.q
}
}
}
......
......@@ -43,7 +43,7 @@ QtObject {
property color color: Colors.g90
property QtObject text: QtObject {
property color color: Colors.k
property color color: Colors.q
property int pointSizeFactor: 10
}
}
......
......@@ -14,13 +14,13 @@ QtObject {
}
property QtObject callsList: QtObject {
property color color: Colors.k
property color color: Colors.q
property int defaultWidth: 250
property int maximumWidth: 250
property int minimumWidth: 110
property QtObject header: QtObject {
property color color1: Colors.k
property color color1: Colors.q
property color color2: Colors.f
property int height: 60
property int iconSize: 40
......
......@@ -37,7 +37,7 @@ QtObject {
}
property QtObject filters: QtObject {
property color backgroundColor: Colors.k
property color backgroundColor: Colors.q
property int height: 51
property int leftMargin: 40
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment