Commit 416be65e authored by Ronan's avatar Ronan

feat(Colors): remove some colors

parent 32b59990
Pipeline #166 failed with stage
in 0 seconds
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
<g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="chat_secure@x2"> <g id="chat_secure@x2">
<g id="Group-2" transform="translate(0.000000, 1.000000)"> <g id="Group-2" transform="translate(0.000000, 1.000000)">
<rect id="Rectangle-4" fill="#595759" x="0" y="4.33333322" width="9.99999974" height="8.66666644"></rect> <rect id="Rectangle-4" fill="#5A585B" x="0" y="4.33333322" width="9.99999974" height="8.66666644"></rect>
<path d="M7.99999979,11.3429854 L7.99999979,3.16521731 C7.99999979,1.41711606 6.65685407,0 4.99999987,0 C3.34314566,0 1.99999995,1.41711606 1.99999995,3.16521731 L1.99999995,11.3429854 L7.99999979,11.3429854 Z" id="Oval-6" stroke="#595759" stroke-width="2"></path> <path d="M7.99999979,11.3429854 L7.99999979,3.16521731 C7.99999979,1.41711606 6.65685407,0 4.99999987,0 C3.34314566,0 1.99999995,1.41711606 1.99999995,3.16521731 L1.99999995,11.3429854 L7.99999979,11.3429854 Z" id="Oval-6" stroke="#5A585B" stroke-width="2"></path>
</g> </g>
</g> </g>
</g> </g>
......
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
<g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="chat_secure@x2"> <g id="chat_secure@x2">
<g id="Group-2" transform="translate(0.000000, 1.000000)"> <g id="Group-2" transform="translate(0.000000, 1.000000)">
<rect id="Rectangle-4" fill="#595759" x="0" y="4.33333322" width="9.99999974" height="8.66666644"></rect> <rect id="Rectangle-4" fill="#5A585B" x="0" y="4.33333322" width="9.99999974" height="8.66666644"></rect>
<path d="M7.99999979,11.3429854 L7.99999979,3.16521731 C7.99999979,1.41711606 6.65685407,0 4.99999987,0 C3.34314566,0 1.99999995,1.41711606 1.99999995,3.16521731 L1.99999995,11.3429854 L7.99999979,11.3429854 Z" id="Oval-6" stroke="#595759" stroke-width="2"></path> <path d="M7.99999979,11.3429854 L7.99999979,3.16521731 C7.99999979,1.41711606 6.65685407,0 4.99999987,0 C3.34314566,0 1.99999995,1.41711606 1.99999995,3.16521731 L1.99999995,11.3429854 L7.99999979,11.3429854 Z" id="Oval-6" stroke="#5A585B" stroke-width="2"></path>
</g> </g>
</g> </g>
</g> </g>
......
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
<g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="chat_secure@x2"> <g id="chat_secure@x2">
<g id="Group-2" transform="translate(0.000000, 1.000000)"> <g id="Group-2" transform="translate(0.000000, 1.000000)">
<rect id="Rectangle-4" fill="#595759" x="0" y="4.33333322" width="9.99999974" height="8.66666644"></rect> <rect id="Rectangle-4" fill="#5A585B" x="0" y="4.33333322" width="9.99999974" height="8.66666644"></rect>
<path d="M7.99999979,11.3429854 L7.99999979,3.16521731 C7.99999979,1.41711606 6.65685407,0 4.99999987,0 C3.34314566,0 1.99999995,1.41711606 1.99999995,3.16521731 L1.99999995,11.3429854 L7.99999979,11.3429854 Z" id="Oval-6" stroke="#595759" stroke-width="2"></path> <path d="M7.99999979,11.3429854 L7.99999979,3.16521731 C7.99999979,1.41711606 6.65685407,0 4.99999987,0 C3.34314566,0 1.99999995,1.41711606 1.99999995,3.16521731 L1.99999995,11.3429854 L7.99999979,11.3429854 Z" id="Oval-6" stroke="#5A585B" stroke-width="2"></path>
</g> </g>
</g> </g>
</g> </g>
......
<?xml version="1.0" encoding="UTF-8"?>
<svg width="10px" height="10px" viewBox="0 0 10 10" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 40.3 (33839) - http://www.bohemiancoding.com/sketch -->
<title>history</title>
<desc>Created with Sketch.</desc>
<defs></defs>
<g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
<g id="history" stroke="#5A585B">
<path d="M9.5,5 C9.5,7.485125 7.485575,9.5 5,9.5 C2.514875,9.5 0.5,7.485125 0.5,5 C0.5,2.5147625 2.514875,0.5 5,0.5 C7.485575,0.5 9.5,2.5147625 9.5,5 L9.5,5 Z M4.998875,2.5679625 L4.998875,5.0349875 L7.5806375,5.0349875"></path>
</g>
</g>
</svg>
...@@ -184,6 +184,7 @@ ...@@ -184,6 +184,7 @@
<file>assets/images/tel_keypad_hovered.svg</file> <file>assets/images/tel_keypad_hovered.svg</file>
<file>assets/images/tel_keypad_normal.svg</file> <file>assets/images/tel_keypad_normal.svg</file>
<file>assets/images/tel_keypad_pressed.svg</file> <file>assets/images/tel_keypad_pressed.svg</file>
<file>assets/images/timeline_history.svg</file>
<file>assets/images/tooltip_arrow_bottom.svg</file> <file>assets/images/tooltip_arrow_bottom.svg</file>
<file>assets/images/tooltip_arrow_left.svg</file> <file>assets/images/tooltip_arrow_left.svg</file>
<file>assets/images/tooltip_arrow_right.svg</file> <file>assets/images/tooltip_arrow_right.svg</file>
......
...@@ -59,7 +59,6 @@ class Colors : public QObject { ...@@ -59,7 +59,6 @@ class Colors : public QObject {
Q_PROPERTY(QStringList colorNames READ getColorNames CONSTANT); Q_PROPERTY(QStringList colorNames READ getColorNames CONSTANT);
ADD_COLOR(a, "transparent"); ADD_COLOR(a, "transparent");
ADD_COLOR(b, "#5E5E5F");
ADD_COLOR(c, "#CBCBCB"); ADD_COLOR(c, "#CBCBCB");
ADD_COLOR(d, "#5A585B"); ADD_COLOR(d, "#5A585B");
ADD_COLOR(e, "#F3F3F3"); ADD_COLOR(e, "#F3F3F3");
...@@ -70,18 +69,9 @@ class Colors : public QObject { ...@@ -70,18 +69,9 @@ class Colors : public QObject {
ADD_COLOR(j, "#4B5964"); ADD_COLOR(j, "#4B5964");
ADD_COLOR(k, "#FFFFFF"); ADD_COLOR(k, "#FFFFFF");
ADD_COLOR(l, "#000000"); ADD_COLOR(l, "#000000");
ADD_COLOR(m, "#D1D1D1");
ADD_COLOR(n, "#C0C0C0");
ADD_COLOR(o, "#232323");
ADD_COLOR(p, "#E2E9EF");
ADD_COLOR(q, "#E6E6E6");
ADD_COLOR(r, "#595759");
ADD_COLOR(s, "#D64D00"); ADD_COLOR(s, "#D64D00");
ADD_COLOR(t, "#FF8600"); ADD_COLOR(t, "#FF8600");
ADD_COLOR(u, "#B1B1B1");
ADD_COLOR(v, "#E2E2E2");
ADD_COLOR(w, "#A1A1A1"); ADD_COLOR(w, "#A1A1A1");
ADD_COLOR(x, "#96A5B1");
ADD_COLOR(y, "#D0D8DE"); ADD_COLOR(y, "#D0D8DE");
ADD_COLOR(z, "#17A81A"); ADD_COLOR(z, "#17A81A");
......
...@@ -10,8 +10,8 @@ QtObject { ...@@ -10,8 +10,8 @@ QtObject {
property QtObject button: QtObject { property QtObject button: QtObject {
property QtObject color: QtObject { property QtObject color: QtObject {
property color hovered: Colors.n property color hovered: Colors.w
property color normal: Colors.m property color normal: Colors.c
property color pressed: Colors.i property color pressed: Colors.i
property color selected: Colors.g property color selected: Colors.g
} }
......
...@@ -14,7 +14,7 @@ QtObject { ...@@ -14,7 +14,7 @@ QtObject {
property QtObject color: QtObject { property QtObject color: QtObject {
property color hovered: Colors.c property color hovered: Colors.c
property color normal: Colors.q property color normal: Colors.f
property color pressed: Colors.c property color pressed: Colors.c
} }
} }
......
...@@ -15,8 +15,8 @@ QtObject { ...@@ -15,8 +15,8 @@ QtObject {
property int radius: 10 property int radius: 10
property QtObject color: QtObject { property QtObject color: QtObject {
property color hovered: Colors.n property color hovered: Colors.c
property color normal: Colors.m property color normal: Colors.f
property color pressed: Colors.i property color pressed: Colors.i
} }
} }
......
...@@ -7,9 +7,9 @@ import Colors 1.0 ...@@ -7,9 +7,9 @@ import Colors 1.0
QtObject { QtObject {
property QtObject backgroundColor: QtObject { property QtObject backgroundColor: QtObject {
property color disabled: Colors.o property color disabled: Colors.y
property color hovered: Colors.o property color hovered: Colors.j
property color normal: Colors.j property color normal: Colors.g
property color pressed: Colors.i property color pressed: Colors.i
} }
......
...@@ -12,7 +12,7 @@ QtObject { ...@@ -12,7 +12,7 @@ QtObject {
property QtObject button: QtObject { property QtObject button: QtObject {
property QtObject color: QtObject { property QtObject color: QtObject {
property color normal: Colors.q property color normal: Colors.f
property color pressed: Colors.c property color pressed: Colors.c
} }
......
...@@ -7,7 +7,7 @@ import Colors 1.0 ...@@ -7,7 +7,7 @@ import Colors 1.0
QtObject { QtObject {
property QtObject background: QtObject { property QtObject background: QtObject {
property color color: Colors.n property color color: Colors.c
property int height: 4 property int height: 4
property int radius: 2 property int radius: 2
property int width: 200 property int width: 200
...@@ -25,14 +25,14 @@ QtObject { ...@@ -25,14 +25,14 @@ QtObject {
property QtObject border: QtObject { property QtObject border: QtObject {
property QtObject color: QtObject { property QtObject color: QtObject {
property color normal: Colors.n property color normal: Colors.c
property color pressed: Colors.n property color pressed: Colors.c
} }
} }
property QtObject color: QtObject { property QtObject color: QtObject {
property color normal: Colors.e property color normal: Colors.e
property color pressed: Colors.q property color pressed: Colors.f
} }
} }
} }
...@@ -14,6 +14,6 @@ QtObject { ...@@ -14,6 +14,6 @@ QtObject {
property QtObject separator: QtObject { property QtObject separator: QtObject {
property int height: 2 property int height: 2
property color color: Colors.u property color color: Colors.f
} }
} }
...@@ -7,7 +7,7 @@ import Units 1.0 ...@@ -7,7 +7,7 @@ import Units 1.0
// ============================================================================= // =============================================================================
QtObject { QtObject {
property color backgroundColor: Colors.q property color backgroundColor: Colors.f
property int iconSize: 12 property int iconSize: 12
property int padding: 10 property int padding: 10
...@@ -21,7 +21,7 @@ QtObject { ...@@ -21,7 +21,7 @@ QtObject {
property QtObject color: QtObject { property QtObject color: QtObject {
property color focused: Colors.l property color focused: Colors.l
property color normal: Colors.r property color normal: Colors.d
} }
} }
} }
...@@ -13,7 +13,7 @@ QtObject { ...@@ -13,7 +13,7 @@ QtObject {
property QtObject background: QtObject { property QtObject background: QtObject {
property QtObject color: QtObject { property QtObject color: QtObject {
property color disabled: Colors.y property color disabled: Colors.y
property color enabled: Colors.x property color enabled: Colors.w
} }
} }
...@@ -26,7 +26,7 @@ QtObject { ...@@ -26,7 +26,7 @@ QtObject {
property QtObject background: QtObject { property QtObject background: QtObject {
property QtObject color: QtObject { property QtObject color: QtObject {
property color disabled: Colors.y property color disabled: Colors.y
property color enabled: Colors.x property color enabled: Colors.w
} }
} }
......
...@@ -8,7 +8,7 @@ import Units 1.0 ...@@ -8,7 +8,7 @@ import Units 1.0
QtObject { QtObject {
property int spacing: 1 property int spacing: 1
property color backgroundColor: Colors.x property color backgroundColor: Colors.w
property QtObject entry: QtObject { property QtObject entry: QtObject {
property int iconSize: 24 property int iconSize: 24
......
...@@ -17,6 +17,6 @@ QtObject { ...@@ -17,6 +17,6 @@ QtObject {
property QtObject color: QtObject { property QtObject color: QtObject {
property color hovered: Colors.h property color hovered: Colors.h
property color normal: Colors.g20 property color normal: Colors.g20
property color pressed: Colors.b property color pressed: Colors.d
} }
} }
...@@ -14,7 +14,7 @@ QtObject { ...@@ -14,7 +14,7 @@ QtObject {
property QtObject color: QtObject { property QtObject color: QtObject {
property color hovered: Colors.h property color hovered: Colors.h
property color normal: Colors.c property color normal: Colors.c
property color pressed: Colors.b property color pressed: Colors.d
} }
} }
} }
...@@ -14,7 +14,7 @@ QtObject { ...@@ -14,7 +14,7 @@ QtObject {
property int bottomMargin: 20 property int bottomMargin: 20
property QtObject border: QtObject { property QtObject border: QtObject {
property color color: Colors.p property color color: Colors.g10
property int width: 1 property int width: 1
} }
...@@ -28,13 +28,13 @@ QtObject { ...@@ -28,13 +28,13 @@ QtObject {
property int height: 80 property int height: 80
property QtObject border: QtObject { property QtObject border: QtObject {
property color color: Colors.u property color color: Colors.f
property int width: 1 property int width: 1
} }
} }
property QtObject composingText: QtObject { property QtObject composingText: QtObject {
property color color: Colors.b property color color: Colors.d
property int height: 25 property int height: 25
property int leftPadding: 20 property int leftPadding: 20
property int pointSize: Units.dp * 9 property int pointSize: Units.dp * 9
...@@ -51,7 +51,7 @@ QtObject { ...@@ -51,7 +51,7 @@ QtObject {
property int iconSize: 18 property int iconSize: 18
property QtObject text: QtObject { property QtObject text: QtObject {
property color color: Colors.r property color color: Colors.d
property int pointSize: Units.dp * 10 property int pointSize: Units.dp * 10
} }
} }
...@@ -115,7 +115,7 @@ QtObject { ...@@ -115,7 +115,7 @@ QtObject {
property int avatarSize: 20 property int avatarSize: 20
property QtObject text: QtObject { property QtObject text: QtObject {
property color color: Colors.r property color color: Colors.d
property int pointSize: Units.dp * 10 property int pointSize: Units.dp * 10
} }
} }
...@@ -127,14 +127,14 @@ QtObject { ...@@ -127,14 +127,14 @@ QtObject {
property int sendIconSize: 12 property int sendIconSize: 12
property QtObject text: QtObject { property QtObject text: QtObject {
property color color: Colors.r property color color: Colors.d
property int pointSize: Units.dp * 10 property int pointSize: Units.dp * 10
} }
} }
} }
property QtObject time: QtObject { property QtObject time: QtObject {
property color color: Colors.x property color color: Colors.d
property int pointSize: Units.dp * 10 property int pointSize: Units.dp * 10
property int width: 44 property int width: 44
} }
......
...@@ -7,7 +7,7 @@ import Units 1.0 ...@@ -7,7 +7,7 @@ import Units 1.0
// ============================================================================= // =============================================================================
QtObject { QtObject {
property color backgroundColor: Colors.r property color backgroundColor: Colors.d
property QtObject initials: QtObject { property QtObject initials: QtObject {
property color color: Colors.k property color color: Colors.k
......
...@@ -30,7 +30,7 @@ QtObject { ...@@ -30,7 +30,7 @@ QtObject {
} }
property QtObject text: QtObject { property QtObject text: QtObject {
property color color: Colors.r property color color: Colors.d
property int pointSize: Units.dp * 11 property int pointSize: Units.dp * 11
} }
} }
......
...@@ -15,7 +15,7 @@ QtObject { ...@@ -15,7 +15,7 @@ QtObject {
property int spacing: 0 property int spacing: 0
property QtObject messageContainer: QtObject { property QtObject messageContainer: QtObject {
property color color: Colors.m property color color: Colors.y
property int radius: 6 property int radius: 6
property int margins: 10 property int margins: 10
......
...@@ -34,8 +34,8 @@ QtObject { ...@@ -34,8 +34,8 @@ QtObject {
} }
property QtObject legend: QtObject { property QtObject legend: QtObject {
property color backgroundColor: Colors.u property color backgroundColor: Colors.f
property color color: Colors.k property color color: Colors.d
property int pointSize: Units.dp * 11 property int pointSize: Units.dp * 11
property int height: 30 property int height: 30
property int iconSize: 10 property int iconSize: 10
......
...@@ -69,7 +69,7 @@ Rectangle { ...@@ -69,7 +69,7 @@ Rectangle {
Icon { Icon {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
icon: 'history' icon: 'timeline_history'
iconSize: TimelineStyle.legend.iconSize iconSize: TimelineStyle.legend.iconSize
} }
......
...@@ -21,7 +21,7 @@ QtObject { ...@@ -21,7 +21,7 @@ QtObject {
property QtObject header: QtObject { property QtObject header: QtObject {
property color color1: Colors.k property color color1: Colors.k
property color color2: Colors.v property color color2: Colors.f
property int height: 60 property int height: 60
property int iconSize: 40 property int iconSize: 40
property int leftMargin: 10 property int leftMargin: 10
......
...@@ -8,7 +8,7 @@ import Units 1.0 ...@@ -8,7 +8,7 @@ import Units 1.0
QtObject { QtObject {
property QtObject description: QtObject { property QtObject description: QtObject {
property color color: Colors.x property color color: Colors.j
property int pointSize: Units.dp * 12 property int pointSize: Units.dp * 12
property int height: 60 property int height: 60
property int width: 150 property int width: 150
......
...@@ -29,7 +29,7 @@ QtObject { ...@@ -29,7 +29,7 @@ QtObject {
property QtObject backgroundColor: QtObject { property QtObject backgroundColor: QtObject {
property color normal: Colors.k property color normal: Colors.k
property color hovered: Colors.p property color hovered: Colors.g10
} }
property QtObject border: QtObject { property QtObject border: QtObject {
......
...@@ -42,7 +42,7 @@ QtObject { ...@@ -42,7 +42,7 @@ QtObject {
property int leftMargin: 40 property int leftMargin: 40
property QtObject border: QtObject { property QtObject border: QtObject {
property color color: Colors.p property color color: Colors.g10
property int bottomWidth: 1 property int bottomWidth: 1
property int topWidth: 0 property int topWidth: 0
} }
......
...@@ -44,7 +44,7 @@ QtObject { ...@@ -44,7 +44,7 @@ QtObject {
property int spacing: 20 property int spacing: 20
property var background: Rectangle { property var background: Rectangle {
color: Colors.v color: Colors.f
} }
} }
} }
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