diff --git a/assets/images/call_chat_secure_hovered.svg b/assets/images/call_chat_secure_hovered.svg
index 06d11d7aa..e14c89684 100644
--- a/assets/images/call_chat_secure_hovered.svg
+++ b/assets/images/call_chat_secure_hovered.svg
@@ -7,8 +7,8 @@
-
-
+
+
diff --git a/assets/images/call_chat_secure_normal.svg b/assets/images/call_chat_secure_normal.svg
index 06d11d7aa..e14c89684 100644
--- a/assets/images/call_chat_secure_normal.svg
+++ b/assets/images/call_chat_secure_normal.svg
@@ -7,8 +7,8 @@
-
-
+
+
diff --git a/assets/images/call_chat_secure_pressed.svg b/assets/images/call_chat_secure_pressed.svg
index 06d11d7aa..e14c89684 100644
--- a/assets/images/call_chat_secure_pressed.svg
+++ b/assets/images/call_chat_secure_pressed.svg
@@ -7,8 +7,8 @@
-
-
+
+
diff --git a/assets/images/timeline_history.svg b/assets/images/timeline_history.svg
new file mode 100644
index 000000000..def6ac17b
--- /dev/null
+++ b/assets/images/timeline_history.svg
@@ -0,0 +1,12 @@
+
+
diff --git a/resources.qrc b/resources.qrc
index 1c19021db..1edae91b2 100644
--- a/resources.qrc
+++ b/resources.qrc
@@ -184,6 +184,7 @@
assets/images/tel_keypad_hovered.svg
assets/images/tel_keypad_normal.svg
assets/images/tel_keypad_pressed.svg
+ assets/images/timeline_history.svg
assets/images/tooltip_arrow_bottom.svg
assets/images/tooltip_arrow_left.svg
assets/images/tooltip_arrow_right.svg
diff --git a/src/components/other/colors/Colors.hpp b/src/components/other/colors/Colors.hpp
index cd9849b1e..bc29f52ba 100644
--- a/src/components/other/colors/Colors.hpp
+++ b/src/components/other/colors/Colors.hpp
@@ -59,7 +59,6 @@ class Colors : public QObject {
Q_PROPERTY(QStringList colorNames READ getColorNames CONSTANT);
ADD_COLOR(a, "transparent");
- ADD_COLOR(b, "#5E5E5F");
ADD_COLOR(c, "#CBCBCB");
ADD_COLOR(d, "#5A585B");
ADD_COLOR(e, "#F3F3F3");
@@ -70,18 +69,9 @@ class Colors : public QObject {
ADD_COLOR(j, "#4B5964");
ADD_COLOR(k, "#FFFFFF");
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(t, "#FF8600");
- ADD_COLOR(u, "#B1B1B1");
- ADD_COLOR(v, "#E2E2E2");
ADD_COLOR(w, "#A1A1A1");
- ADD_COLOR(x, "#96A5B1");
ADD_COLOR(y, "#D0D8DE");
ADD_COLOR(z, "#17A81A");
diff --git a/ui/modules/Common/Styles/Form/Buttons/ExclusiveButtonsStyle.qml b/ui/modules/Common/Styles/Form/Buttons/ExclusiveButtonsStyle.qml
index 9d398a551..f619a62ea 100644
--- a/ui/modules/Common/Styles/Form/Buttons/ExclusiveButtonsStyle.qml
+++ b/ui/modules/Common/Styles/Form/Buttons/ExclusiveButtonsStyle.qml
@@ -10,8 +10,8 @@ QtObject {
property QtObject button: QtObject {
property QtObject color: QtObject {
- property color hovered: Colors.n
- property color normal: Colors.m
+ property color hovered: Colors.w
+ property color normal: Colors.c
property color pressed: Colors.i
property color selected: Colors.g
}
diff --git a/ui/modules/Common/Styles/Form/Buttons/FileChooserButtonStyle.qml b/ui/modules/Common/Styles/Form/Buttons/FileChooserButtonStyle.qml
index 24953b2ae..9dca09a03 100644
--- a/ui/modules/Common/Styles/Form/Buttons/FileChooserButtonStyle.qml
+++ b/ui/modules/Common/Styles/Form/Buttons/FileChooserButtonStyle.qml
@@ -14,7 +14,7 @@ QtObject {
property QtObject color: QtObject {
property color hovered: Colors.c
- property color normal: Colors.q
+ property color normal: Colors.f
property color pressed: Colors.c
}
}
diff --git a/ui/modules/Common/Styles/Form/Buttons/SmallButtonStyle.qml b/ui/modules/Common/Styles/Form/Buttons/SmallButtonStyle.qml
index a7db34ff9..f1d2aa3ab 100644
--- a/ui/modules/Common/Styles/Form/Buttons/SmallButtonStyle.qml
+++ b/ui/modules/Common/Styles/Form/Buttons/SmallButtonStyle.qml
@@ -15,8 +15,8 @@ QtObject {
property int radius: 10
property QtObject color: QtObject {
- property color hovered: Colors.n
- property color normal: Colors.m
+ property color hovered: Colors.c
+ property color normal: Colors.f
property color pressed: Colors.i
}
}
diff --git a/ui/modules/Common/Styles/Form/Buttons/TextButtonAStyle.qml b/ui/modules/Common/Styles/Form/Buttons/TextButtonAStyle.qml
index 5b89ccfd7..2fb505972 100644
--- a/ui/modules/Common/Styles/Form/Buttons/TextButtonAStyle.qml
+++ b/ui/modules/Common/Styles/Form/Buttons/TextButtonAStyle.qml
@@ -7,9 +7,9 @@ import Colors 1.0
QtObject {
property QtObject backgroundColor: QtObject {
- property color disabled: Colors.o
- property color hovered: Colors.o
- property color normal: Colors.j
+ property color disabled: Colors.y
+ property color hovered: Colors.j
+ property color normal: Colors.g
property color pressed: Colors.i
}
diff --git a/ui/modules/Common/Styles/Form/Fields/NumericFieldStyle.qml b/ui/modules/Common/Styles/Form/Fields/NumericFieldStyle.qml
index e4794b212..7b3204d5d 100644
--- a/ui/modules/Common/Styles/Form/Fields/NumericFieldStyle.qml
+++ b/ui/modules/Common/Styles/Form/Fields/NumericFieldStyle.qml
@@ -12,7 +12,7 @@ QtObject {
property QtObject button: QtObject {
property QtObject color: QtObject {
- property color normal: Colors.q
+ property color normal: Colors.f
property color pressed: Colors.c
}
diff --git a/ui/modules/Common/Styles/Form/SliderStyle.qml b/ui/modules/Common/Styles/Form/SliderStyle.qml
index c23303c0a..816daaa8f 100644
--- a/ui/modules/Common/Styles/Form/SliderStyle.qml
+++ b/ui/modules/Common/Styles/Form/SliderStyle.qml
@@ -7,7 +7,7 @@ import Colors 1.0
QtObject {
property QtObject background: QtObject {
- property color color: Colors.n
+ property color color: Colors.c
property int height: 4
property int radius: 2
property int width: 200
@@ -25,14 +25,14 @@ QtObject {
property QtObject border: QtObject {
property QtObject color: QtObject {
- property color normal: Colors.n
- property color pressed: Colors.n
+ property color normal: Colors.c
+ property color pressed: Colors.c
}
}
property QtObject color: QtObject {
property color normal: Colors.e
- property color pressed: Colors.q
+ property color pressed: Colors.f
}
}
}
diff --git a/ui/modules/Common/Styles/Form/Tab/TabContainerStyle.qml b/ui/modules/Common/Styles/Form/Tab/TabContainerStyle.qml
index c717795f1..6088f614b 100644
--- a/ui/modules/Common/Styles/Form/Tab/TabContainerStyle.qml
+++ b/ui/modules/Common/Styles/Form/Tab/TabContainerStyle.qml
@@ -14,6 +14,6 @@ QtObject {
property QtObject separator: QtObject {
property int height: 2
- property color color: Colors.u
+ property color color: Colors.f
}
}
diff --git a/ui/modules/Common/Styles/Form/TransparentTextInputStyle.qml b/ui/modules/Common/Styles/Form/TransparentTextInputStyle.qml
index 95b55eed0..9c8402b12 100644
--- a/ui/modules/Common/Styles/Form/TransparentTextInputStyle.qml
+++ b/ui/modules/Common/Styles/Form/TransparentTextInputStyle.qml
@@ -7,7 +7,7 @@ import Units 1.0
// =============================================================================
QtObject {
- property color backgroundColor: Colors.q
+ property color backgroundColor: Colors.f
property int iconSize: 12
property int padding: 10
@@ -21,7 +21,7 @@ QtObject {
property QtObject color: QtObject {
property color focused: Colors.l
- property color normal: Colors.r
+ property color normal: Colors.d
}
}
}
diff --git a/ui/modules/Common/Styles/Indicators/VuMeterStyle.qml b/ui/modules/Common/Styles/Indicators/VuMeterStyle.qml
index 4dcdfc265..784739f68 100644
--- a/ui/modules/Common/Styles/Indicators/VuMeterStyle.qml
+++ b/ui/modules/Common/Styles/Indicators/VuMeterStyle.qml
@@ -13,7 +13,7 @@ QtObject {
property QtObject background: QtObject {
property QtObject color: QtObject {
property color disabled: Colors.y
- property color enabled: Colors.x
+ property color enabled: Colors.w
}
}
@@ -26,7 +26,7 @@ QtObject {
property QtObject background: QtObject {
property QtObject color: QtObject {
property color disabled: Colors.y
- property color enabled: Colors.x
+ property color enabled: Colors.w
}
}
diff --git a/ui/modules/Common/Styles/Menus/ApplicationMenuStyle.qml b/ui/modules/Common/Styles/Menus/ApplicationMenuStyle.qml
index 11cfcf589..7314d1782 100644
--- a/ui/modules/Common/Styles/Menus/ApplicationMenuStyle.qml
+++ b/ui/modules/Common/Styles/Menus/ApplicationMenuStyle.qml
@@ -8,7 +8,7 @@ import Units 1.0
QtObject {
property int spacing: 1
- property color backgroundColor: Colors.x
+ property color backgroundColor: Colors.w
property QtObject entry: QtObject {
property int iconSize: 24
diff --git a/ui/modules/Common/Styles/Misc/ForceScrollBarStyle.qml b/ui/modules/Common/Styles/Misc/ForceScrollBarStyle.qml
index d799eebeb..4c8e1fc76 100644
--- a/ui/modules/Common/Styles/Misc/ForceScrollBarStyle.qml
+++ b/ui/modules/Common/Styles/Misc/ForceScrollBarStyle.qml
@@ -17,6 +17,6 @@ QtObject {
property QtObject color: QtObject {
property color hovered: Colors.h
property color normal: Colors.g20
- property color pressed: Colors.b
+ property color pressed: Colors.d
}
}
diff --git a/ui/modules/Common/Styles/Misc/PanedStyle.qml b/ui/modules/Common/Styles/Misc/PanedStyle.qml
index 336753912..01f04b547 100644
--- a/ui/modules/Common/Styles/Misc/PanedStyle.qml
+++ b/ui/modules/Common/Styles/Misc/PanedStyle.qml
@@ -14,7 +14,7 @@ QtObject {
property QtObject color: QtObject {
property color hovered: Colors.h
property color normal: Colors.c
- property color pressed: Colors.b
+ property color pressed: Colors.d
}
}
}
diff --git a/ui/modules/Linphone/Styles/Chat/ChatStyle.qml b/ui/modules/Linphone/Styles/Chat/ChatStyle.qml
index 4d129b921..09cb030ba 100644
--- a/ui/modules/Linphone/Styles/Chat/ChatStyle.qml
+++ b/ui/modules/Linphone/Styles/Chat/ChatStyle.qml
@@ -14,7 +14,7 @@ QtObject {
property int bottomMargin: 20
property QtObject border: QtObject {
- property color color: Colors.p
+ property color color: Colors.g10
property int width: 1
}
@@ -28,13 +28,13 @@ QtObject {
property int height: 80
property QtObject border: QtObject {
- property color color: Colors.u
+ property color color: Colors.f
property int width: 1
}
}
property QtObject composingText: QtObject {
- property color color: Colors.b
+ property color color: Colors.d
property int height: 25
property int leftPadding: 20
property int pointSize: Units.dp * 9
@@ -51,7 +51,7 @@ QtObject {
property int iconSize: 18
property QtObject text: QtObject {
- property color color: Colors.r
+ property color color: Colors.d
property int pointSize: Units.dp * 10
}
}
@@ -115,7 +115,7 @@ QtObject {
property int avatarSize: 20
property QtObject text: QtObject {
- property color color: Colors.r
+ property color color: Colors.d
property int pointSize: Units.dp * 10
}
}
@@ -127,14 +127,14 @@ QtObject {
property int sendIconSize: 12
property QtObject text: QtObject {
- property color color: Colors.r
+ property color color: Colors.d
property int pointSize: Units.dp * 10
}
}
}
property QtObject time: QtObject {
- property color color: Colors.x
+ property color color: Colors.d
property int pointSize: Units.dp * 10
property int width: 44
}
diff --git a/ui/modules/Linphone/Styles/Contact/AvatarStyle.qml b/ui/modules/Linphone/Styles/Contact/AvatarStyle.qml
index 39966ef9e..ea65795b5 100644
--- a/ui/modules/Linphone/Styles/Contact/AvatarStyle.qml
+++ b/ui/modules/Linphone/Styles/Contact/AvatarStyle.qml
@@ -7,7 +7,7 @@ import Units 1.0
// =============================================================================
QtObject {
- property color backgroundColor: Colors.r
+ property color backgroundColor: Colors.d
property QtObject initials: QtObject {
property color color: Colors.k
diff --git a/ui/modules/Linphone/Styles/Dialog/OnlineInstallerDialogStyle.qml b/ui/modules/Linphone/Styles/Dialog/OnlineInstallerDialogStyle.qml
index 2bbb33b82..1dd61f945 100644
--- a/ui/modules/Linphone/Styles/Dialog/OnlineInstallerDialogStyle.qml
+++ b/ui/modules/Linphone/Styles/Dialog/OnlineInstallerDialogStyle.qml
@@ -30,7 +30,7 @@ QtObject {
}
property QtObject text: QtObject {
- property color color: Colors.r
+ property color color: Colors.d
property int pointSize: Units.dp * 11
}
}
diff --git a/ui/modules/Linphone/Styles/Notifications/NotificationReceivedMessageStyle.qml b/ui/modules/Linphone/Styles/Notifications/NotificationReceivedMessageStyle.qml
index 6854b9ab2..e070a1fd8 100644
--- a/ui/modules/Linphone/Styles/Notifications/NotificationReceivedMessageStyle.qml
+++ b/ui/modules/Linphone/Styles/Notifications/NotificationReceivedMessageStyle.qml
@@ -15,7 +15,7 @@ QtObject {
property int spacing: 0
property QtObject messageContainer: QtObject {
- property color color: Colors.m
+ property color color: Colors.y
property int radius: 6
property int margins: 10
diff --git a/ui/modules/Linphone/Styles/Timeline/TimelineStyle.qml b/ui/modules/Linphone/Styles/Timeline/TimelineStyle.qml
index fe53e7377..4bec7ddfd 100644
--- a/ui/modules/Linphone/Styles/Timeline/TimelineStyle.qml
+++ b/ui/modules/Linphone/Styles/Timeline/TimelineStyle.qml
@@ -34,8 +34,8 @@ QtObject {
}
property QtObject legend: QtObject {
- property color backgroundColor: Colors.u
- property color color: Colors.k
+ property color backgroundColor: Colors.f
+ property color color: Colors.d
property int pointSize: Units.dp * 11
property int height: 30
property int iconSize: 10
diff --git a/ui/modules/Linphone/Timeline/Timeline.qml b/ui/modules/Linphone/Timeline/Timeline.qml
index 3c1d3d212..fdf7fe5da 100644
--- a/ui/modules/Linphone/Timeline/Timeline.qml
+++ b/ui/modules/Linphone/Timeline/Timeline.qml
@@ -69,7 +69,7 @@ Rectangle {
Icon {
anchors.verticalCenter: parent.verticalCenter
- icon: 'history'
+ icon: 'timeline_history'
iconSize: TimelineStyle.legend.iconSize
}
diff --git a/ui/views/App/Styles/Calls/CallsWindowStyle.qml b/ui/views/App/Styles/Calls/CallsWindowStyle.qml
index bf5c2e02c..4256c13f9 100644
--- a/ui/views/App/Styles/Calls/CallsWindowStyle.qml
+++ b/ui/views/App/Styles/Calls/CallsWindowStyle.qml
@@ -21,7 +21,7 @@ QtObject {
property QtObject header: QtObject {
property color color1: Colors.k
- property color color2: Colors.v
+ property color color2: Colors.f
property int height: 60
property int iconSize: 40
property int leftMargin: 10
diff --git a/ui/views/App/Styles/Calls/ConferenceStyle.qml b/ui/views/App/Styles/Calls/ConferenceStyle.qml
index 708d38232..3f27b74ae 100644
--- a/ui/views/App/Styles/Calls/ConferenceStyle.qml
+++ b/ui/views/App/Styles/Calls/ConferenceStyle.qml
@@ -8,7 +8,7 @@ import Units 1.0
QtObject {
property QtObject description: QtObject {
- property color color: Colors.x
+ property color color: Colors.j
property int pointSize: Units.dp * 12
property int height: 60
property int width: 150
diff --git a/ui/views/App/Styles/Main/ContactsStyle.qml b/ui/views/App/Styles/Main/ContactsStyle.qml
index 41293b575..879cca26f 100644
--- a/ui/views/App/Styles/Main/ContactsStyle.qml
+++ b/ui/views/App/Styles/Main/ContactsStyle.qml
@@ -29,7 +29,7 @@ QtObject {
property QtObject backgroundColor: QtObject {
property color normal: Colors.k
- property color hovered: Colors.p
+ property color hovered: Colors.g10
}
property QtObject border: QtObject {
diff --git a/ui/views/App/Styles/Main/ConversationStyle.qml b/ui/views/App/Styles/Main/ConversationStyle.qml
index 0a788520c..e2dad6cdd 100644
--- a/ui/views/App/Styles/Main/ConversationStyle.qml
+++ b/ui/views/App/Styles/Main/ConversationStyle.qml
@@ -42,7 +42,7 @@ QtObject {
property int leftMargin: 40
property QtObject border: QtObject {
- property color color: Colors.p
+ property color color: Colors.g10
property int bottomWidth: 1
property int topWidth: 0
}
diff --git a/ui/views/App/Styles/Main/MainWindowStyle.qml b/ui/views/App/Styles/Main/MainWindowStyle.qml
index 89c790eb6..b1ec59c6c 100644
--- a/ui/views/App/Styles/Main/MainWindowStyle.qml
+++ b/ui/views/App/Styles/Main/MainWindowStyle.qml
@@ -44,7 +44,7 @@ QtObject {
property int spacing: 20
property var background: Rectangle {
- color: Colors.v
+ color: Colors.f
}
}
}