mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-05-07 05:23:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

feat(Colors): remove some colors

Browse source
This commit is contained in:
Ronan Abhamon 2018-07-16 17:13:48 +02:00
parent 32b5999051
commit 416be65e12
29 changed files with 58 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
assets/images/call_chat_secure_hovered.svg
View file

@ -7,8 +7,8 @@
<g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="chat_secure@x2">
<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>
<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>
<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="#5A585B" stroke-width="2"></path>
</g>
</g>
</g>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 990 B

After

Width:  |  Height:  |  Size: 990 B

4
assets/images/call_chat_secure_normal.svg
View file

@ -7,8 +7,8 @@
<g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="chat_secure@x2">
<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>
<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>
<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="#5A585B" stroke-width="2"></path>
</g>
</g>
</g>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 990 B

After

Width:  |  Height:  |  Size: 990 B

4
assets/images/call_chat_secure_pressed.svg
View file

@ -7,8 +7,8 @@
<g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="chat_secure@x2">
<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>
<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>
<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="#5A585B" stroke-width="2"></path>
</g>
</g>
</g>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 990 B

After

Width:  |  Height:  |  Size: 990 B

12
assets/images/timeline_history.svg Normal file
View file

@ -0,0 +1,12 @@
<?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>
Side by side

After

Width:  |  Height:  |  Size: 793 B

1
resources.qrc
View file

@ -184,6 +184,7 @@
<file>assets/images/tel_keypad_hovered.svg</file>
<file>assets/images/tel_keypad_normal.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_left.svg</file>
<file>assets/images/tooltip_arrow_right.svg</file>

10
src/components/other/colors/Colors.hpp
View file

@ -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");

4
ui/modules/Common/Styles/Form/Buttons/ExclusiveButtonsStyle.qml
View file

@ -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
}

2
ui/modules/Common/Styles/Form/Buttons/FileChooserButtonStyle.qml
View file

@ -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
}
}

4
ui/modules/Common/Styles/Form/Buttons/SmallButtonStyle.qml
View file

@ -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
}
}

6
ui/modules/Common/Styles/Form/Buttons/TextButtonAStyle.qml
View file

@ -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
}

2
ui/modules/Common/Styles/Form/Fields/NumericFieldStyle.qml
View file

@ -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
}

8
ui/modules/Common/Styles/Form/SliderStyle.qml
View file

@ -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
}
}
}

2
ui/modules/Common/Styles/Form/Tab/TabContainerStyle.qml
View file

@ -14,6 +14,6 @@ QtObject {
property QtObject separator: QtObject {
property int height: 2
property color color: Colors.u
property color color: Colors.f
}
}

4
ui/modules/Common/Styles/Form/TransparentTextInputStyle.qml
View file

@ -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
}
}
}

4
ui/modules/Common/Styles/Indicators/VuMeterStyle.qml
View file

@ -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
}
}

2
ui/modules/Common/Styles/Menus/ApplicationMenuStyle.qml
View file

@ -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

2
ui/modules/Common/Styles/Misc/ForceScrollBarStyle.qml
View file

@ -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
}
}

2
ui/modules/Common/Styles/Misc/PanedStyle.qml
View file

@ -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
}
}
}

14
ui/modules/Linphone/Styles/Chat/ChatStyle.qml
View file

@ -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
}

2
ui/modules/Linphone/Styles/Contact/AvatarStyle.qml
View file

@ -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

2
ui/modules/Linphone/Styles/Dialog/OnlineInstallerDialogStyle.qml
View file

@ -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
}
}

2
ui/modules/Linphone/Styles/Notifications/NotificationReceivedMessageStyle.qml
View file

@ -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

4
ui/modules/Linphone/Styles/Timeline/TimelineStyle.qml
View file

@ -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

2
ui/modules/Linphone/Timeline/Timeline.qml
View file

@ -69,7 +69,7 @@ Rectangle {
Icon {
anchors.verticalCenter: parent.verticalCenter
icon: 'history'
icon: 'timeline_history'
iconSize: TimelineStyle.legend.iconSize
}

2
ui/views/App/Styles/Calls/CallsWindowStyle.qml
View file

@ -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

2
ui/views/App/Styles/Calls/ConferenceStyle.qml
View file

@ -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

2
ui/views/App/Styles/Main/ContactsStyle.qml
View file

@ -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 {

2
ui/views/App/Styles/Main/ConversationStyle.qml
View file

@ -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
}

2
ui/views/App/Styles/Main/MainWindowStyle.qml
View file

@ -44,7 +44,7 @@ QtObject {
property int spacing: 20
property var background: Rectangle {
color: Colors.v
color: Colors.f
}
}
}