Skip to content
Snippets Groups Projects
Commit 3a0e55e9 authored by Nicolas Werner's avatar Nicolas Werner
Browse files

Qml message input mockup

parent da085db6
No related branches found
No related tags found
No related merge requests found
...@@ -13,7 +13,7 @@ Rectangle { ...@@ -13,7 +13,7 @@ Rectangle {
width: 48 width: 48
height: 48 height: 48
radius: Settings.avatarCircles ? height / 2 : 3 radius: Settings.avatarCircles ? height / 2 : 3
color: colors.base color: colors.alternateBase
Label { Label {
anchors.fill: parent anchors.fill: parent
......
...@@ -83,7 +83,7 @@ Flow { ...@@ -83,7 +83,7 @@ Flow {
implicitWidth: reaction.implicitWidth implicitWidth: reaction.implicitWidth
implicitHeight: reaction.implicitHeight implicitHeight: reaction.implicitHeight
border.color: (reaction.hovered || modelData.selfReactedEvent !== '') ? colors.highlight : colors.text border.color: (reaction.hovered || modelData.selfReactedEvent !== '') ? colors.highlight : colors.text
color: modelData.selfReactedEvent !== '' ? Qt.hsla(highlightHue, highlightSat, highlightLight, 0.2) : colors.base color: modelData.selfReactedEvent !== '' ? Qt.hsla(highlightHue, highlightSat, highlightLight, 0.2) : colors.window
border.width: 1 border.width: 1
radius: reaction.height / 2 radius: reaction.height / 2
} }
......
...@@ -48,7 +48,7 @@ Item { ...@@ -48,7 +48,7 @@ Item {
Reply { Reply {
visible: model.replyTo visible: model.replyTo
modelData: chat.model.getDump(model.replyTo, model.id) modelData: chat.model.getDump(model.replyTo, model.id)
userColor: TimelineManager.userColor(modelData.userId, colors.window) userColor: TimelineManager.userColor(modelData.userId, colors.base)
} }
// actual message content // actual message content
......
This diff is collapsed.
...@@ -65,7 +65,7 @@ Item { ...@@ -65,7 +65,7 @@ Item {
} }
Rectangle { Rectangle {
color: colors.dark color: colors.alternateBase
z: -1 z: -1
radius: 10 radius: 10
height: row.height + 24 height: row.height + 24
......
...@@ -9,7 +9,7 @@ Label { ...@@ -9,7 +9,7 @@ Label {
background: Rectangle { background: Rectangle {
radius: parent.height / 2 radius: parent.height / 2
color: colors.dark color: colors.alternateBase
} }
} }
...@@ -8,7 +8,7 @@ Rectangle { ...@@ -8,7 +8,7 @@ Rectangle {
id: bg id: bg
radius: 10 radius: 10
color: colors.dark color: colors.alternateBase
height: Math.round(content.height + 24) height: Math.round(content.height + 24)
width: parent ? parent.width : undefined width: parent ? parent.width : undefined
......
...@@ -161,7 +161,7 @@ Popup { ...@@ -161,7 +161,7 @@ Popup {
Rectangle { Rectangle {
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 1 Layout.preferredHeight: 1
color: emojiPopup.colors.dark color: emojiPopup.colors.alternateBase
} }
// Category picker row // Category picker row
...@@ -281,7 +281,7 @@ Popup { ...@@ -281,7 +281,7 @@ Popup {
Layout.preferredWidth: 1 Layout.preferredWidth: 1
implicitWidth: 1 implicitWidth: 1
height: parent.height height: parent.height
color: emojiPopup.colors.dark color: emojiPopup.colors.alternateBase
} }
// Search Button is special // Search Button is special
......
...@@ -339,17 +339,18 @@ UserSettings::applyTheme() ...@@ -339,17 +339,18 @@ UserSettings::applyTheme()
/*windowText*/ QColor("#333"), /*windowText*/ QColor("#333"),
/*button*/ QColor("#333"), /*button*/ QColor("#333"),
/*light*/ QColor(0xef, 0xef, 0xef), /*light*/ QColor(0xef, 0xef, 0xef),
/*dark*/ QColor(220, 220, 220), /*dark*/ QColor(110, 110, 110),
/*mid*/ QColor(110, 110, 110), /*mid*/ QColor(220, 220, 220),
/*text*/ QColor("#333"), /*text*/ QColor("#333"),
/*bright_text*/ QColor("#333"), /*bright_text*/ QColor("#333"),
/*base*/ QColor("#eee"), /*base*/ QColor("#fff"),
/*window*/ QColor("white")); /*window*/ QColor("white"));
lightActive.setColor(QPalette::AlternateBase, QColor("#eee"));
lightActive.setColor(QPalette::Highlight, QColor("#38a3d8")); lightActive.setColor(QPalette::Highlight, QColor("#38a3d8"));
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());
lightActive.setColor(QPalette::Link, QColor("#0077b5")); lightActive.setColor(QPalette::Link, QColor("#0077b5"));
lightActive.setColor(QPalette::ButtonText, QColor(Qt::gray)); lightActive.setColor(QPalette::ButtonText, QColor("#495057"));
QApplication::setPalette(lightActive); QApplication::setPalette(lightActive);
} else if (this->theme() == "dark") { } else if (this->theme() == "dark") {
stylefile.setFileName(":/styles/styles/nheko-dark.qss"); stylefile.setFileName(":/styles/styles/nheko-dark.qss");
...@@ -357,17 +358,18 @@ UserSettings::applyTheme() ...@@ -357,17 +358,18 @@ UserSettings::applyTheme()
/*windowText*/ QColor("#caccd1"), /*windowText*/ QColor("#caccd1"),
/*button*/ QColor(0xff, 0xff, 0xff), /*button*/ QColor(0xff, 0xff, 0xff),
/*light*/ QColor("#caccd1"), /*light*/ QColor("#caccd1"),
/*dark*/ QColor("#2d3139"), /*dark*/ QColor(110, 110, 110),
/*mid*/ QColor(110, 110, 110), /*mid*/ QColor("#202228"),
/*text*/ QColor("#caccd1"), /*text*/ QColor("#caccd1"),
/*bright_text*/ QColor(0xff, 0xff, 0xff), /*bright_text*/ QColor(0xff, 0xff, 0xff),
/*base*/ QColor("#2d3139"), /*base*/ QColor("#202228"),
/*window*/ QColor("#202228")); /*window*/ QColor("#2d3139"));
darkActive.setColor(QPalette::AlternateBase, QColor("#2d3139"));
darkActive.setColor(QPalette::Highlight, QColor("#38a3d8")); darkActive.setColor(QPalette::Highlight, QColor("#38a3d8"));
darkActive.setColor(QPalette::ToolTipBase, darkActive.base().color()); darkActive.setColor(QPalette::ToolTipBase, darkActive.base().color());
darkActive.setColor(QPalette::ToolTipText, darkActive.text().color()); darkActive.setColor(QPalette::ToolTipText, darkActive.text().color());
darkActive.setColor(QPalette::Link, QColor("#38a3d8")); darkActive.setColor(QPalette::Link, QColor("#38a3d8"));
darkActive.setColor(QPalette::ButtonText, QColor(0x90, 0x90, 0x90)); darkActive.setColor(QPalette::ButtonText, "#727274");
QApplication::setPalette(darkActive); QApplication::setPalette(darkActive);
} else { } else {
stylefile.setFileName(":/styles/styles/system.qss"); stylefile.setFileName(":/styles/styles/system.qss");
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment