From 9a82d8144f7204fc7ead6920d5e4b25f7fdbd5a5 Mon Sep 17 00:00:00 2001 From: TriKriSta Date: Sat, 23 Feb 2019 17:11:30 +0200 Subject: [PATCH] style: edit styles --- src/widget/form/settings/aboutsettings.ui | 2 +- themes/dark/centralWidget/centralWidget.css | 2 +- themes/dark/chatArea/chatArea.css | 4 ++-- themes/dark/chatArea/chatHead.css | 2 +- themes/dark/chatForm/labels.css | 4 ++-- themes/dark/contentDialog/contentDialog.css | 23 +++++++++++-------- themes/dark/emoticonWidget/emoticonWidget.css | 2 +- themes/dark/loginScreen/loginScreen.css | 2 +- themes/dark/settings/mainContent.css | 18 +++++++-------- themes/dark/window/general.css | 16 +++++++++++++ themes/dark/window/statusPanel.css | 2 +- .../default/centralWidget/centralWidget.css | 2 +- themes/default/settings/mainContent.css | 21 ++--------------- themes/default/window/general.css | 17 ++++++++++++++ 14 files changed, 69 insertions(+), 48 deletions(-) diff --git a/src/widget/form/settings/aboutsettings.ui b/src/widget/form/settings/aboutsettings.ui index a761d5fa9..4e381f8ec 100644 --- a/src/widget/form/settings/aboutsettings.ui +++ b/src/widget/form/settings/aboutsettings.ui @@ -280,7 +280,7 @@ <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Noto Sans'; font-size:10pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif'; color:#000000;">Copyright © 2014-2018 by The qTox Project Contributors</span></p> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif';">Copyright © 2014-2018 by The qTox Project Contributors</span></p> <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu';">qTox is a Qt-based graphical interface for Tox.</span></p> <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif';">qTox is libre software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.</span></p> <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif';">qTox is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. </span></p> diff --git a/themes/dark/centralWidget/centralWidget.css b/themes/dark/centralWidget/centralWidget.css index a41924745..6aefd33b3 100644 --- a/themes/dark/centralWidget/centralWidget.css +++ b/themes/dark/centralWidget/centralWidget.css @@ -13,7 +13,7 @@ QTextEdit color: @mainText; } -QSpinBox +QSpinBox, QDoubleSpinBox { color: @mainText; } diff --git a/themes/dark/chatArea/chatArea.css b/themes/dark/chatArea/chatArea.css index 3411e1866..4dce22394 100644 --- a/themes/dark/chatArea/chatArea.css +++ b/themes/dark/chatArea/chatArea.css @@ -1,7 +1,7 @@ QTextEdit { - background: white; - color: black; + background: @groundBase; + color: @mainText; } QGraphicsView diff --git a/themes/dark/chatArea/chatHead.css b/themes/dark/chatArea/chatHead.css index 15d3a89fb..53073ebb3 100644 --- a/themes/dark/chatArea/chatHead.css +++ b/themes/dark/chatArea/chatHead.css @@ -1,7 +1,7 @@ QLineEdit { color: @mainText; - background: white; + background: @groundBase; border: 0px; } diff --git a/themes/dark/chatForm/labels.css b/themes/dark/chatForm/labels.css index 8f0b0173b..8dfbf20bd 100644 --- a/themes/dark/chatForm/labels.css +++ b/themes/dark/chatForm/labels.css @@ -1,11 +1,11 @@ QLabel { - color: #000; + color: @mainText; } QLabel:disabled { - color: #ddd; + color: #2d2b2b; } QLabel[state="red"] diff --git a/themes/dark/contentDialog/contentDialog.css b/themes/dark/contentDialog/contentDialog.css index ebfe7c1da..dd15f6a25 100644 --- a/themes/dark/contentDialog/contentDialog.css +++ b/themes/dark/contentDialog/contentDialog.css @@ -1,16 +1,21 @@ QSplitter { - color: white; - background-color: white; - alternate-background-color: white; - border-color: white; - gridline-color: white; - selection-color: white; - selection-background-color: white; + color: @groundExtra; + background-color: @groundExtra; + alternate-background-color: @groundExtra; + border-color: @groundExtra; + gridline-color: @groundExtra; + selection-color: @groundExtra; + selection-background-color: @groundExtra; } QSplitter:handle { - color: white; - background-color: white; + color: @groundExtra; + background-color: @groundExtra; +} + +QWidget +{ + background: @groundBase; } diff --git a/themes/dark/emoticonWidget/emoticonWidget.css b/themes/dark/emoticonWidget/emoticonWidget.css index 2dcbca875..ffb8e841a 100644 --- a/themes/dark/emoticonWidget/emoticonWidget.css +++ b/themes/dark/emoticonWidget/emoticonWidget.css @@ -35,6 +35,6 @@ QRadioButton::indicator:checked QMenu { - background-color: @statusActive; /* sets background of the menu */ + background-color: #363434; /* sets background of the menu */ border: 0px solid; } diff --git a/themes/dark/loginScreen/loginScreen.css b/themes/dark/loginScreen/loginScreen.css index f8f2bbd9f..2649e4b9c 100644 --- a/themes/dark/loginScreen/loginScreen.css +++ b/themes/dark/loginScreen/loginScreen.css @@ -57,7 +57,7 @@ QStackedWidget QPushButton background: #589f4e; } -QLabel +QMessageBox, QLabel { color: @mainText; background: #100f0f; diff --git a/themes/dark/settings/mainContent.css b/themes/dark/settings/mainContent.css index d70156eef..bad7b6fed 100644 --- a/themes/dark/settings/mainContent.css +++ b/themes/dark/settings/mainContent.css @@ -27,12 +27,12 @@ QCheckBox:disabled color: grey; } -QSpinBox +QSpinBox, QDoubleSpinBox { background-color: @groundBase; } -QSpinBox:disabled +QSpinBox:disabled, QDoubleSpinBox:disabled { background-color: lightGrey; } @@ -61,7 +61,7 @@ QLineEdit QLineEdit:disabled { - background-color: #262424 + background-color: #262424; color: @groundBase; } @@ -119,7 +119,7 @@ QPushButton#updateAvailableButton QScrollBar::handle:vertical { - background-color: #d1d1d1; + background-color: #343232; min-height: 20px; border-radius: 3px; margin-left: 2px; @@ -127,12 +127,12 @@ QScrollBar::handle:vertical QScrollBar::handle:vertical:hover { - background-color: #e3e3e3; + background-color: #3e3c3c; } QScrollBar::handle:vertical:pressed { - background-color: #b1b1b1; + background-color: #474545; } QScrollBar::add-line:vertical @@ -179,19 +179,19 @@ QScrollBar:horizontal QScrollBar::handle:horizontal { - background-color: #d1d1d1; + background-color: #343232; min-width: 20px; border-radius: 2px; } QScrollBar::handle:horizontal:hover { - background-color: #e3e3e3; + background-color: #3e3c3c; } QScrollBar::handle:horizontal:pressed { - background-color: #b1b1b1; + background-color: #474545; } QScrollBar::add-line:horizontal diff --git a/themes/dark/window/general.css b/themes/dark/window/general.css index 45e9bddbd..42a214eb0 100644 --- a/themes/dark/window/general.css +++ b/themes/dark/window/general.css @@ -11,3 +11,19 @@ QWidget#contentWidget background: @groundBase; } +QTabWidget +{ + background-color: @groundBase; +} + +QTabBar::tab:selected +{ + background: #100f0f; + color: @mainText; +} + +QTabBar::tab:!selected +{ + background: #444242; + color: #8e8e8e; +} diff --git a/themes/dark/window/statusPanel.css b/themes/dark/window/statusPanel.css index 4b8ae3d88..bedab4aa2 100644 --- a/themes/dark/window/statusPanel.css +++ b/themes/dark/window/statusPanel.css @@ -79,7 +79,7 @@ QListView { background-color: @themeDark; font: @extraBig; - color: @groundBase; + color: @nameActive; } #statusPanel > #statusHead > #statusLabel diff --git a/themes/default/centralWidget/centralWidget.css b/themes/default/centralWidget/centralWidget.css index a41924745..6aefd33b3 100644 --- a/themes/default/centralWidget/centralWidget.css +++ b/themes/default/centralWidget/centralWidget.css @@ -13,7 +13,7 @@ QTextEdit color: @mainText; } -QSpinBox +QSpinBox, QDoubleSpinBox { color: @mainText; } diff --git a/themes/default/settings/mainContent.css b/themes/default/settings/mainContent.css index 9e81f3618..4541da660 100644 --- a/themes/default/settings/mainContent.css +++ b/themes/default/settings/mainContent.css @@ -27,12 +27,12 @@ QCheckBox:disabled color: grey; } -QSpinBox +QSpinBox, QDoubleSpinBox { background-color: white; } -QSpinBox:disabled +QSpinBox:disabled, QDoubleSpinBox:disabled { background-color: lightGrey; } @@ -64,23 +64,6 @@ QLineEdit:disabled background-color: lightGrey; } -QTabWidget -{ - background-color: white; -} - -QTabBar::tab:selected -{ - background: #2d3136; - color: #f1f1f1; -} - -QTabBar::tab:!selected -{ - background: #d0d1d1; - color: #5e5e5e; -} - QScrollArea { background-color: white; diff --git a/themes/default/window/general.css b/themes/default/window/general.css index 0026ff38e..aafc76c58 100644 --- a/themes/default/window/general.css +++ b/themes/default/window/general.css @@ -5,3 +5,20 @@ QToolTip color: black; background: #ffffdc; } + +QTabWidget +{ + background-color: white; +} + +QTabBar::tab:selected +{ + background: #2d3136; + color: #f1f1f1; +} + +QTabBar::tab:!selected +{ + background: #d0d1d1; + color: #5e5e5e; +}