diff --git a/resources/qml/Avatar.qml b/resources/qml/Avatar.qml
index 25fff7f3..f19cd09f 100644
--- a/resources/qml/Avatar.qml
+++ b/resources/qml/Avatar.qml
@@ -48,5 +48,5 @@ Rectangle {
}
}
}
- color: colors.dark
+ color: colors.base
}
diff --git a/resources/qml/TimelineView.qml b/resources/qml/TimelineView.qml
index 69d8d29e..6f5eb42b 100644
--- a/resources/qml/TimelineView.qml
+++ b/resources/qml/TimelineView.qml
@@ -196,7 +196,7 @@ Item {
horizontalAlignment: Text.AlignHCenter
background: Rectangle {
radius: parent.height / 2
- color: colors.dark
+ color: colors.base
}
}
Row {
@@ -242,7 +242,7 @@ Item {
anchors.bottom: parent.bottom
z: 3
- color: colors.window
+ color: "transparent"
Column {
id: footerContent
@@ -270,7 +270,7 @@ Item {
visible: timelineManager.replyingEvent && chat.model
// Height of child, plus margins, plus border
height: replyPreview.height + 10
- color: colors.dark
+ color: colors.base
Reply {
diff --git a/resources/qml/delegates/FileMessage.qml b/resources/qml/delegates/FileMessage.qml
index 9a5300bb..2fe0a490 100644
--- a/resources/qml/delegates/FileMessage.qml
+++ b/resources/qml/delegates/FileMessage.qml
@@ -3,7 +3,7 @@ import QtQuick.Layouts 1.2
Rectangle {
radius: 10
- color: colors.dark
+ color: colors.base
height: row.height + 24
width: parent ? parent.width : undefined
diff --git a/resources/qml/delegates/Pill.qml b/resources/qml/delegates/Pill.qml
index 53a9684e..b19d9a54 100644
--- a/resources/qml/delegates/Pill.qml
+++ b/resources/qml/delegates/Pill.qml
@@ -9,6 +9,6 @@ Label {
width: contentWidth * 1.2
background: Rectangle {
radius: parent.height / 2
- color: colors.dark
+ color: colors.base
}
}
diff --git a/resources/qml/delegates/PlayableMediaMessage.qml b/resources/qml/delegates/PlayableMediaMessage.qml
index 50202098..a4096864 100644
--- a/resources/qml/delegates/PlayableMediaMessage.qml
+++ b/resources/qml/delegates/PlayableMediaMessage.qml
@@ -8,7 +8,7 @@ import im.nheko 1.0
Rectangle {
id: bg
radius: 10
- color: colors.dark
+ color: colors.base
height: content.height + 24
width: parent ? parent.width : undefined
@@ -83,15 +83,16 @@ Rectangle {
Rectangle {
id: button
- color: colors.light
+ color: colors.window
radius: 22
height: 44
width: 44
Image {
id: img
anchors.centerIn: parent
+ z: 3
- source: "image://colorimage/:/icons/icons/ui/arrow-pointing-down.png?"+colors.dark
+ source: "image://colorimage/:/icons/icons/ui/arrow-pointing-down.png?"+colors.text
fillMode: Image.Pad
}
@@ -134,11 +135,11 @@ Rectangle {
states: [
State {
name: "stopped"
- PropertyChanges { target: img; source: "image://colorimage/:/icons/icons/ui/play-sign.png?"+colors.dark }
+ PropertyChanges { target: img; source: "image://colorimage/:/icons/icons/ui/play-sign.png?"+colors.text }
},
State {
name: "playing"
- PropertyChanges { target: img; source: "image://colorimage/:/icons/icons/ui/pause-symbol.png?"+colors.dark }
+ PropertyChanges { target: img; source: "image://colorimage/:/icons/icons/ui/pause-symbol.png?"+colors.text }
}
]
}
diff --git a/src/timeline/TimelineViewManager.cpp b/src/timeline/TimelineViewManager.cpp
index 33441a62..37c56217 100644
--- a/src/timeline/TimelineViewManager.cpp
+++ b/src/timeline/TimelineViewManager.cpp
@@ -22,11 +22,11 @@ TimelineViewManager::updateColorPalette()
QPalette lightActive(/*windowText*/ QColor("#333"),
/*button*/ QColor("#333"),
/*light*/ QColor(),
- /*dark*/ QColor(220, 220, 220, 120),
+ /*dark*/ QColor(220, 220, 220),
/*mid*/ QColor(),
/*text*/ QColor("#333"),
/*bright_text*/ QColor(),
- /*base*/ QColor("white"),
+ /*base*/ QColor(220, 220, 220),
/*window*/ QColor("white"));
lightActive.setColor(QPalette::ToolTipBase, lightActive.base().color());
lightActive.setColor(QPalette::ToolTipText, lightActive.text().color());
@@ -40,7 +40,7 @@ TimelineViewManager::updateColorPalette()
/*mid*/ QColor(),
/*text*/ QColor("#caccd1"),
/*bright_text*/ QColor(),
- /*base*/ QColor("#202228"),
+ /*base*/ QColor("#2d3139"),
/*window*/ QColor("#202228"));
darkActive.setColor(QPalette::Highlight, QColor("#e7e7e9"));
darkActive.setColor(QPalette::ToolTipBase, darkActive.base().color());
|
