Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-28 00:49:28 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2346 from defnax/qss-fix

Browse Source 
fixed some values for font-size
This commit is contained in:
defnax 2021-02-20 15:42:31 +01:00 committed by GitHub
commit dfa611095e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
retroshare-gui/src/gui/feeds/BoardsCommentsItem.cpp
View File

@ -432,7 +432,7 @@ void BoardsCommentsItem::setComment(const RsGxsComment& cmt)
QPixmap pixmap; QPixmap pixmap;
if(idDetails.mAvatar.mSize == 0 || !GxsIdDetails::loadPixmapFromData(idDetails.mAvatar.mData, idDetails.mAvatar.mSize, pixmap,GxsIdDetails::SMALL)) if(idDetails.mAvatar.mSize == 0 || !GxsIdDetails::loadPixmapFromData(idDetails.mAvatar.mData, idDetails.mAvatar.mSize, pixmap,GxsIdDetails::SMALL))
pixmap = GxsIdDetails::makeDefaultIcon(cmt.mMeta.mAuthorId,GxsIdDetails::SMALL); pixmap = GxsIdDetails::makeDefaultIcon(cmt.mMeta.mAuthorId,GxsIdDetails::LARGE);
ui->avatarLabel->setPixmap(pixmap); ui->avatarLabel->setPixmap(pixmap);
emit sizeChanged(this); emit sizeChanged(this);

2
retroshare-gui/src/gui/feeds/ChannelsCommentsItem.cpp
View File

@ -317,7 +317,7 @@ void ChannelsCommentsItem::loadMessage()
QPixmap pixmap ; QPixmap pixmap ;
if(idDetails.mAvatar.mSize == 0 || !GxsIdDetails::loadPixmapFromData(idDetails.mAvatar.mData, idDetails.mAvatar.mSize, pixmap,GxsIdDetails::SMALL)) if(idDetails.mAvatar.mSize == 0 || !GxsIdDetails::loadPixmapFromData(idDetails.mAvatar.mData, idDetails.mAvatar.mSize, pixmap,GxsIdDetails::SMALL))
pixmap = GxsIdDetails::makeDefaultIcon(cmt.mMeta.mAuthorId,GxsIdDetails::SMALL); pixmap = GxsIdDetails::makeDefaultIcon(cmt.mMeta.mAuthorId,GxsIdDetails::LARGE);
ui->avatarLabel->setPixmap(pixmap); ui->avatarLabel->setPixmap(pixmap);
//Change this item to be uploaded with thread element. //Change this item to be uploaded with thread element.

26
retroshare-gui/src/gui/qss/stylesheet/Standard.qss
View File

@ -125,7 +125,7 @@ GxsCreateCommentDialog QFrame#frame {
CreateGxsChannelMsg QPushButton#postButton { CreateGxsChannelMsg QPushButton#postButton {
font: bold; font: bold;
font-size: 15pt; font-size: 12pt;
color: white; color: white;
background: #0099cc; background: #0099cc;
border-radius: 4px; border-radius: 4px;
@ -147,7 +147,7 @@ GxsCreateCommentDialog QPushButton#postButton, GxsGroupDialog QPushButton#create
PulseAddDialog QPushButton#pushButton_Post, PulseTopLevel QToolButton#toolButton_follow, PulseAddDialog QPushButton#pushButton_Post, PulseTopLevel QToolButton#toolButton_follow,
PulseViewGroup QToolButton#toolButton_follow, WikiEditDialog QPushButton#pushButton_Submit{ PulseViewGroup QToolButton#toolButton_follow, WikiEditDialog QPushButton#pushButton_Submit{
font: bold; font: bold;
font-size: 15pt; font-size: 12pt;
color: white; color: white;
background: #0099cc; background: #0099cc;
border-radius: 4px; border-radius: 4px;
@ -174,7 +174,7 @@ WikiEditDialog QPushButton#pushButton_Submit:hover{
ShareManager QPushButton#closeButton { ShareManager QPushButton#closeButton {
font: bold; font: bold;
font-size: 15pt; font-size: 12pt;
color: white; color: white;
background: #0099cc; background: #0099cc;
border-radius: 4px; border-radius: 4px;
@ -187,7 +187,7 @@ ShareManager QPushButton#closeButton {
ShareManager QPushButton#addButton{ ShareManager QPushButton#addButton{
font: bold; font: bold;
font-size: 15pt; font-size: 12pt;
color: white; color: white;
background: #32CD32; background: #32CD32;
border-radius: 4px; border-radius: 4px;
@ -205,7 +205,7 @@ ShareManager QPushButton#addButton:hover{
SearchDialog QPushButton#pushButtonSearch { SearchDialog QPushButton#pushButtonSearch {
font: bold; font: bold;
font-size: 15pt; font-size: 12pt;
color: white; color: white;
background: #32CD32; background: #32CD32;
border-radius: 4px; border-radius: 4px;
@ -225,7 +225,7 @@ CreateGxsForumMsg QPushButton#postButton:disabled, PostedCreatePostDialog QPushB
CreateGxsChannelMsg QPushButton#postButton:disabled, GxsCreateCommentDialog QPushButton#postButton:disabled, CreateGxsChannelMsg QPushButton#postButton:disabled, GxsCreateCommentDialog QPushButton#postButton:disabled,
PulseAddDialog QPushButton#pushButton_Post:disabled, WikiEditDialog QPushButton#pushButton_Submit:disabled { PulseAddDialog QPushButton#pushButton_Post:disabled, WikiEditDialog QPushButton#pushButton_Submit:disabled {
font: bold; font: bold;
font-size: 15pt; font-size: 12pt;
color: white; color: white;
background: #d40000; background: #d40000;
border-radius: 4px; border-radius: 4px;
@ -240,7 +240,7 @@ PulseAddDialog QPushButton#pushButton_Post:disabled, WikiEditDialog QPushButton#
GxsForumThreadWidget QPushButton#forumName GxsForumThreadWidget QPushButton#forumName
{ {
font: bold; font: bold;
font-size: 14pt; font-size: 12pt;
} }
CreateForumMsg > QToolBar#toolBar, CreateForumV2Msg > QToolBar#toolBar { CreateForumMsg > QToolBar#toolBar, CreateForumV2Msg > QToolBar#toolBar {
@ -855,7 +855,7 @@ PostedListWidgetWithModel QFrame#headerFrame {
GxsForumThreadWidget QToolButton#subscribeToolButton { GxsForumThreadWidget QToolButton#subscribeToolButton {
font: bold; font: bold;
font-size: 14pt; font-size: 12pt;
color: white; color: white;
background: #0099cc; background: #0099cc;
border-radius: 4px; border-radius: 4px;
@ -875,7 +875,7 @@ SecurityIpItem QFrame#mainFrame, MsgItem QFrame#msgFrame, SecurityItem QFrame#ma
GxsChannelPostsWidgetWithModel QToolButton#subscribeToolButton { GxsChannelPostsWidgetWithModel QToolButton#subscribeToolButton {
font: bold; font: bold;
font-size: 14pt; font-size: 12pt;
color: white; color: white;
background: #0099cc; background: #0099cc;
border-radius: 4px; border-radius: 4px;
@ -1057,7 +1057,7 @@ PostedListWidgetWithModel QTextBrowser#infoDescription {
PostedCreatePostDialog QPushButton#submitButton { PostedCreatePostDialog QPushButton#submitButton {
font: bold; font: bold;
font-size: 15pt; font-size: 12pt;
color: white; color: white;
background: #0099cc; background: #0099cc;
border-radius: 4px; border-radius: 4px;
@ -1191,17 +1191,17 @@ ChannelsCommentsItem QFrame#mainFrame, BoardsCommentsItem QFrame#mainFrame {
} }
ChannelsCommentsItem QLabel#newCommentLabel, BoardsCommentsItem QLabel#newCommentLabel { ChannelsCommentsItem QLabel#newCommentLabel, BoardsCommentsItem QLabel#newCommentLabel {
font-size: 14pt; font-size: 12pt;
font: bold; font: bold;
} }
ChannelsCommentsItem QLabel#subjectLabel, ChannelsCommentsItem QLabel#titleLabel , QLabel#nameLabel { ChannelsCommentsItem QLabel#subjectLabel, ChannelsCommentsItem QLabel#titleLabel , QLabel#nameLabel {
font-size: 14pt; font-size: 12pt;
font: bold; font: bold;
} }
BoardsCommentsItem QLabel#subjectLabel, QLabel#titleLabel , QLabel#nameLabel { BoardsCommentsItem QLabel#subjectLabel, QLabel#titleLabel , QLabel#nameLabel {
font-size: 14pt; font-size: 12pt;
font: bold; font: bold;
} }