rnhmjoj/nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Improve styling a bit

Browse Source
This commit is contained in:
Nicolas Werner 2020-02-03 19:21:03 +01:00
parent aae8612482
commit d330020fdd
6 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/qml/Avatar.qml
View File

@ -48,5 +48,5 @@ Rectangle {
} }
} }
} }
color: colors.dark color: colors.base
} }

6
resources/qml/TimelineView.qml
View File

@ -196,7 +196,7 @@ Item {
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
background: Rectangle { background: Rectangle {
radius: parent.height / 2 radius: parent.height / 2
color: colors.dark color: colors.base
} }
} }
Row { Row {
@ -242,7 +242,7 @@ Item {
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
z: 3 z: 3
color: colors.window color: "transparent"
Column { Column {
id: footerContent id: footerContent
@ -270,7 +270,7 @@ Item {
visible: timelineManager.replyingEvent && chat.model visible: timelineManager.replyingEvent && chat.model
// Height of child, plus margins, plus border // Height of child, plus margins, plus border
height: replyPreview.height + 10 height: replyPreview.height + 10
color: colors.dark color: colors.base
Reply { Reply {

2
resources/qml/delegates/FileMessage.qml
View File

@ -3,7 +3,7 @@ import QtQuick.Layouts 1.2
Rectangle { Rectangle {
radius: 10 radius: 10
color: colors.dark color: colors.base
height: row.height + 24 height: row.height + 24
width: parent ? parent.width : undefined width: parent ? parent.width : undefined

2
resources/qml/delegates/Pill.qml
View File

@ -9,6 +9,6 @@ Label {
width: contentWidth * 1.2 width: contentWidth * 1.2
background: Rectangle { background: Rectangle {
radius: parent.height / 2 radius: parent.height / 2
color: colors.dark color: colors.base
} }
} }

11
resources/qml/delegates/PlayableMediaMessage.qml
View File

@ -8,7 +8,7 @@ import im.nheko 1.0
Rectangle { Rectangle {
id: bg id: bg
radius: 10 radius: 10
color: colors.dark color: colors.base
height: content.height + 24 height: content.height + 24
width: parent ? parent.width : undefined width: parent ? parent.width : undefined
@ -83,15 +83,16 @@ Rectangle {
Rectangle { Rectangle {
id: button id: button
color: colors.light color: colors.window
radius: 22 radius: 22
height: 44 height: 44
width: 44 width: 44
Image { Image {
id: img id: img
anchors.centerIn: parent 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 fillMode: Image.Pad
} }
@ -134,11 +135,11 @@ Rectangle {
states: [ states: [
State { State {
name: "stopped" 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 { State {
name: "playing" 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 }
} }
] ]
} }

6
src/timeline/TimelineViewManager.cpp
View File

@ -22,11 +22,11 @@ TimelineViewManager::updateColorPalette()
QPalette lightActive(/*windowText*/ QColor("#333"), QPalette lightActive(/*windowText*/ QColor("#333"),
/*button*/ QColor("#333"), /*button*/ QColor("#333"),
/*light*/ QColor(), /*light*/ QColor(),
/*dark*/ QColor(220, 220, 220, 120), /*dark*/ QColor(220, 220, 220),
/*mid*/ QColor(), /*mid*/ QColor(),
/*text*/ QColor("#333"), /*text*/ QColor("#333"),
/*bright_text*/ QColor(), /*bright_text*/ QColor(),
/*base*/ QColor("white"), /*base*/ QColor(220, 220, 220),
/*window*/ QColor("white")); /*window*/ QColor("white"));
lightActive.setColor(QPalette::ToolTipBase, lightActive.base().color()); lightActive.setColor(QPalette::ToolTipBase, lightActive.base().color());
lightActive.setColor(QPalette::ToolTipText, lightActive.text().color()); lightActive.setColor(QPalette::ToolTipText, lightActive.text().color());
@ -40,7 +40,7 @@ TimelineViewManager::updateColorPalette()
/*mid*/ QColor(), /*mid*/ QColor(),
/*text*/ QColor("#caccd1"), /*text*/ QColor("#caccd1"),
/*bright_text*/ QColor(), /*bright_text*/ QColor(),
/*base*/ QColor("#202228"), /*base*/ QColor("#2d3139"),
/*window*/ QColor("#202228")); /*window*/ QColor("#202228"));
darkActive.setColor(QPalette::Highlight, QColor("#e7e7e9")); darkActive.setColor(QPalette::Highlight, QColor("#e7e7e9"));
darkActive.setColor(QPalette::ToolTipBase, darkActive.base().color()); darkActive.setColor(QPalette::ToolTipBase, darkActive.base().color());