diff --git a/retroshare-gui/src/gui/feeds/MsgItem.ui b/retroshare-gui/src/gui/feeds/MsgItem.ui index f7e3b73b3..be7c2dc9a 100644 --- a/retroshare-gui/src/gui/feeds/MsgItem.ui +++ b/retroshare-gui/src/gui/feeds/MsgItem.ui @@ -46,7 +46,7 @@ border-radius: 10px} QFrame::Raised - + 0 diff --git a/retroshare-gui/src/gui/forums/CreateForumMsg.ui b/retroshare-gui/src/gui/forums/CreateForumMsg.ui index 205d93e60..33c8118d4 100644 --- a/retroshare-gui/src/gui/forums/CreateForumMsg.ui +++ b/retroshare-gui/src/gui/forums/CreateForumMsg.ui @@ -17,9 +17,6 @@ :/images/rstray3.png:/images/rstray3.png - - QToolBar#toolBar{background-image: url(:/images/connect/connectFriendBanner.png)} - Qt::ToolButtonTextUnderIcon @@ -283,6 +280,9 @@ p, li { white-space: pre-wrap; } toolBar + + false + TopToolBarArea diff --git a/retroshare-gui/src/gui/forumsv2/CreateForumV2Msg.ui b/retroshare-gui/src/gui/forumsv2/CreateForumV2Msg.ui index 8a75ccdca..cfeeb9359 100644 --- a/retroshare-gui/src/gui/forumsv2/CreateForumV2Msg.ui +++ b/retroshare-gui/src/gui/forumsv2/CreateForumV2Msg.ui @@ -17,9 +17,6 @@ :/images/rstray3.png:/images/rstray3.png - - QToolBar#toolBar{background-image: url(:/images/connect/connectFriendBanner.png)} - Qt::ToolButtonTextUnderIcon @@ -283,6 +280,9 @@ p, li { white-space: pre-wrap; } toolBar + + false + TopToolBarArea diff --git a/retroshare-gui/src/gui/im_history/ImHistoryBrowser.ui b/retroshare-gui/src/gui/im_history/ImHistoryBrowser.ui index cee062c93..d056c444f 100644 --- a/retroshare-gui/src/gui/im_history/ImHistoryBrowser.ui +++ b/retroshare-gui/src/gui/im_history/ImHistoryBrowser.ui @@ -55,6 +55,9 @@ QFrame::Raised + + 2 + @@ -215,7 +218,6 @@ - diff --git a/retroshare-gui/src/gui/msgs/MessageComposer.ui b/retroshare-gui/src/gui/msgs/MessageComposer.ui index 4e503aced..9f3d57f8d 100644 --- a/retroshare-gui/src/gui/msgs/MessageComposer.ui +++ b/retroshare-gui/src/gui/msgs/MessageComposer.ui @@ -17,10 +17,6 @@ :/images/folder-draft.png:/images/folder-draft.png - - QToolBar#toolBar{background-image: url(:/images/connect/connectFriendBanner.png)} - - @@ -185,20 +181,13 @@ 2 - + 16777215 38 - - QFrame#frame{ -background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, -stop:0 #FEFEFE, stop:1 #E8E8E8); - -border: 1px solid #CCCCCC;} - QFrame::StyledPanel diff --git a/retroshare-gui/src/gui/profile/ProfileWidget.ui b/retroshare-gui/src/gui/profile/ProfileWidget.ui index b784a14f2..4a1ec81ab 100644 --- a/retroshare-gui/src/gui/profile/ProfileWidget.ui +++ b/retroshare-gui/src/gui/profile/ProfileWidget.ui @@ -127,12 +127,9 @@ - - - QFrame#frame_2{ -background-color: white; - -border: 2px solid #CCCCCC;} + + + QFrame::StyledPanel @@ -417,12 +414,9 @@ border: 2px solid #CCCCCC;} - - - QFrame#frame_3{ -background-color: white; - -border: 2px solid #CCCCCC;} + + + QFrame::StyledPanel @@ -710,12 +704,9 @@ border: 2px solid #CCCCCC;} - - - QFrame#frame_4{ -background-color: white; - -border: 2px solid #CCCCCC;} + + + QFrame::StyledPanel @@ -1167,8 +1158,6 @@ border: 2px solid #CCCCCC;} - - diff --git a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss index dd81fb6d4..0525e63a3 100644 --- a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss +++ b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss @@ -60,6 +60,10 @@ ForumsDialog2 QLabel#forumName, ForumsDialog2 QLabel#threadTitle background: white; } +CreateForumMsg > QToolBar#toolBar, CreateForumV2Msg > QToolBar#toolBar { + background-image: url(:/images/headerFrame.png); +} + /* MessengerWindow */ MessengerWindow QFrame#logoFrame { @@ -99,3 +103,24 @@ ChatWidget QFrame#infoFrame { background: #FFFFD7; background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #FFFFD7, stop:1 #FFFFB2); } + +/* Messages */ + +MessageComposer > QToolBar#toolBar { + background-image: url(:/images/headerFrame.png); +} + +/* Profile */ + +ProfileWidget QFrame#frame_1, ProfileWidget QFrame#frame_2, ProfileWidget QFrame#frame_3 { + background-color: white; + border: 2px solid #CCCCCC; +} + +/* Settings */ + +PluginItem > QFrame#frame { + border: 2px solid #A8B8D1; + background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #FCFDFE, stop: 1 #E2E8EF); + border-radius: 0px +} diff --git a/retroshare-gui/src/gui/settings/ChatPage.ui b/retroshare-gui/src/gui/settings/ChatPage.ui index d2a84080d..f894567ed 100644 --- a/retroshare-gui/src/gui/settings/ChatPage.ui +++ b/retroshare-gui/src/gui/settings/ChatPage.ui @@ -116,15 +116,6 @@ - - - 16777215 - 16777215 - - - - - Chat Font @@ -355,7 +346,7 @@ QTabWidget::North - 0 + 1 diff --git a/retroshare-gui/src/gui/settings/PluginItem.ui b/retroshare-gui/src/gui/settings/PluginItem.ui index 3750f450d..45bbf0b19 100644 --- a/retroshare-gui/src/gui/settings/PluginItem.ui +++ b/retroshare-gui/src/gui/settings/PluginItem.ui @@ -25,18 +25,9 @@ 0 - - QFrame#frame{border: 2px solid #A8B8D1; -background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, -stop: 0 #FCFDFE, stop: 1 #E2E8EF); -border-radius: 0px} - QFrame::StyledPanel - - QFrame::Raised -