From cffd0a71af67c2ddc50ebfadc24186a600c169e1 Mon Sep 17 00:00:00 2001 From: defnax Date: Fri, 21 Aug 2020 22:41:34 +0200 Subject: [PATCH 1/2] removed hardcoded stylesheets from the frames --- retroshare-gui/src/gui/TheWire/PulseReply.ui | 5 +---- retroshare-gui/src/gui/TheWire/PulseTopLevel.ui | 5 +---- retroshare-gui/src/gui/TheWire/PulseViewGroup.ui | 5 +---- retroshare-gui/src/gui/qss/stylesheet/Standard.qss | 6 ++++++ 4 files changed, 9 insertions(+), 12 deletions(-) diff --git a/retroshare-gui/src/gui/TheWire/PulseReply.ui b/retroshare-gui/src/gui/TheWire/PulseReply.ui index 582ceb269..9925d19bd 100644 --- a/retroshare-gui/src/gui/TheWire/PulseReply.ui +++ b/retroshare-gui/src/gui/TheWire/PulseReply.ui @@ -40,10 +40,7 @@ - QFrame#frame{border: 2px solid #CCCCCC; -background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, - stop: 0 #EEEEEE, stop: 1 #CCCCCC); -border-radius: 10px} + QFrame::StyledPanel diff --git a/retroshare-gui/src/gui/TheWire/PulseTopLevel.ui b/retroshare-gui/src/gui/TheWire/PulseTopLevel.ui index 77d32218a..f3365825a 100644 --- a/retroshare-gui/src/gui/TheWire/PulseTopLevel.ui +++ b/retroshare-gui/src/gui/TheWire/PulseTopLevel.ui @@ -40,10 +40,7 @@ - QFrame#frame{border: 2px solid #CCCCCC; -background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, - stop: 0 #EEEEEE, stop: 1 #CCCCCC); -border-radius: 10px} + QFrame::StyledPanel diff --git a/retroshare-gui/src/gui/TheWire/PulseViewGroup.ui b/retroshare-gui/src/gui/TheWire/PulseViewGroup.ui index 7f808dd44..c2f209a19 100644 --- a/retroshare-gui/src/gui/TheWire/PulseViewGroup.ui +++ b/retroshare-gui/src/gui/TheWire/PulseViewGroup.ui @@ -40,10 +40,7 @@ - QFrame#frame{border: 2px solid #CCCCCC; -background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, - stop: 0 #EEEEEE, stop: 1 #CCCCCC); -border-radius: 10px} + QFrame::StyledPanel diff --git a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss index eb12e6551..7ab47c667 100644 --- a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss +++ b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss @@ -928,3 +928,9 @@ MessagesDialog QWidget#messageTreeWidget::item:hover { GxsForumThreadWidget QWidget#threadTreeWidget::item { padding: 2px; } + +PulseTopLevel QFrame#frame, PulseViewGroup QFrame#frame, PulseReply QFrame#frame { + border: 2px solid #7ecbfb; + border-radius: 6px; + background: white; +} From 047f51c824167caff90b0c4e0c75e0b691ee4596 Mon Sep 17 00:00:00 2001 From: defnax Date: Sun, 23 Aug 2020 17:20:52 +0200 Subject: [PATCH 2/2] update dark stylesheets --- retroshare-gui/src/qss/qdarkstyle-v2.qss | 9 +++++++-- retroshare-gui/src/qss/qdarkstyle.qss | 11 +++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/retroshare-gui/src/qss/qdarkstyle-v2.qss b/retroshare-gui/src/qss/qdarkstyle-v2.qss index cb573d765..4f6ee1cae 100644 --- a/retroshare-gui/src/qss/qdarkstyle-v2.qss +++ b/retroshare-gui/src/qss/qdarkstyle-v2.qss @@ -2143,8 +2143,8 @@ PostedCardView > QFrame#mainFrame[new=true] { background-color: #005000; } -WireGroupItem QFrame#frame{ - background: transparent; +WireGroupItem QFrame#wire_frame{ + background: transparent; } GxsChannelDialog GroupTreeWidget QTreeWidget#treeWidget::item{ @@ -2157,3 +2157,8 @@ RSTextBrowser, MimeTextEdit /*qproperty-textColorQuote: rgb(125, 125, 255);*/ qproperty-textColorQuotes: ColorList(#789922 #039bd5 #800000 #800080 #008080 #b10dc9 #85144b #3d9970); } + +PulseTopLevel QFrame#frame, PulseViewGroup QFrame#frame, PulseReply QFrame#frame { + border: 2px solid #38444d; + border-radius: 6px; +} diff --git a/retroshare-gui/src/qss/qdarkstyle.qss b/retroshare-gui/src/qss/qdarkstyle.qss index b50eb9aa1..64404cc45 100644 --- a/retroshare-gui/src/qss/qdarkstyle.qss +++ b/retroshare-gui/src/qss/qdarkstyle.qss @@ -1295,7 +1295,9 @@ PostedCardView > QFrame#mainFrame[new=true] { background-color: #005000; } -WireGroupItem QFrame#frame{ +WireGroupItem QFrame#wire_frame +{ + border: 1px solid #38444d; background: transparent; } @@ -1307,5 +1309,10 @@ RSTextBrowser, MimeTextEdit ChatWidget QFrame#pluginTitleFrame { - background: transparent; + background: transparent; +} + +PulseTopLevel QFrame#frame, PulseViewGroup QFrame#frame, PulseReply QFrame#frame { + border: 2px solid #38444d; + border-radius: 6px; }