diff --git a/retroshare-gui/src/gui/Posted/PostedListWidget.ui b/retroshare-gui/src/gui/Posted/PostedListWidget.ui index 3fa7069e6..f59ee76ee 100644 --- a/retroshare-gui/src/gui/Posted/PostedListWidget.ui +++ b/retroshare-gui/src/gui/Posted/PostedListWidget.ui @@ -108,7 +108,7 @@ - <html><head/><body><p><span style=" font-family:'-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol'; font-size:14px; color:#24292e; background-color:#ffffff;">Select sorting</span></p></body></html> + <html><head/><body><p><span style=" font-family:'-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol'; font-size:14pt; color:#24292e; background-color:#ffffff;">Select sorting</span></p></body></html> diff --git a/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.ui b/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.ui index c12c449d2..ccba99f67 100644 --- a/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.ui +++ b/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.ui @@ -396,7 +396,7 @@ p, li { white-space: pre-wrap; } - <html><head/><body><p><span style=" font-family:'-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol'; font-size:14px; color:#24292e; background-color:#ffffff;">Select sorting</span></p></body></html> + <html><head/><body><p><span style=" font-family:'-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol'; font-size:14pt; color:#24292e; background-color:#ffffff;">Select sorting</span></p></body></html> diff --git a/retroshare-gui/src/gui/chat/ChatWidget.cpp b/retroshare-gui/src/gui/chat/ChatWidget.cpp index 33ce92d9c..2f43120ac 100644 --- a/retroshare-gui/src/gui/chat/ChatWidget.cpp +++ b/retroshare-gui/src/gui/chat/ChatWidget.cpp @@ -1523,7 +1523,7 @@ void ChatWidget::chooseFont() text += " font-family:" + font.family() + ";"; text += font.bold() ? " font-weight: bold;" : ""; text += font.italic() ? " font-style: italic;" : ""; - text += " font-size:" + QString::number(font.pointSize()) + "px;"; + text += " font-size:" + QString::number(font.pointSize()) + "pt;"; text += font.strikeOut() ? " text-decoration: line-through;" : ""; text += font.underline() ? " text-decoration: underline;" : ""; text += "\">" + cursor.selectedText().toHtmlEscaped() + "

"; diff --git a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss index c673a6f09..aa85f80e9 100644 --- a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss +++ b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss @@ -48,7 +48,7 @@ GenCertDialog QLabel#no_node_label, GenCertDialog QLabel#no_gpg_key_label { background: #FFEECC; background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #FFEECC, stop:1 #FFE3AB); padding: 4px; - font-size: 14px; + font-size: 14pt; } GenCertDialog > QFrame#headerFrame > QLabel#headerLabel { @@ -109,7 +109,7 @@ GxsCreateCommentDialog QTextEdit#commentTextEdit { } GxsCreateCommentDialog QLabel#titleLabel { - font-size: 12px; + font-size: 12pt; font-weight: 600; color: black; } @@ -125,7 +125,7 @@ GxsCreateCommentDialog QFrame#frame { CreateGxsChannelMsg QPushButton#postButton { font: bold; - font-size: 15px; + font-size: 15pt; color: white; background: #0099cc; border-radius: 4px; @@ -147,7 +147,7 @@ GxsCreateCommentDialog QPushButton#postButton, GxsGroupDialog QPushButton#create PulseAddDialog QPushButton#pushButton_Post, PulseTopLevel QToolButton#toolButton_follow, PulseViewGroup QToolButton#toolButton_follow, WikiEditDialog QPushButton#pushButton_Submit{ font: bold; - font-size: 15px; + font-size: 15pt; color: white; background: #0099cc; border-radius: 4px; @@ -174,7 +174,7 @@ WikiEditDialog QPushButton#pushButton_Submit:hover{ ShareManager QPushButton#closeButton { font: bold; - font-size: 15px; + font-size: 15pt; color: white; background: #0099cc; border-radius: 4px; @@ -187,7 +187,7 @@ ShareManager QPushButton#closeButton { ShareManager QPushButton#addButton{ font: bold; - font-size: 15px; + font-size: 15pt; color: white; background: #32CD32; border-radius: 4px; @@ -205,7 +205,7 @@ ShareManager QPushButton#addButton:hover{ SearchDialog QPushButton#pushButtonSearch { font: bold; - font-size: 15px; + font-size: 15pt; color: white; background: #32CD32; border-radius: 4px; @@ -225,7 +225,7 @@ CreateGxsForumMsg QPushButton#postButton:disabled, PostedCreatePostDialog QPushB CreateGxsChannelMsg QPushButton#postButton:disabled, GxsCreateCommentDialog QPushButton#postButton:disabled, PulseAddDialog QPushButton#pushButton_Post:disabled, WikiEditDialog QPushButton#pushButton_Submit:disabled { font: bold; - font-size: 15px; + font-size: 15pt; color: white; background: #d40000; border-radius: 4px; @@ -240,7 +240,7 @@ PulseAddDialog QPushButton#pushButton_Post:disabled, WikiEditDialog QPushButton# GxsForumThreadWidget QPushButton#forumName { font: bold; - font-size: 14px; + font-size: 14pt; } CreateForumMsg > QToolBar#toolBar, CreateForumV2Msg > QToolBar#toolBar { @@ -282,7 +282,7 @@ ChatLobbyWidget QLabel#lobbyinfo_label ChatLobbyWidget QLabel#lobbyname_lineEdit { font: bold; - font-size: 16px; + font-size: 16pt; } ChatLobbyWidget QGroupBox#lobbyinfo_groupBox @@ -294,7 +294,7 @@ ChatLobbyWidget QGroupBox#lobbyinfo_groupBox border: 1px solid #CCCCCC; padding: 14 6px; - font-size: 12px; + font-size: 12pt; font-weight: bold; } @@ -783,13 +783,13 @@ GenCertDialog QPushButton#genButton:hover { GenCertDialog QPushButton#genButton:disabled { border-image: url(:/images/btn_27.png) 4; -/* font-size: 16px; */ +/* font-size: 16pt; */ font: bold; color: black; } ConnectFriendWizard QRadioButton { - font-size: 16px; + font-size: 16pt; } ConnectFriendWizard QPlainTextEdit#friendCertEdit { @@ -836,7 +836,7 @@ GxsForumThreadWidget QToolButton#newthreadButton { PostedListWidgetWithModel QToolButton#subscribeToolButton { font: bold; - font-size: 15px; + font-size: 15pt; color: white; background: #0099cc; border-radius: 4px; @@ -855,7 +855,7 @@ PostedListWidgetWithModel QFrame#headerFrame { GxsForumThreadWidget QToolButton#subscribeToolButton { font: bold; - font-size: 14px; + font-size: 14pt; color: white; background: #0099cc; border-radius: 4px; @@ -875,7 +875,7 @@ SecurityIpItem QFrame#mainFrame, MsgItem QFrame#msgFrame, SecurityItem QFrame#ma GxsChannelPostsWidgetWithModel QToolButton#subscribeToolButton { font: bold; - font-size: 14px; + font-size: 14pt; color: white; background: #0099cc; border-radius: 4px; @@ -1041,7 +1041,7 @@ BoardPostDisplayWidget_card > QFrame#mainFrame[new=true] { BoardPostDisplayWidget_compact QLabel#titleLabel, BoardPostDisplayWidget_card QLabel#titleLabel{ - font-size: 14px; + font-size: 14pt; font: bold; } @@ -1057,7 +1057,7 @@ PostedListWidgetWithModel QTextBrowser#infoDescription { PostedCreatePostDialog QPushButton#submitButton { font: bold; - font-size: 15px; + font-size: 15pt; color: white; background: #0099cc; border-radius: 4px; @@ -1191,17 +1191,17 @@ ChannelsCommentsItem QFrame#mainFrame, BoardsCommentsItem QFrame#mainFrame { } ChannelsCommentsItem QLabel#newCommentLabel, BoardsCommentsItem QLabel#newCommentLabel { - font-size: 14px; + font-size: 14pt; font: bold; } ChannelsCommentsItem QLabel#subjectLabel, ChannelsCommentsItem QLabel#titleLabel , QLabel#nameLabel { - font-size: 14px; + font-size: 14pt; font: bold; } BoardsCommentsItem QLabel#subjectLabel, QLabel#titleLabel , QLabel#nameLabel { - font-size: 14px; + font-size: 14pt; font: bold; } diff --git a/retroshare-gui/src/gui/qss/stylesheet/qss.default b/retroshare-gui/src/gui/qss/stylesheet/qss.default index bdfebe0d5..7e1ecf8b2 100644 --- a/retroshare-gui/src/gui/qss/stylesheet/qss.default +++ b/retroshare-gui/src/gui/qss/stylesheet/qss.default @@ -158,7 +158,7 @@ GxsForumThreadWidget StyledElidedLabel#forumName { padding: 2px; font: bold; - font-size: 1.5em; + font-size: 15pt; } GroupTreeWidget diff --git a/retroshare-gui/src/qss/qdarkstyle-v2.qss b/retroshare-gui/src/qss/qdarkstyle-v2.qss index 44f9aa87f..34b120d68 100644 --- a/retroshare-gui/src/qss/qdarkstyle-v2.qss +++ b/retroshare-gui/src/qss/qdarkstyle-v2.qss @@ -1974,7 +1974,7 @@ GxsForumThreadWidget QPushButton#forumName { qproperty-fontSizeFactor: 140; color: #0099cc; - font-size: 15px; + font-size: 15pt; font: bold; } @@ -2014,7 +2014,7 @@ QTreeView [new=true]{ PostedListWidgetWithModel QToolButton#subscribeToolButton { font: bold; - font-size: 15px; + font-size: 15pt; color: white; background: #0099cc; border-radius: 4px; @@ -2028,7 +2028,7 @@ PostedListWidgetWithModel QToolButton#subscribeToolButton:hover { GxsForumThreadWidget QToolButton#subscribeToolButton { font: bold; - font-size: 14px; + font-size: 14pt; color: white; background: #0099cc; border-radius: 4px; @@ -2042,7 +2042,7 @@ GxsForumThreadWidget QToolButton#subscribeToolButton:hover { GxsChannelPostsWidgetWithModel QToolButton#subscribeToolButton { font: bold; - font-size: 14px; + font-size: 14pt; color: white; background: #0099cc; border-radius: 4px; @@ -2083,7 +2083,7 @@ GxsChannelPostsWidgetWithModel QToolButton#subscribeToolButton::menu-button { CreateGxsChannelMsg QPushButton#postButton { font: bold; - font-size: 15px; + font-size: 15pt; color: white; background: #0099cc; border-radius: 4px; @@ -2103,7 +2103,7 @@ CreateCircleDialog QPushButton#createButton, CreateLobbyDialog QPushButton#creat IdEditDialog QPushButton#createButton, CreateGxsForumMsg QPushButton#postButton, GxsCreateCommentDialog QPushButton#postButton, GxsGroupDialog QPushButton#createButton { font: bold; - font-size: 15px; + font-size: 15pt; color: white; background: #0099cc; border-radius: 4px; @@ -2124,7 +2124,7 @@ GxsCreateCommentDialog QPushButton#postButton:hover, GxsGroupDialog QPushButton# CreateGxsForumMsg QPushButton#postButton:disabled, PostedCreatePostDialog QPushButton#submitButton:disabled, CreateGxsChannelMsg QPushButton#postButton:disabled, GxsCreateCommentDialog QPushButton#postButton:disabled { font: bold; - font-size: 15px; + font-size: 15pt; color: white; background: #d40000; border-radius: 4px; @@ -2145,7 +2145,7 @@ QLabel#avatarLabel{ PostedCreatePostDialog QPushButton#submitButton { font: bold; - font-size: 15px; + font-size: 15pt; color: white; background: #0099cc; border-radius: 4px; @@ -2243,7 +2243,7 @@ BoardPostDisplayWidget_card QFrame#mainFrame[new=true] { BoardPostDisplayWidget_compact QLabel#titleLabel, BoardPostDisplayWidget_card QLabel#titleLabel{ - font-size: 14px; + font-size: 14pt; font: bold; } diff --git a/retroshare-gui/src/qss/qdarkstyle.qss b/retroshare-gui/src/qss/qdarkstyle.qss index f0b3892d8..5e0aa9634 100644 --- a/retroshare-gui/src/qss/qdarkstyle.qss +++ b/retroshare-gui/src/qss/qdarkstyle.qss @@ -1159,7 +1159,7 @@ OpModeStatus[opMode="Minimal"] { PostedListWidgetWithModel QToolButton#subscribeToolButton { font: bold; - font-size: 15px; + font-size: 15pt; color: white; background: #0099cc; border-radius: 4px; @@ -1173,7 +1173,7 @@ PostedListWidgetWithModel QToolButton#subscribeToolButton:hover { GxsForumThreadWidget QToolButton#subscribeToolButton { font: bold; - font-size: 14px; + font-size: 14pt; color: white; background: #0099cc; border-radius: 4px; @@ -1201,7 +1201,7 @@ GxsForumThreadWidget QWidget#threadTreeWidget::item:selected:!active { GxsChannelPostsWidgetWithModel QToolButton#subscribeToolButton { font: bold; - font-size: 14px; + font-size: 14pt; color: white; background: #0099cc; border-radius: 4px; @@ -1259,7 +1259,7 @@ GxsChannelPostItem QLabel#subjectLabel, GxsChannelPostItem QLabel#titleLabel { CreateGxsChannelMsg QPushButton#postButton { font: bold; - font-size: 15px; + font-size: 15pt; color: white; background: #0099cc; border-radius: 4px; @@ -1281,7 +1281,7 @@ GxsCreateCommentDialog QPushButton#postButton, GxsGroupDialog QPushButton#create PulseAddDialog QPushButton#pushButton_Post, PulseTopLevel QToolButton#toolButton_follow, PulseViewGroup QToolButton#toolButton_follow { font: bold; - font-size: 15px; + font-size: 15pt; color: white; background: #0099cc; border-radius: 4px; @@ -1308,7 +1308,7 @@ CreateGxsForumMsg QPushButton#postButton:disabled, PostedCreatePostDialog QPushB CreateGxsChannelMsg QPushButton#postButton:disabled, GxsCreateCommentDialog QPushButton#postButton:disabled, PulseAddDialog QPushButton#pushButton_Post:disabled { font: bold; - font-size: 15px; + font-size: 15pt; color: white; background: #d40000; border-radius: 4px; @@ -1321,7 +1321,7 @@ PulseAddDialog QPushButton#pushButton_Post:disabled { ShareManager QPushButton#closeButton { font: bold; - font-size: 15px; + font-size: 15pt; color: white; background: #0099cc; border-radius: 4px; @@ -1334,7 +1334,7 @@ ShareManager QPushButton#closeButton { ShareManager QPushButton#addButton { font: bold; - font-size: 15px; + font-size: 15pt; color: white; background: #32CD32; border-radius: 4px; @@ -1362,7 +1362,7 @@ QLabel#avatarLabel{ PostedCreatePostDialog QPushButton#submitButton { font: bold; - font-size: 15px; + font-size: 15pt; color: white; background: #0099cc; border-radius: 4px; @@ -1381,7 +1381,7 @@ GxsForumThreadWidget QPushButton#forumName { qproperty-fontSizeFactor: 140; color: #0099cc; - font-size: 15px; + font-size: 15pt; font: bold; } @@ -1473,7 +1473,7 @@ BoardPostDisplayWidget_card QLabel#newLabel { BoardPostDisplayWidget_compact QLabel#titleLabel, BoardPostDisplayWidget_card QLabel#titleLabel{ - font-size: 14px; + font-size: 14pt; font: bold; } diff --git a/retroshare-gui/src/util/HandleRichText.cpp b/retroshare-gui/src/util/HandleRichText.cpp index a420178ec..b635703d7 100644 --- a/retroshare-gui/src/util/HandleRichText.cpp +++ b/retroshare-gui/src/util/HandleRichText.cpp @@ -281,7 +281,7 @@ void RsHtml::anchorStylesheetForImg(QDomDocument &/*doc*/, QDomElement &/*elemen break; case RetroShareLink::TYPE_CERTIFICATE: - styleSheet = "QPushButton{ border-image: url(:/images/btn_blue.png) ;border-width: 4;padding: 0px 6px;font-size: 12px;color: white;} QPushButton:hover{ border-image: url(:/images/btn_blue_hover.png) ;}"; + styleSheet = "QPushButton{ border-image: url(:/images/btn_blue.png) ;border-width: 4;padding: 0px 6px;font-size: 12pt;color: white;} QPushButton:hover{ border-image: url(:/images/btn_blue_hover.png) ;}"; break; } }