d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-22 19:08:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Misc color fixes

Browse source
This commit is contained in:
Nicolas Werner 2020-05-05 23:43:43 +02:00
parent ca5490074a
commit e55a09906f
5 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
resources/qml/Avatar.qml
View file

@ -19,7 +19,7 @@ Rectangle {
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
visible: img.status != Image.Ready visible: img.status != Image.Ready
color: colors.brightText color: colors.text
} }
Image { Image {
@ -43,5 +43,5 @@ Rectangle {
} }
} }
} }
color: colors.dark color: colors.base
} }

10
resources/qml/Reactions.qml
View file

@ -32,7 +32,7 @@ Flow {
text: reaction.text text: reaction.text
font.family: settings.emoji_font_family font.family: settings.emoji_font_family
opacity: enabled ? 1.0 : 0.3 opacity: enabled ? 1.0 : 0.3
color: reaction.hovered ? colors.highlight : colors.buttonText color: reaction.hovered ? colors.highlight : colors.text
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
elide: Text.ElideRight elide: Text.ElideRight
@ -41,7 +41,7 @@ Flow {
Rectangle { Rectangle {
height: reactionText.implicitHeight height: reactionText.implicitHeight
width: 1 width: 1
color: reaction.hovered ? colors.highlight : colors.buttonText color: reaction.hovered ? colors.highlight : colors.text
} }
Text { Text {
@ -49,7 +49,7 @@ Flow {
text: model.counter text: model.counter
font: reaction.font font: reaction.font
opacity: enabled ? 1.0 : 0.3 opacity: enabled ? 1.0 : 0.3
color: reaction.hovered ? colors.highlight : colors.buttonText color: reaction.hovered ? colors.highlight : colors.text
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
elide: Text.ElideRight elide: Text.ElideRight
@ -61,8 +61,8 @@ Flow {
implicitWidth: reaction.implicitWidth implicitWidth: reaction.implicitWidth
implicitHeight: reaction.implicitHeight implicitHeight: reaction.implicitHeight
opacity: enabled ? 1 : 0.3 opacity: enabled ? 1 : 0.3
border.color: (reaction.hovered || model.selfReacted )? colors.highlight : colors.buttonText border.color: (reaction.hovered || model.selfReacted )? colors.highlight : colors.text
color: colors.dark color: colors.base
border.width: 1 border.width: 1
radius: reaction.height / 2.0 radius: reaction.height / 2.0
} }

4
resources/qml/TimelineView.qml
View file

@ -211,7 +211,7 @@ Page {
anchors.horizontalCenter: parent ? parent.horizontalCenter : undefined anchors.horizontalCenter: parent ? parent.horizontalCenter : undefined
visible: section.includes(" ") visible: section.includes(" ")
text: chat.model.formatDateSeparator(modelData.timestamp) text: chat.model.formatDateSeparator(modelData.timestamp)
color: colors.brightText color: colors.text
height: fontMetrics.height * 1.4 height: fontMetrics.height * 1.4
width: contentWidth * 1.2 width: contentWidth * 1.2
@ -219,7 +219,7 @@ Page {
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 {

6
resources/styles/system.qss
View file

@ -98,15 +98,15 @@ UserMentionsWidget {
qproperty-highlightedTitleColor: palette(highlighted-text); qproperty-highlightedTitleColor: palette(highlighted-text);
qproperty-highlightedSubtitleColor: palette(highlighted-text); qproperty-highlightedSubtitleColor: palette(highlighted-text);
qproperty-hoverTitleColor: palette(highlightedtext); qproperty-hoverTitleColor: palette(dark);
qproperty-hoverSubtitleColor: palette(highlightedtext); qproperty-hoverSubtitleColor: palette(dark);
qproperty-btnColor: palette(dark); qproperty-btnColor: palette(dark);
qproperty-btnTextColor: palette(bright-text); qproperty-btnTextColor: palette(bright-text);
qproperty-timestampColor: palette(text); qproperty-timestampColor: palette(text);
qproperty-highlightedTimestampColor: palette(highlighted-text); qproperty-highlightedTimestampColor: palette(highlighted-text);
qproperty-hoverTimestampColor: palette(highlighted-text); qproperty-hoverTimestampColor: palette(dark);
qproperty-bubbleBgColor: palette(base); qproperty-bubbleBgColor: palette(base);
qproperty-bubbleFgColor: palette(text); qproperty-bubbleFgColor: palette(text);

2
src/UserSettingsPage.cpp
View file

@ -115,7 +115,7 @@ UserSettings::applyTheme()
/*mid*/ QColor(110, 110, 110), /*mid*/ QColor(110, 110, 110),
/*text*/ QColor("#333"), /*text*/ QColor("#333"),
/*bright_text*/ QColor("#333"), /*bright_text*/ QColor("#333"),
/*base*/ QColor("white"), /*base*/ QColor("#eee"),
/*window*/ QColor("white")); /*window*/ QColor("white"));
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());