From 1b8bee4262ca542c8f7940da5ea10233c4dbcdd1 Mon Sep 17 00:00:00 2001 From: defnax Date: Tue, 15 Aug 2023 23:12:54 +0200 Subject: [PATCH] Removed hardcorded stylesheet from PulseReplySeperator * Fixed some dark style issues --- .../src/gui/TheWire/PulseReplySeperator.ui | 5 +--- .../src/gui/qss/stylesheet/Standard_Dark.qss | 26 ++++++++----------- .../src/gui/qss/stylesheet/Standard_Light.qss | 6 +++++ retroshare-gui/src/qss/retroclassic.qss | 6 +++++ 4 files changed, 24 insertions(+), 19 deletions(-) diff --git a/retroshare-gui/src/gui/TheWire/PulseReplySeperator.ui b/retroshare-gui/src/gui/TheWire/PulseReplySeperator.ui index 4a605a219..6564fe5e3 100644 --- a/retroshare-gui/src/gui/TheWire/PulseReplySeperator.ui +++ b/retroshare-gui/src/gui/TheWire/PulseReplySeperator.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_Dark.qss b/retroshare-gui/src/gui/qss/stylesheet/Standard_Dark.qss index 7497440c5..ffea0a4d8 100644 --- a/retroshare-gui/src/gui/qss/stylesheet/Standard_Dark.qss +++ b/retroshare-gui/src/gui/qss/stylesheet/Standard_Dark.qss @@ -2436,7 +2436,7 @@ WireGroupItem QFrame#wire_frame QLabel{ background: transparent; } WireGroupItem QFrame#wire_frame:hover { - background-color: #2e8bab; + background-color: #346792; } PulseTopLevel QFrame#frame, @@ -2446,13 +2446,6 @@ PulseReply QFrame#frame { border-radius: 6px; } -PulseAddDialog QTextEdit#textEdit_Pulse { - border: 2px solid #c4cfd6; - border-radius: 6px; - background: white; - color: black; -} - PulseReply #line_replyLine, PulseMessage #line{ color: #c4cfd6; @@ -2462,6 +2455,16 @@ PulseReply QLabel#label_groupName{ color: #5b7083; } +PulseReplySeperator QFrame#frame { + background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #455364, stop: 0.5 #54687A,stop: 0.6 #44586A, stop:1 #455364); + border-radius: 10px; +} + +QLabel#label_masthead{ + border: 2px solid #CCCCCC; + border-radius: 4px; +} + /**** Color definitions ****/ ForumsDialog, GxsForumThreadWidget @@ -2552,10 +2555,3 @@ OpModeStatus[opMode="Minimal"] { [WrongValue="true"] { background-color: #702020; } - -/**** The Wire ****/ - -QLabel#label_masthead{ - border: 2px solid #CCCCCC; - border-radius: 4px; -} diff --git a/retroshare-gui/src/gui/qss/stylesheet/Standard_Light.qss b/retroshare-gui/src/gui/qss/stylesheet/Standard_Light.qss index 061ca0518..df6b9d51c 100644 --- a/retroshare-gui/src/gui/qss/stylesheet/Standard_Light.qss +++ b/retroshare-gui/src/gui/qss/stylesheet/Standard_Light.qss @@ -2687,6 +2687,12 @@ PulseReply QLabel#label_groupName{ color: #5b7083; } +PulseReplySeperator 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} +} + QLabel#label_masthead{ border: 2px solid #CCCCCC; border-radius: 4px; diff --git a/retroshare-gui/src/qss/retroclassic.qss b/retroshare-gui/src/qss/retroclassic.qss index df8802f3a..eea7fdf25 100644 --- a/retroshare-gui/src/qss/retroclassic.qss +++ b/retroshare-gui/src/qss/retroclassic.qss @@ -184,3 +184,9 @@ QLabel#label_masthead{ border: 2px solid #CCCCCC; border-radius: 4px; } + +PulseReplySeperator 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} +}