diff --git a/src/qt/res/css/dark.css b/src/qt/res/css/dark.css index a81ddb079d..a3e1d5f03f 100644 --- a/src/qt/res/css/dark.css +++ b/src/qt/res/css/dark.css @@ -17,21 +17,21 @@ Loaded in GUIUtil::loadStyleSheet() in guitil.cpp. /* do not modify! section updated by update-css-files.py -# Used colors in dark.css for commit 3bebd1a5c +# Used colors in dark.css for commit a50bd2371b +#00000000 #333 -#444 -#555 -#666 -#999 -#aaa -#ccc -#ddd -#1c75bc -#3e3e3e +#00599a +#27507a +#2d2d2e +#323233 +#363637 +#39393b +#4a4a4b #585858 -#616161 -#787878 +#818181 +#c7c7c7 +#f6f6f6 #cc323232 @@ -43,20 +43,16 @@ Common stuff WalletFrame, QDialog { - background-color: #444; -} - -QStatusBar { - background-color: #555; - color: #ccc; + background-color: #323233; } QMessageBox { - background-color: #444; + background-color: #323233; } QWidget { /* override text selection background color for all text widgets */ - selection-background-color: #999; + selection-color: #363637; + selection-background-color: #c7c7c7; } QCheckBox, @@ -64,56 +60,143 @@ QLabel, QListView, QRadioButton, QTreeWidget { /* Base Text Size & Color */ - color: #ccc; + color: #c7c7c7; +} + +QCheckBox:disabled, +QLabel:disabled, +QListView:disabled, +QRadioButton:disabled { + color: #585858; +} + +/****************************************************** +User-input widget style +******************************************************/ + +BitcoinAmountField, +QAbstractSpinBox, +QComboBox, +QPlainTextEdit, +QLineEdit { + background-color: #2d2d2e; + border-color: #00599a; + color: #c7c7c7; +} + +BitcoinAmountField:hover:!focus, +QAbstractSpinBox:hover:!focus, +QComboBox:hover:!focus, +QPlainTextEdit:hover:!focus, +QLineEdit:hover:!focus { + background-color: #2d2d2e; + border-color: #27507a; +} + + +BitcoinAmountField:focus, +QAbstractSpinBox:focus, +QComboBox:checked, +QComboBox:focus, +QPlainTextEdit:focus, +QLineEdit:focus { + background-color: #39393b; + border-color: #27507a; +} + +BitcoinAmountField:disabled, +QAbstractSpinBox:disabled, +QComboBox:disabled, +QPlainTextEdit:disabled, +QLineEdit:disabled { + background-color: #363637; + border-color: #585858; + color: #585858; } /****************************************************** QAbstractSpinBox ******************************************************/ -QAbstractSpinBox, -QAbstractSpinBox::up-button, -QAbstractSpinBox::down-button { - background-color: #333; - border-color: #1c75bc; - color: #aaa; +/***** No dark.css specific coloring here yet *****/ + +/****************************************************** +QCalendarWidget +******************************************************/ + +QCalendarWidget, +#qt_calendar_calendarview, +#qt_calendar_navigationbar, +#qt_calendar_prevmonth, +#qt_calendar_nextmonth, +#qt_calendar_monthbutton, +#qt_calendar_yearbutton { + background-color: #2d2d2e; +} + +#qt_calendar_calendarview, +#qt_calendar_navigationbar, +#qt_calendar_prevmonth, +#qt_calendar_nextmonth, +#qt_calendar_monthbutton, +#qt_calendar_yearbutton { + border-color: #4a4a4b; +} + +#qt_calendar_prevmonth:hover, +#qt_calendar_nextmonth:hover, +#qt_calendar_monthbutton:hover, +#qt_calendar_yearbutton:hover { + background-color: #39393b; +} + +QCalendarWidget QToolButton { + color: #c7c7c7; +} + +QCalendarWidget QWidget { + alternate-background-color: #585858; +} + +QCalendarWidget QAbstractItemView:enabled { + color: #c7c7c7; + selection-background-color: #4a4a4b; + selection-color: #c7c7c7; +} + +QCalendarWidget QAbstractItemView:disabled { + color: #818181; } /****************************************************** QComboBox ******************************************************/ -QComboBox { /* Dropdown Menus */ - background-color: #333; - border-color: #1c75bc; - color: #aaa; -} - -QComboBox:checked { - background-color: #3e3e3e; -} - -QComboBox:editable { - background-color: #1c75bc; - color: #616161; -} - QComboBox QListView { - background-color: #555; - color: #aaa; + background-color: #39393b; } QComboBox::item { - color: #aaa; + color: #c7c7c7; } QComboBox::item:alternate { - background-color: #444; + background-color: #4a4a4b; } QComboBox::item:selected { - background-color: #666; - color: #ccc; + background-color: #585858; + color: #c7c7c7; +} + +/****************************************************** +QGroupBox +******************************************************/ + +QGroupBox { + background-color: #39393b; + color: #c7c7c7; + font-size: 16px; } /****************************************************** @@ -121,42 +204,43 @@ QHeaderView ******************************************************/ QHeaderView::section { /* Table Header Sections */ - background-color: #1c75bc; - border-color: #ccc; - color: #ccc; + background-color: #00599a; + color: #c7c7c7; +} + +QHeaderView::section:hover { /* Table Header Sections */ + background-color: #27507a; + color: #c7c7c7; } /****************************************************** QLineEdit / QValidatedLineEdit / QPlainTextEdit ******************************************************/ -.QValidatedLineEdit, -.QLineEdit, -QPlainTextEdit { /* Text Entry Fields */ - background-color: #333; - border-color: #1c75bc; - color: #aaa; -} - -.QValidatedLineEdit:disabled, -.QLineEdit:disabled { - background-color: #3e3e3e; -} +/***** No dark.css specific coloring here yet *****/ /****************************************************** QMenu ******************************************************/ QMenu { - background-color: #555; + background-color: #39393b; + border-color: #4a4a4b; } QMenu::item { - color: #ccc; + color: #c7c7c7; } -QMenu::item:selected { - background-color: #666; - color: #ddd; +QMenu::item:selected:!disabled { + background-color: #585858; + color: #c7c7c7; +} +QMenu::item:disabled { + color: #585858; +} + +QMenu::separator { + background-color: #585858; } /****************************************************** @@ -164,12 +248,32 @@ QMenuBar ******************************************************/ QMenuBar { - background-color: #333; + background-color: #39393b; + color: #c7c7c7; + border-bottom: 1px solid; + border-color: #4a4a4b; +} + +QMenu::item { + color: #c7c7c7; } QMenuBar::item:selected { - background-color: #333; - color: #1c75bc; + background-color: #585858; + color: #c7c7c7; +} + +/****************************************************** +QProgressBar +******************************************************/ + +QProgressBar { + background-color: #c7c7c7; + color: #00000000; +} + +QProgressBar::chunk { + background-color: #00599a; } /****************************************************** @@ -177,19 +281,99 @@ QProgressDialog ******************************************************/ .QProgressDialog { - background-color: #444; - color: #ccc; + background-color: #4a4a4b; + color: #c7c7c7; +} + +/****************************************************** +QPushButton +******************************************************/ + +QPushButton { + background-color: #00599a; + color: #c7c7c7; +} + +QPushButton:hover { + background-color: #27507a; +} + +QPushButton:focus { + border: none; + outline: none; +} + +QPushButton:pressed { + background-color: #00599a; +} + +QPushButton:disabled { + background-color: #39393b; + border-color: #585858; + color: #585858; } /****************************************************** QPushButton - Special case, light buttons ******************************************************/ +QWidget#AddressBookPage QPushButton#newAddress, +QWidget#AddressBookPage QPushButton#copyAddress, +QWidget#AddressBookPage QPushButton#showAddressQRCode, +QWidget#AddressBookPage QPushButton#deleteAddress, +QDialog#OpenURIDialog QPushButton#selectFileButton, +QDialog#OptionsDialog QPushButton#resetButton, +QDialog#SendCoinsDialog .QPushButton#addButton, +QDialog#SendCoinsDialog .QPushButton#clearButton, +QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#removeRequestButton, +QWidget#ReceiveCoinsDialog .QFrame#frame2 QPushButton#clearButton, +QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#showRequestButton, +QDialog#SignVerifyMessageDialog QPushButton#clearButton_SM, +QDialog#SignVerifyMessageDialog QPushButton#clearButton_VM { + background-color: #c7c7c7; + color: #333; +} + +QWidget#AddressBookPage QPushButton#newAddress:hover, +QWidget#AddressBookPage QPushButton#copyAddress:hover, +QWidget#AddressBookPage QPushButton#showAddressQRCode:hover, +QWidget#AddressBookPage QPushButton#deleteAddress:hover, +QDialog#OpenURIDialog QPushButton#selectFileButton:hover, +QDialog#OptionsDialog QPushButton#resetButton:hover, +QDialog#SendCoinsDialog .QPushButton#addButton:hover, +QDialog#SendCoinsDialog .QPushButton#clearButton:hover, +QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#removeRequestButton:hover, +QWidget#ReceiveCoinsDialog .QFrame#frame2 QPushButton#clearButton:hover, +QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#showRequestButton:hover, +QDialog#SignVerifyMessageDialog QPushButton#clearButton_SM:hover, +QDialog#SignVerifyMessageDialog QPushButton#clearButton_VM:hover { + background-color: #818181; + color: #2d2d2e; +} + +QWidget#AddressBookPage QPushButton#newAddress:pressed, +QWidget#AddressBookPage QPushButton#copyAddress:pressed, +QWidget#AddressBookPage QPushButton#showAddressQRCode:pressed, +QWidget#AddressBookPage QPushButton#deleteAddress:pressed, +QDialog#OpenURIDialog QPushButton#selectFileButton:pressed, +QDialog#OptionsDialog QPushButton#resetButton:pressed, +QDialog#SendCoinsDialog .QPushButton#addButton:pressed, +QDialog#SendCoinsDialog .QPushButton#clearButton:pressed, +QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#removeRequestButton:pressed, +QWidget#ReceiveCoinsDialog .QFrame#frame2 QPushButton#clearButton:pressed, +QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#showRequestButton:pressed, +QDialog#SignVerifyMessageDialog QPushButton#clearButton_SM:pressed, +QDialog#SignVerifyMessageDialog QPushButton#clearButton_VM:pressed { + background-color: #f6f6f6; + color: #585858; +} + QWidget#AddressBookPage QPushButton#newAddress:disabled, QWidget#AddressBookPage QPushButton#copyAddress:disabled, QWidget#AddressBookPage QPushButton#showAddressQRCode:disabled, QWidget#AddressBookPage QPushButton#deleteAddress:disabled, QDialog#OpenURIDialog QPushButton#selectFileButton:disabled, +QDialog#OptionsDialog QPushButton#resetButton:disabled, QDialog#SendCoinsDialog .QPushButton#addButton:disabled, QDialog#SendCoinsDialog .QPushButton#clearButton:disabled, QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#removeRequestButton:disabled, @@ -197,9 +381,9 @@ QWidget#ReceiveCoinsDialog .QFrame#frame2 QPushButton#clearButton:disabled, QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#showRequestButton:disabled, QDialog#SignVerifyMessageDialog QPushButton#clearButton_SM:disabled, QDialog#SignVerifyMessageDialog QPushButton#clearButton_VM:disabled { - background-color: #666; + background-color: #39393b; border-color: #585858; - color: #787878; + color: #585858; } /****************************************************** @@ -221,7 +405,7 @@ QPushButton - Special case, tabbar replacement buttons /* Sign/Verify dialog buttons */ #btnSignMessage, #btnVerifyMessage { - border-color: #205a96; + border-color: #00599a; color: #818181; } @@ -259,7 +443,7 @@ QPushButton - Special case, tabbar replacement buttons /* Sign/Verify dialog buttons */ #btnSignMessage:hover:!checked, #btnVerifyMessage:hover:!checked { - border-color: #205a96; + border-color: #00599a; color: #c7c7c7; } @@ -292,7 +476,7 @@ QRadioButton QScrollArea ******************************************************/ -/***** No light.css specific coloring here yet *****/ +/***** No dark.css specific coloring here yet *****/ /****************************************************** QScrollBar @@ -302,21 +486,49 @@ QScrollBar * it's OS dependent and should be handled via platform specific code. */ +/****************************************************** +QSlider +******************************************************/ + +QSlider::handle:horizontal { + background-color: #00599a; +} +QSlider::handle:horizontal:hover { + background-color: #27507a; +} +QSlider::sub-page:horizontal { + background-color: #c7c7c7; +} +QSlider::add-page:horizontal { + background-color: #c7c7c7; +} + +/****************************************************** +QStatusBar +******************************************************/ + +QStatusBar { + background-color: #323233; + color: #c7c7c7; +} + /****************************************************** QTableView ******************************************************/ .QTableView { /* Table - has to be selected as a class otherwise it throws off QCalendarWidget */ - background-color: #333; + background-color: #2d2d2e; + border-color: #4a4a4b; } QTableView::item { /* Table Item */ - background-color: #333; + background-color: #2d2d2e; + border-color: #4a4a4b; } QTableView::item:selected { /* Table Item Selected */ - background-color: #555; - color: #ccc; + background-color: #39393b; + color: #c7c7c7; } /****************************************************** @@ -324,60 +536,58 @@ QTableWidget ******************************************************/ .QTableWidget { - background-color: #333; + background-color: #4a4a4b; + border-color: #4a4a4b; + color: #c7c7c7; } /****************************************************** QTabWidget ******************************************************/ -.QTabWidget { - border-color: #444; -} - -.QTabWidget::pane { - background-color: #444; - border-color: #333; -} - -.QTabWidget QTabBar::tab { - background-color: #ccc; - border-color: #333; - color: #444; -} - -.QTabWidget QTabBar::tab:first, -.QTabWidget QTabBar::tab:last { - border-color: #333; -} - -.QTabWidget QTabBar::tab:selected, -.QTabWidget QTabBar::tab:hover { - background-color: #555; - color: #ccc; -} - -.QTabWidget .QWidget { - color: #444; -} +/***** No dark.css specific coloring here yet *****/ /****************************************************** QTextEdit ******************************************************/ QTextEdit { - border-color: #333; - background-color: #555; - color: #ccc; + background-color: #2d2d2e; + border-color: #4a4a4b; + color: #c7c7c7; } /****************************************************** QToolBar / QToolButton ******************************************************/ +QToolBar { + background-color: #00599a; +} + +QToolBar > QToolButton { + background-color: #00000000; + color: #c7c7c7; +} + +QToolBar > QToolButton:hover:!checked { + background-color: #27507a; + color: #c7c7c7; +} + QToolBar > QToolButton:checked { - background-color: #444; - color: #ccc; + background-color: #323233; + color: #c7c7c7; +} + +/****************************************************** +QToolTip +******************************************************/ + +QToolTip { + background-color: #2d2d2e; + border-color: #4a4a4b; + color: #c7c7c7; } /****************************************************** @@ -385,7 +595,9 @@ QTreeWidget ******************************************************/ QTreeWidget { - background-color: #333; + alternate-background-color: #2d2d2e; + background-color: #2d2d2e; + border-color: #4a4a4b; } /****************************************************** @@ -414,44 +626,26 @@ AboutDialog AddressBookPage ******************************************************/ -QWidget#AddressBookPage { - background-color: #555; -} - -QWidget#AddressBookPage QTableView::item { - color: #aaa; +AddressBookPage QTableView { + color: #c7c7c7; } /****************************************************** AskPassphraseDialog ******************************************************/ -QDialog#AskPassphraseDialog { - background-color: #555; -} +/***** No dark.css specific coloring here yet *****/ /****************************************************** CoinControlDialog ******************************************************/ -QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::item:selected { /* Coin Control Item (selected) */ - background-color: #666; - color: #ccc; -} - -QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::item:checked { /* Coin Control Item (checked) */ - background-color: #333; - color: #ccc; -} - -QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::branch:selected { /* Coin Control Branch Icon */ - background-color: #666; - color: #ccc; -} - -QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::branch:checked { /* Coin Control Branch Icon */ - background-color: #333; - color: #ccc; +QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::item:selected, +QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::item:checked, +QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::branch:selected, +QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::branch:checked { + background-color: #39393b; + color: #c7c7c7; } /****************************************************** @@ -464,17 +658,16 @@ EditAddressDialog HelpMessageDialog ******************************************************/ -QDialog#HelpMessageDialog QScrollArea * { - background-color: #555; +HelpMessageDialog QWidget#scrollAreaWidgetContents { + background-color: #2d2d2e; + border-color: #4a4a4b; } /****************************************************** MasternodeList ******************************************************/ -QWidget#MasternodeList QTableWidget#tableWidgetMasternodesDIP3 { - color: #aaa; -} +/***** No dark.css specific coloring here yet *****/ /****************************************************** ModalOverlay @@ -482,32 +675,27 @@ ModalOverlay QWidget#bgWidget { /* The frame overlaying the overview-page */ background-color: #cc323232; - color: #616161; + color: #585858; } QWidget#contentWidget { /* The actual content with the text/buttons/etc... */ - background-color: #444; - border-color: #555; + background-color: #4a4a4b; + border-color: #585858; } /****************************************************** OpenURIDialog ******************************************************/ -QDialog#OpenURIDialog { - background-color: #555; -} +/***** No dark.css specific coloring here yet *****/ /****************************************************** OptionsDialog ******************************************************/ -QDialog#OptionsDialog { - background-color: #555; -} - -QDialog#OptionsDialog QGroupBox { - color: #ccc; +QDialog#OptionsDialog #line, +QDialog#OptionsDialog #frame { + border-color: #4a4a4b; } /****************************************************** @@ -532,8 +720,8 @@ OverviewPage RecentTransactions ReceiveCoinsDialog ******************************************************/ -QWidget#ReceiveCoinsDialog .QFrame#frame QTableView#recentRequestsView::item { /* Recent Requests Table */ - color: #aaa; +ReceiveCoinsDialog QTableView { + color: #c7c7c7; } /****************************************************** @@ -541,43 +729,54 @@ RPCConsole ******************************************************/ QWidget#RPCConsole { /* RPC Console Dialog Box */ - background-color: #333; + background-color: #323233; } -QWidget#RPCConsole QWidget#tab_peers QTableView { /* Peers Tables */ - color: #aaa; +RPCConsole QTableView { + color: #c7c7c7; +} + +#rpcAutoCompleter { + background-color: #39393b; + border-color: #4a4a4b; +} + +#rpcAutoCompleter::item { + color: #c7c7c7; +} + +#rpcAutoCompleter::item:selected { + background-color: #4a4a4b; + color: #c7c7c7; } /****************************************************** SendCoinsDialog ******************************************************/ -QDialog#SendCoinsDialog QLabel#labelBalance { - color: #ccc; +QDialog#SendCoinsDialog .QFrame#frameCoinControl, +QDialog#SendCoinsDialog #scrollArea { + border-color: #39393b; } /****************************************************** SendCoinsEntry ******************************************************/ -QStackedWidget#SendCoinsEntry .QFrame#SendCoins > .QLabel { /* Send Coin Entry Labels */ - color: #ccc; -} +/***** No dark.css specific coloring here yet *****/ /****************************************************** SignVerifyMessageDialog ******************************************************/ -QDialog#SignVerifyMessageDialog { - background-color: #555; -} +/***** No dark.css specific coloring here yet *****/ /****************************************************** ShutdownWindow ******************************************************/ QWidget#ShutdownWindow { - background-color: #444; + background-color: #323233; } /****************************************************** diff --git a/src/qt/res/css/general.css b/src/qt/res/css/general.css index a34596c6a7..eaa4ec341d 100644 --- a/src/qt/res/css/general.css +++ b/src/qt/res/css/general.css @@ -31,26 +31,12 @@ in the file. /* do not modify! section updated by update-css-files.py -# Used colors in general.css for commit 3bebd1a5c +# Used colors in general.css for commit a50bd2371b -#333 -#444 -#999 -#aaa -#005e98 -#008de4 +#00000000 #096e03 -#1c75bc -#1f5383 -#616161 -#787878 -#9e9e9e -#d2d2d2 -#eb4034 -#f5f5f5 -#f6f6f6 -#ff4500 -#ffffff +#a84832 +#c79304 */ @@ -68,13 +54,10 @@ QDialog { } .QFrame { - background-color: transparent; + background-color: #00000000; border: 0px; } -QStatusBar { -} - QMessageBox { } @@ -85,80 +68,208 @@ QRadioButton, QTreeWidget { /* Base Text Size & Color */ } +/****************************************************** +User-input widget style +******************************************************/ + +QAbstractSpinBox, +QComboBox, +QPlainTextEdit, +QLineEdit { + border: 1px solid red; + border-color: red; + border-radius: 8px; + padding: 0px 8px 0px 8px; +} + +QAbstractSpinBox, +QComboBox, +QLineEdit { + height: 33px; + min-height: 33px; + max-height: 33px; +} + +QAbstractSpinBox:hover:!focus, +QComboBox:hover:!focus, +QPlainTextEdit:hover:!focus, +QLineEdit:hover:!focus { + border: 2px solid red; +} + +QAbstractSpinBox:hover:!focus, +QPlainTextEdit:hover:!focus, +QLineEdit:hover:!focus { + /* Use the negative padding to counteract the border + QComboBox is excluded here since this would mess + with its dropdown menu */ + padding: -1px 7px -1px 7px; +} + +QAbstractSpinBox:focus, +QComboBox:focus, +QPlainTextEdit:focus, +QLineEdit:focus { + border: 2px solid red; + /* Use the negative padding to counteract the border */ + padding: -1px 7px -1px 7px; +} + +QAbstractSpinBox:disabled, +QComboBox:disabled, +QPlainTextEdit:disabled, +QLineEdit:disabled { +} + /****************************************************** QAbstractSpinBox ******************************************************/ QAbstractSpinBox { - border: 1px solid red; - padding: 0px 5px 0px 5px; - min-height: 31px; } QAbstractSpinBox::up-button { - subcontrol-origin: border; - subcontrol-position: top right; - width: 21px; + background-color: #00000000; + width: 20px; border: 0px; - border-top: 1px solid; - border-right: 1px solid; - padding-right: 1px; - padding-left: 5px; - padding-top: 2px; + padding: 2px 1px 0px 5px; } QAbstractSpinBox::down-button { - subcontrol-origin: border; - subcontrol-position: bottom right; - width: 21px; + background-color: #00000000; + width: 20px; border: 0px; - border-right: 1px solid; - border-bottom: 1px solid; - padding-right: 1px; - padding-left: 5px; - padding-bottom: 2px; + padding: 0px 1px 2px 5px; } QAbstractSpinBox::up-arrow { width: 20px; height: 20px; - image: url(':/images/arrow_up_normal'); + border-image: url(':/images/arrow_up_normal'); } QAbstractSpinBox::up-arrow:hover { width: 20px; height: 20px; - image: url(':/images/arrow_up_hover'); + border-image: url(':/images/arrow_up_hover'); } QAbstractSpinBox::up-arrow:pressed { width: 20px; height: 20px; - image: url(':/images/arrow_up_pressed'); + border-image: url(':/images/arrow_up_pressed'); } QAbstractSpinBox::up-arrow:disabled { width: 20px; height: 20px; - image: url(':/images/arrow_light_up_hover'); + border-image: url(':/images/arrow_light_up_hover'); } QAbstractSpinBox::down-arrow { width: 20px; height: 20px; - image: url(':/images/arrow_down_normal'); + border-image: url(':/images/arrow_down_normal'); } QAbstractSpinBox::down-arrow:hover { width: 20px; height: 20px; - image: url(':/images/arrow_down_hover'); + border-image: url(':/images/arrow_down_hover'); } QAbstractSpinBox::down-arrow:pressed { width: 20px; height: 20px; - image: url(':/images/arrow_down_pressed'); + border-image: url(':/images/arrow_down_pressed'); } QAbstractSpinBox::down-arrow:disabled { width: 20px; height: 20px; - image: url(':/images/arrow_light_down_hover'); + border-image: url(':/images/arrow_light_down_hover'); +} + +/****************************************************** +QCalendarWidget +******************************************************/ + +QCalendarWidget { + background-color: red; + min-height: 250px; +} + +#qt_calendar_calendarview { + border-top: 0px solid red; + border-right: 1px solid red; + border-bottom: 1px solid red; + border-left: 1px solid red; + background-color: red; +} + +#qt_calendar_navigationbar { + background-color: red; +} + +#qt_calendar_navigationbar, +#qt_calendar_prevmonth { + border-left: 1px solid red; +} + +#qt_calendar_navigationbar, +#qt_calendar_nextmonth { + border-right: 1px solid red; +} + +#qt_calendar_navigationbar, +#qt_calendar_prevmonth, +#qt_calendar_nextmonth, +#qt_calendar_monthbutton, +#qt_calendar_yearbutton { + border-top: 1px solid red; +} + +#qt_calendar_prevmonth { + width: 80px; + height: 30px; + qproperty-icon: url(':/images/arrow_left_normal'); + qproperty-iconSize: 23px 23px; +} +#qt_calendar_nextmonth { + width: 80px; + height: 30px; + qproperty-icon: url(':/images/arrow_right_normal'); + qproperty-iconSize: 23px 23px; +} +#qt_calendar_prevmonth:hover, +#qt_calendar_nextmonth:hover, +#qt_calendar_monthbutton:hover, +#qt_calendar_yearbutton:hover { + background-color: red; +} + +QCalendarWidget QToolButton { + width: 80px; + color: red; + background-color: red; +} + +QCalendarWidget QToolButton::menu-indicator { + image: none; +} + +QCalendarWidget QWidget { + alternate-background-color: red; +} + +QCalendarWidget QAbstractItemView { + selection-color: red; +} + +QCalendarWidget QAbstractItemView:enabled +{ + color: red; + background-color: red; + selection-background-color: red; + selection-color: red; +} + +QCalendarWidget QAbstractItemView:disabled { + color: red; } /****************************************************** @@ -166,8 +277,9 @@ QCheckBox ******************************************************/ QCheckBox{ - background-color: transparent; - min-height: 20px; + background-color: #00000000; + min-height: 25px; + margin-right: 10px; } QCheckBox::indicator { width: 15px; @@ -176,40 +288,40 @@ QCheckBox::indicator { } QCheckBox::indicator:unchecked { - image: url(':/images/checkbox_normal'); + border-image: url(':/images/checkbox_normal'); } QCheckBox::indicator:hover:unchecked { - image: url(':/images/checkbox_normal_hover'); + border-image: url(':/images/checkbox_normal_hover'); } QCheckBox::indicator:unchecked:pressed { - image: url(':/images/checkbox_normal_pressed'); + border-image: url(':/images/checkbox_normal_pressed'); } QCheckBox::indicator:unchecked:disabled { - image: url(':/images/checkbox_normal_disabled'); + border-image: url(':/images/checkbox_normal_disabled'); } QCheckBox::indicator:checked { - image: url(':/images/checkbox_checked'); + border-image: url(':/images/checkbox_checked'); } QCheckBox::indicator:checked:hover { - image: url(':/images/checkbox_checked_hover'); + border-image: url(':/images/checkbox_checked_hover'); } QCheckBox::indicator:checked:pressed { - image: url(':/images/checkbox_checked_pressed'); + border-image: url(':/images/checkbox_checked_pressed'); } QCheckBox::indicator:checked:disabled { - image: url(':/images/checkbox_checked_disabled'); + border-image: url(':/images/checkbox_checked_disabled'); } QCheckBox::indicator:indeterminate { - image: url(':/images/checkbox_partly_checked'); + border-image: url(':/images/checkbox_partly_checked'); } QCheckBox::indicator:indeterminate:hover { - image: url(':/images/checkbox_partly_checked_hover'); + border-image: url(':/images/checkbox_partly_checked_hover'); } QCheckBox::indicator:indeterminate:pressed { - image: url(':/images/checkbox_partly_checked_pressed'); + border-image: url(':/images/checkbox_partly_checked_pressed'); } QCheckBox::indicator:indeterminate:disabled { - image: url(':/images/checkbox_partly_checked_disabled'); + border-image: url(':/images/checkbox_partly_checked_disabled'); } /****************************************************** @@ -217,16 +329,13 @@ QComboBox ******************************************************/ QComboBox { /* Dropdown Menus */ - border: 1px solid red; - padding: 0px 5px 0px 5px; - min-height: 31px; } QComboBox:checked { } QComboBox:editable { - border: 0px solid transparent; + border: 0px solid #00000000; } QComboBox::drop-down { @@ -249,14 +358,14 @@ QComboBox::item:alternate { } QComboBox::item:selected { - border: 0px solid transparent; + border: 0px solid #00000000; } QComboBox::indicator { - background-color: transparent; - selection-background-color: transparent; - color: transparent; - selection-color: transparent; + background-color: #00000000; + selection-background-color: #00000000; + color: #00000000; + selection-color: #00000000; } QComboBox::down-arrow { @@ -280,12 +389,37 @@ QComboBox::down-arrow:disabled { border-image: url(':/images/arrow_light_down_hover') 0 0 0 0 stretch stretch; } +/****************************************************** +QDateTimeEdit +******************************************************/ + +QDateTimeEdit::drop-down { + width: 25px; + border: 0px; +} + +/****************************************************** +QGroupBox +******************************************************/ + +QGroupBox { + background-color:red; + color: red; + padding-top: 20px; +} + +QGroupBox:title { + background-color: #00000000; + margin-top: 5px; + margin-left: 7px; +} + /****************************************************** QHeaderView ******************************************************/ QHeaderView { /* Table Header */ - background-color: transparent; + background-color: #00000000; } QHeaderView::section { /* Table Header Sections */ @@ -293,7 +427,6 @@ QHeaderView::section { /* Table Header Sections */ min-height: 25px; outline: 0; border: 0px solid; - border-right: 1px solid; padding-left: 5px; padding-right: 5px; padding-top: 2px; @@ -306,15 +439,7 @@ QHeaderView::section:last { QHeaderView::down-arrow { width: 20px; height: 20px; - image: url(':/images/arrow_light_down_normal'); - subcontrol-position: right center; - subcontrol-origin: margin; - margin-right: 5px; -} -QHeaderView::down-arrow:hover { - width: 20px; - height: 20px; - image: url(':/images/arrow_light_down_hover'); + border-image: url(':/images/arrow_light_down_normal'); subcontrol-position: right center; subcontrol-origin: margin; margin-right: 5px; @@ -323,15 +448,7 @@ QHeaderView::down-arrow:hover { QHeaderView::up-arrow { width: 20px; height: 20px; - image: url(':/images/arrow_light_up_normal'); - subcontrol-position: right center; - subcontrol-origin: margin; - margin-right: 5px; -} -QHeaderView::up-arrow:hover { - width: 20px; - height: 20px; - image: url(':/images/arrow_light_up_hover'); + border-image: url(':/images/arrow_light_up_normal'); subcontrol-position: right center; subcontrol-origin: margin; margin-right: 5px; @@ -340,20 +457,10 @@ QHeaderView::up-arrow:hover { /****************************************************** QLineEdit / QValidatedLineEdit / QPlainTextEdit ******************************************************/ + .QLineEdit, QPlainTextEdit, .QValidatedLineEdit { /* Text Entry Fields */ - border: 1px solid; - min-height: 31px; - outline: 0; - padding: 0px 3px 0px 3px; -} - -.QLineEdit:!focus { -} - -.QLineEdit:disabled, -.QValidatedLineEdit:disabled { } /****************************************************** @@ -361,14 +468,22 @@ QMenu ******************************************************/ QMenu { + border: 1px solid red; + border-radius: 5px; } QMenu::item { + padding: 2px 6px 2px 6px; } QMenu::item:selected { } +QMenu::separator { + height: 1px; + background-color: red; +} + /****************************************************** QMenuBar ******************************************************/ @@ -382,6 +497,24 @@ QMenuBar::item { QMenuBar::item:selected { } +/****************************************************** +QProgressBar +******************************************************/ + +QProgressBar { + background-color: red; + color: #00000000; + border: 0px solid red; + border-radius: 4px; + min-height: 10px; + max-height: 10px; +} + +QProgressBar::chunk { + background-color: red; + border-radius: 3px; +} + /****************************************************** QProgressDialog ******************************************************/ @@ -393,20 +526,21 @@ QProgressDialog QPushButton - General blue buttons ******************************************************/ -QPushButton { /* Global Button Style */ - background-color: #008de4; +QPushButton { + background-color: red; border: 0; border-radius: 8px; - color: #ffffff; - height: 26px; - padding-left: 25px; - padding-right: 25px; - padding-top: 5px; - padding-bottom: 5px; + color: red; + max-height: 26px; + min-height: 26px; + padding-left: 12px; + padding-right: 12px; + padding-top: 4px; + padding-bottom: 4px; } QPushButton:hover { - background-color: #005e98; + background-color: red; } QPushButton:focus { @@ -415,12 +549,11 @@ QPushButton:focus { } QPushButton:pressed { - background-color: #1f5383; - border: 1px solid #444; + background-color: red; } QPushButton:disabled { - background-color: #787878; + background-color: red; } /****************************************************** @@ -432,6 +565,7 @@ QWidget#AddressBookPage QPushButton#copyAddress, QWidget#AddressBookPage QPushButton#showAddressQRCode, QWidget#AddressBookPage QPushButton#deleteAddress, QDialog#OpenURIDialog QPushButton#selectFileButton, +QDialog#OptionsDialog QPushButton#resetButton, QDialog#SendCoinsDialog .QPushButton#addButton, QDialog#SendCoinsDialog .QPushButton#clearButton, QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#removeRequestButton, @@ -439,11 +573,8 @@ QWidget#ReceiveCoinsDialog .QFrame#frame2 QPushButton#clearButton, QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#showRequestButton, QDialog#SignVerifyMessageDialog QPushButton#clearButton_SM, QDialog#SignVerifyMessageDialog QPushButton#clearButton_VM { - background-color: #f6f6f6; - border: 1px solid #d2d2d2; - color: #616161; - padding-left: 10px; - padding-right: 10px; + background-color: red; + color: red; } QWidget#AddressBookPage QPushButton#newAddress:hover, @@ -451,6 +582,7 @@ QWidget#AddressBookPage QPushButton#copyAddress:hover, QWidget#AddressBookPage QPushButton#showAddressQRCode:hover, QWidget#AddressBookPage QPushButton#deleteAddress:hover, QDialog#OpenURIDialog QPushButton#selectFileButton:hover, +QDialog#OptionsDialog QPushButton#resetButton:hover, QDialog#SendCoinsDialog .QPushButton#addButton:hover, QDialog#SendCoinsDialog .QPushButton#clearButton:hover, QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#removeRequestButton:hover, @@ -458,8 +590,9 @@ QWidget#ReceiveCoinsDialog .QFrame#frame2 QPushButton#clearButton:hover, QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#showRequestButton:hover, QDialog#SignVerifyMessageDialog QPushButton#clearButton_SM:hover, QDialog#SignVerifyMessageDialog QPushButton#clearButton_VM:hover { - background-color: #d2d2d2; - color: #333; + background-color: red; + border-color: red; + color: red; } QWidget#AddressBookPage QPushButton#newAddress:pressed, @@ -467,6 +600,7 @@ QWidget#AddressBookPage QPushButton#copyAddress:pressed, QWidget#AddressBookPage QPushButton#showAddressQRCode:pressed, QWidget#AddressBookPage QPushButton#deleteAddress:pressed, QDialog#OpenURIDialog QPushButton#selectFileButton:pressed, +QDialog#OptionsDialog QPushButton#resetButton:pressed, QDialog#SendCoinsDialog .QPushButton#addButton:pressed, QDialog#SendCoinsDialog .QPushButton#clearButton:pressed, QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#removeRequestButton:pressed, @@ -474,7 +608,10 @@ QWidget#ReceiveCoinsDialog .QFrame#frame2 QPushButton#clearButton:pressed, QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#showRequestButton:pressed, QDialog#SignVerifyMessageDialog QPushButton#clearButton_SM:pressed, QDialog#SignVerifyMessageDialog QPushButton#clearButton_VM:pressed { - border: 1px solid #9e9e9e; + border: 0; + background-color: red; + border-color: red; + color: red; } QWidget#AddressBookPage QPushButton#newAddress:disabled, @@ -482,6 +619,7 @@ QWidget#AddressBookPage QPushButton#copyAddress:disabled, QWidget#AddressBookPage QPushButton#showAddressQRCode:disabled, QWidget#AddressBookPage QPushButton#deleteAddress:disabled, QDialog#OpenURIDialog QPushButton#selectFileButton:disabled, +QDialog#OptionsDialog QPushButton#resetButton:disabled, QDialog#SendCoinsDialog .QPushButton#addButton:disabled, QDialog#SendCoinsDialog .QPushButton#clearButton:disabled, QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#removeRequestButton:disabled, @@ -490,6 +628,9 @@ QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#showRequestButton:disabled, QDialog#SignVerifyMessageDialog QPushButton#clearButton_SM:disabled, QDialog#SignVerifyMessageDialog QPushButton#clearButton_VM:disabled { border: 1px solid; + background-color: red; + border-color: red; + color: red; } /****************************************************** @@ -609,7 +750,7 @@ QRadioButton ******************************************************/ QRadioButton { - background-color: transparent; + background-color: #00000000; } QRadioButton::indicator { width: 15px; @@ -617,28 +758,28 @@ QRadioButton::indicator { margin-right: 5px; } QRadioButton::indicator:unchecked { - image: url(':/images/radio_normal'); + border-image: url(':/images/radio_normal'); } QRadioButton::indicator:hover:unchecked { - image: url(':/images/radio_normal_hover'); + border-image: url(':/images/radio_normal_hover'); } QRadioButton::indicator:unchecked:pressed { - image: url(':/images/radio_normal_pressed'); + border-image: url(':/images/radio_normal_pressed'); } QRadioButton::indicator:checked { - image: url(':/images/radio_checked'); + border-image: url(':/images/radio_checked'); } QRadioButton::indicator:checked:hover { - image: url(':/images/radio_checked_hover'); + border-image: url(':/images/radio_checked_hover'); } QRadioButton::indicator:checked:pressed { - image: url(':/images/radio_checked_pressed'); + border-image: url(':/images/radio_checked_pressed'); } QRadioButton::indicator:checked:disabled { - image: url(':/images/radio_checked_disabled'); + border-image: url(':/images/radio_checked_disabled'); } QRadioButton::indicator:unchecked:disabled { - image: url(':/images/radio_normal_disabled'); + border-image: url(':/images/radio_normal_disabled'); } /****************************************************** @@ -646,7 +787,7 @@ QScrollArea ******************************************************/ .QScrollArea { - background-color: transparent; + background-color: #00000000; border: 0px; } @@ -658,16 +799,67 @@ QScrollBar * it's OS dependent and should be handled via platform specific code. */ +/****************************************************** +QSlider +******************************************************/ + +QSlider { + min-height: 30px; +} + +QSlider::groove:horizontal { + background: #00000000; + height: 12px; + border-radius: 4px; +} + +QSlider::add-page:horizontal, +QSlider::sub-page:horizontal { + height: 12px; + border-radius: 4px; +} + +QSlider::handle:horizontal { +margin-left: 5px; +margin-right: 5px; +background-color: red; +width: 23px; +margin-top: -5px; +margin-bottom: -5px; +border-radius: 11px; +} + +/****************************************************** +QStatusBar +******************************************************/ + +QStatusBar { + padding-left: 10px; + padding-right: 10px; + min-height: 30px; +} + +QStatusBar QLabel { + margin-right: 5px; +} + +QStatusBar #lblStatusBarProgress { + margin-left: 5px; + margin-right: 5px; +} + /****************************************************** QTableView ******************************************************/ .QTableView { /* Table - has to be selected as a class otherwise it throws off QCalendarWidget */ - border: 0px; - background-color: transparent; + border: 1px solid red; + background-color: #00000000; + qproperty-showGrid: false; } QTableView::item { /* Table Item */ + border-bottom: 1px solid; } QTableView::item:selected { /* Table Item Selected */ @@ -678,43 +870,15 @@ QTableWidget ******************************************************/ .QTableWidget { - border: 0px; + border: 1px solid red; + qproperty-showGrid: false; } /****************************************************** QTabWidget ******************************************************/ -.QTabWidget { - border-bottom: 1px solid; -} - -.QTabWidget::pane { - border: 1px solid; -} - -.QTabWidget QTabBar::tab { - padding-left: 10px; - padding-right: 10px; - padding-top: 5px; - padding-bottom: 5px; - border-top: 1px solid; -} - -.QTabWidget QTabBar::tab:first { - border-left: 1px solid; -} - -.QTabWidget QTabBar::tab:last { - border-right: 1px solid; -} - -.QTabWidget QTabBar::tab:selected, -.QTabWidget QTabBar::tab:hover { -} - -.QTabWidget .QWidget { -} +/***** No general.css specific coloring here yet *****/ /****************************************************** QTextEdit @@ -729,7 +893,7 @@ QToolBar / QToolButton ******************************************************/ QToolBar { - background-color: #008de4; + background-color: red; border: none; width: 100%; padding: 0; @@ -740,24 +904,22 @@ QToolBar { } QToolBar > QToolButton { - background-color: transparent; + background-color: #00000000; border: none; min-height: 50px; max-height: 50px; - letter-spacing: 3px; - color: #ffffff; width: 100%; padding: 1px; text-align: center; } QToolBar > QToolButton:hover:!checked { - background-color: #005e98; - color: #DCDCDC; + background-color: red; + color: red; } QToolBar > QToolButton:disabled { - color: #444; + color: red; } QToolBar QLabel#lblToolbarLogo { @@ -766,31 +928,41 @@ QToolBar QLabel#lblToolbarLogo { height: 2.5em; } +/****************************************************** +QToolTip +******************************************************/ + +QToolTip { + border: 1px solid red; + border-radius: 2px; + background-color: #00000000; + padding: 1px; +} + /****************************************************** QTreeWidget ******************************************************/ QTreeWidget { - background-color: transparent; - alternate-background-color: transparent; - outline: 0; - border: 0px; + background-color: red; + alternate-background-color: red; + border: 1px solid red; } QTreeWidget::branch::closed:has-children { padding: 0 -2px 0 2px; - image: url(':/images/arrow_right_normal'); + border-image: url(':/images/arrow_right_normal'); } QTreeWidget::branch::closed:has-children:hover { padding: 0 -2px 0 2px; - image: url(':/images/arrow_right_hover'); + border-image: url(':/images/arrow_right_hover'); } QTreeWidget::branch::open { padding: 0 -2px 0 2px; - image: url(':/images/arrow_down_normal'); + border-image: url(':/images/arrow_down_normal'); } QTreeWidget::branch::open:hover { padding: 0 -2px 0 2px; - image: url(':/images/arrow_down_hover'); + border-image: url(':/images/arrow_down_hover'); } QTreeWidget::indicator { width: 15px; @@ -798,40 +970,40 @@ QTreeWidget::indicator { margin-right: 5px; } QTreeWidget::indicator:unchecked { - image: url(':/images/checkbox_normal'); + border-image: url(':/images/checkbox_normal'); } QTreeWidget::indicator:hover:unchecked { - image: url(':/images/checkbox_normal_hover'); + border-image: url(':/images/checkbox_normal_hover'); } QTreeWidget::indicator:unchecked:pressed { - image: url(':/images/checkbox_normal_pressed'); + border-image: url(':/images/checkbox_normal_pressed'); } QTreeWidget::indicator:unchecked:disabled { - image: url(':/images/checkbox_normal_disabled'); + border-image: url(':/images/checkbox_normal_disabled'); } QTreeWidget::indicator:checked { - image: url(':/images/checkbox_checked'); + border-image: url(':/images/checkbox_checked'); } QTreeWidget::indicator:checked:hover { - image: url(':/images/checkbox_checked_hover'); + border-image: url(':/images/checkbox_checked_hover'); } QTreeWidget::indicator:checked:pressed { - image: url(':/images/checkbox_checked_pressed'); + border-image: url(':/images/checkbox_checked_pressed'); } QTreeWidget::indicator:checked:disabled { - image: url(':/images/checkbox_checked_disabled'); + border-image: url(':/images/checkbox_checked_disabled'); } QTreeWidget::indicator:indeterminate { - image: url(':/images/checkbox_partly_checked'); + border-image: url(':/images/checkbox_partly_checked'); } QTreeWidget::indicator:indeterminate:hover { - image: url(':/images/checkbox_partly_checked_hover'); + border-image: url(':/images/checkbox_partly_checked_hover'); } QTreeWidget::indicator:indeterminate:pressed { - image: url(':/images/checkbox_partly_checked_pressed'); + border-image: url(':/images/checkbox_partly_checked_pressed'); } QTreeWidget::indicator:indeterminate:disabled { - image: url(':/images/checkbox_partly_checked_disabled'); + border-image: url(':/images/checkbox_partly_checked_disabled'); } /****************************************************** @@ -858,7 +1030,7 @@ AboutDialog QDialog#AboutDialog QLabel#label, QDialog#AboutDialog QLabel#copyrightLabel, QDialog#AboutDialog QLabel#label_2 { /* About Dash Contents */ - margin-left: auto10px; + margin-left: 10px; } QDialog#AboutDialog QLabel#label_2 { /* Margin for About Dash text */ @@ -894,6 +1066,18 @@ QDialog#AskPassphraseDialog QLabel#passLabel3 { min-height: 33px; /* base width of 25px for QLineEdit, plus padding and border */ } +/****************************************************** +BitcoinAmountField +******************************************************/ + +BitcoinAmountField{ + /* This is a hacky way to make sure BitcoinAmountField's + * shows completely. + * TODO: Fix the issue properly. + */ + margin-bottom: 5px; +} + /****************************************************** CoinControlDialog ******************************************************/ @@ -949,21 +1133,15 @@ QDialog#CoinControlDialog .QLabel#labelCoinControlChange { /* Coin Control Chang } QDialog#CoinControlDialog .QFrame#frame .QPushButton#pushButtonSelectAll { /* (un)select all button */ - padding-left: 10px; - padding-right: 10px; - min-height: 25px; } QDialog#CoinControlDialog .QFrame#frame .QPushButton#pushButtonToggleLock { /* Toggle lock state button */ - padding-left: 10px; - padding-right: 10px; - min-height: 25px; } QDialog#CoinControlDialog .QDialogButtonBox#buttonBox QPushButton { /* Coin Control 'OK' button */ } QDialog#CoinControlDialog QHeaderView::section:first { /* Bug Fix: the number 1 displays in this table for some reason... */ - color: transparent; + color: #00000000; } QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::item { @@ -1003,13 +1181,20 @@ QDialog#EditAddressDialog QLabel { HelpMessageDialog ******************************************************/ -QDialog#HelpMessageDialog { +HelpMessageDialog QWidget#scrollAreaWidgetContents { + border: 1px solid red; } -QDialog#HelpMessageDialog QScrollArea { +/****************************************************** +Intro +******************************************************/ + +Intro QRadioButton#dataDirCustom { + margin-top: 10px; } -QDialog#HelpMessageDialog QTextEdit { +Intro QPushButton#ellipsisButton { + margin-left: 10px; } /****************************************************** @@ -1031,7 +1216,7 @@ QWidget#bgWidget { /* The frame overlaying the overview-page */ } QWidget#bgWidget .QPushButton#warningIcon { - background-color: transparent; + background-color: #00000000; width: 64px; height: 64px; padding: 5px; @@ -1085,11 +1270,19 @@ QDialog#OptionsDialog QWidget#tabDisplay QValueComboBox { } QDialog#OptionsDialog QLabel#label_3 { /* Translations Missing? Label */ - qproperty-alignment: 'AlignVCenter | AlignCenter'; - padding-bottom: 8px; + qproperty-alignment: 'AlignVCenter | AlignLeft'; + padding-left: 8px; + min-height: 60px; + color: #c79304; +} + +QDialog#OptionsDialog #line, +QDialog#OptionsDialog #frame { + border-top: 1px solid red; } QDialog#OptionsDialog QGroupBox { + margin-top: 10px; } /****************************************************** @@ -1102,27 +1295,25 @@ QWidget .QFrame#frame { /* Wallet Balance */ QWidget .QFrame#frame > .QLabel { min-width: 100px; - min-height: 30px; + min-height: 25px; } QWidget .QFrame#frame .QLabel#label_5 { /* Wallet Label */ min-width: 180px; - color: #008de4; margin-top: 0; margin-right: 5px; padding-right: 5px; - min-height: 30px; } QWidget .QFrame#frame .QLabel#labelWalletStatus { /* Wallet Sync Status */ qproperty-alignment: 'AlignVCenter | AlignLeft'; - color: #ff4500; + color: #a84832; margin-left: 3px; } QWidget .QFrame#frame .QLabel#labelSpendable { /* Spendable Header */ qproperty-alignment: 'AlignVCenter | AlignLeft'; - margin-left: 18px; + margin-left: 15px; } QWidget .QFrame#frame .QLabel#labelWatchonly { /* Watch-only Header */ @@ -1135,17 +1326,17 @@ QWidget .QFrame#frame .QLabel#labelBalanceText { /* Available Balance Label */ min-width: 100px; margin-right: 5px; padding-right: 5px; - min-height: 35px; } QWidget .QFrame#frame .QLabel#labelBalance { /* Available Balance */ qproperty-alignment: 'AlignVCenter | AlignLeft'; - color: #008de4; + margin-bottom: -1px; margin-left: 0px; } QWidget .QFrame#frame .QLabel#labelWatchAvailable { /* Watch-only Balance */ qproperty-alignment: 'AlignVCenter | AlignLeft'; + margin-bottom: -2px; margin-left: 16px; } @@ -1158,11 +1349,13 @@ QWidget .QFrame#frame .QLabel#labelPendingText { /* Pending Balance Label */ QWidget .QFrame#frame .QLabel#labelUnconfirmed { /* Pending Balance */ qproperty-alignment: 'AlignVCenter | AlignLeft'; + margin-bottom: -2px; margin-left: 0px; } QWidget .QFrame#frame .QLabel#labelWatchPending { /* Watch-only Pending Balance */ qproperty-alignment: 'AlignVCenter | AlignLeft'; + margin-bottom: -2px; margin-left: 16px; } @@ -1175,11 +1368,13 @@ QWidget .QFrame#frame .QLabel#labelImmatureText { /* Immature Balance Label */ QWidget .QFrame#frame .QLabel#labelImmature { /* Immature Balance */ qproperty-alignment: 'AlignVCenter | AlignLeft'; + margin-bottom: -2px; margin-left: 0px; } QWidget .QFrame#frame .QLabel#labelWatchImmature { /* Watch-only Immature Balance */ qproperty-alignment: 'AlignVCenter | AlignLeft'; + margin-bottom: -2px; margin-left: 16px; } @@ -1192,11 +1387,13 @@ QWidget .QFrame#frame .QLabel#labelTotalText { /* Total Balance Label */ QWidget .QFrame#frame .QLabel#labelTotal { /* Total Balance */ qproperty-alignment: 'AlignVCenter | AlignLeft'; + margin-bottom: -2px; margin-left: 0px; } QWidget .QFrame#frame .QLabel#labelWatchTotal { /* Watch-only Total Balance */ qproperty-alignment: 'AlignVCenter | AlignLeft'; + margin-bottom: -2px; margin-left: 16px; } @@ -1205,106 +1402,84 @@ OverviewPage PrivateSend ******************************************************/ QWidget .QFrame#framePrivateSend { /* PrivateSend Widget */ - background-color: transparent; + background-color: #00000000; max-width: 451px; min-width: 451px; max-height: 350px; } -QWidget .QFrame#framePrivateSend .QWidget#layoutWidgetPrivateSendHeader { /* PrivateSend Header */ - background-color: transparent; - max-width: 421px; - min-width: 421px; +QWidget .QFrame#framePrivateSend > .QLabel { + min-width: 175px; + min-height: 26px; } QWidget .QFrame#framePrivateSend .QLabel#labelPrivateSendHeader { /* PrivateSend Header */ qproperty-alignment: 'AlignVCenter | AlignLeft'; - min-width: 180px; - color: #008de4; - margin-top: 0; - margin-right: 5px; - padding-right: 5px; - min-height: 30px; + margin-right: 10px; } QWidget .QFrame#framePrivateSend .QLabel#labelPrivateSendSyncStatus { /* PrivateSend Sync Status */ qproperty-alignment: 'AlignVCenter | AlignLeft'; - color: #ff4500; + color: #a84832; margin-left: 2px; padding-right: 5px; } -QWidget .QFrame#framePrivateSend #privateSendFormLayoutWidget { - max-width: 451px; - max-height: 175px; +QWidget .QFrame#framePrivateSend .QLabel#labelPrivateSendEnabledText { /* PrivateSend Enabled Status Label */ + qproperty-alignment: 'AlignVCenter | AlignRight'; + margin-right: 10px; } -QWidget .QFrame#framePrivateSend #privateSendFormLayoutWidget > .QLabel { - min-width: 175px; - min-height: 25px; +QWidget .QFrame#framePrivateSend .QLabel#labelPrivateSendEnabled { /* PrivateSend Enabled Status */ + } -QWidget .QFrame#framePrivateSend #privateSendFormLayoutWidget .QLabel#labelPrivateSendEnabledText { /* PrivateSend Enabled Status Label */ +QWidget .QFrame#framePrivateSend .QLabel#labelCompletitionText { /* PrivateSend Completion Label */ + qproperty-alignment: 'AlignVCenter | AlignRight'; + margin-right: 10px; +} + +QWidget .QFrame#framePrivateSend QProgressBar#privateSendProgress { /* PrivateSend Completion */ + min-height: 13px; + max-height: 13px; + border-radius: 5px; + margin-top: 7px; +} + +QWidget .QFrame#framePrivateSend QProgressBar#privateSendProgress:chunk { + border-radius: 5px; +} + +QWidget .QFrame#framePrivateSend .QLabel#labelAnonymizedText { /* PrivateSend Balance Label */ qproperty-alignment: 'AlignVCenter | AlignRight'; min-width: 160px; margin-right: 5px; padding-right: 5px; } -QWidget .QFrame#framePrivateSend #privateSendFormLayoutWidget .QLabel#labelPrivateSendEnabled { /* PrivateSend Enabled Status */ - +QWidget .QFrame#framePrivateSend .QLabel#labelAnonymized { /* PrivateSend Balance */ + margin-bottom: -2px; } -QWidget .QFrame#framePrivateSend #privateSendFormLayoutWidget .QLabel#labelCompletitionText { /* PrivateSend Completion Label */ +QWidget .QFrame#framePrivateSend .QLabel#labelAmountAndRoundsText { /* PrivateSend Amount and Rounds Label */ qproperty-alignment: 'AlignVCenter | AlignRight'; min-width: 160px; margin-right: 5px; padding-right: 5px; } -QWidget .QFrame#framePrivateSend #privateSendFormLayoutWidget .QProgressBar#privateSendProgress { /* PrivateSend Completion */ - border: 1px solid #aaa; - border-radius: 1px; - margin-right: 43px; - text-align: right; - color: #aaa; +QWidget .QFrame#framePrivateSend .QLabel#labelAmountRounds { /* PrivateSend Amount and Rounds */ + } -QWidget .QFrame#framePrivateSend #privateSendFormLayoutWidget .QProgressBar#privateSendProgress::chunk { - background-color: #008de4; - width: 1px; -} - -QWidget .QFrame#framePrivateSend #privateSendFormLayoutWidget .QLabel#labelAnonymizedText { /* PrivateSend Balance Label */ +QWidget .QFrame#framePrivateSend .QLabel#labelSubmittedDenomText { /* PrivateSend Submitted Denom Label */ qproperty-alignment: 'AlignVCenter | AlignRight'; min-width: 160px; margin-right: 5px; padding-right: 5px; } -QWidget .QFrame#framePrivateSend #privateSendFormLayoutWidget .QLabel#labelAnonymized { /* PrivateSend Balance */ - -} - -QWidget .QFrame#framePrivateSend #privateSendFormLayoutWidget .QLabel#labelAmountAndRoundsText { /* PrivateSend Amount and Rounds Label */ - qproperty-alignment: 'AlignVCenter | AlignRight'; - min-width: 160px; - margin-right: 5px; - padding-right: 5px; -} - -QWidget .QFrame#framePrivateSend #privateSendFormLayoutWidget .QLabel#labelAmountRounds { /* PrivateSend Amount and Rounds */ - -} - -QWidget .QFrame#framePrivateSend #privateSendFormLayoutWidget .QLabel#labelSubmittedDenomText { /* PrivateSend Submitted Denom Label */ - qproperty-alignment: 'AlignVCenter | AlignRight'; - min-width: 160px; - margin-right: 5px; - padding-right: 5px; -} - -QWidget .QFrame#framePrivateSend #privateSendFormLayoutWidget .QLabel#labelSubmittedDenom { /* PrivateSend Submitted Denom */ +QWidget .QFrame#framePrivateSend .QLabel#labelSubmittedDenom { /* PrivateSend Submitted Denom */ } @@ -1313,22 +1488,13 @@ QWidget .QFrame#framePrivateSend .QWidget#layoutWidgetLastMessageAndButtons { } QWidget .QFrame#framePrivateSend .QLabel#labelPrivateSendLastMessage { /* PrivateSend Status Notifications */ - qproperty-alignment: 'AlignVCenter | AlignCenter'; + qproperty-alignment: 'AlignVCenter | AlignLeft'; min-width: 288px; - min-height: 43px; -} - -QWidget .QFrame#framePrivateSend QPushButton:focus { - border: none; - outline: none; + min-height: 50px; } QWidget .QFrame#framePrivateSend .QPushButton#togglePrivateSend { /* Start PrivateSend Mixing */ - min-height: 40px; - padding-left: 10px; - padding-right: 10px; - padding-top: 5px; - padding-bottom: 6px; + margin-top: 5px; } QWidget .QFrame#framePrivateSend .QPushButton#togglePrivateSend:hover { @@ -1348,8 +1514,7 @@ QWidget .QFrame#frame_2 { /* Transactions Widget */ QWidget .QFrame#frame_2 .QLabel#label_4 { /* Recent Transactions Label */ min-width: 180px; - color: #008de4; - margin-left: 67px; + margin-left: 18px; margin-top: 0; margin-right: 5px; padding-right: 5px; @@ -1358,7 +1523,7 @@ QWidget .QFrame#frame_2 .QLabel#label_4 { /* Recent Transactions Label */ QWidget .QFrame#frame_2 .QLabel#labelTransactionsStatus { /* Recent Transactions Sync Status */ qproperty-alignment: 'AlignBottom | AlignRight'; - color: #ff4500; + color: #a84832; min-width: 93px; margin-top: 0; margin-left: 16px; @@ -1376,19 +1541,28 @@ QWidget .QFrame#frame_2 QListView { /* Transaction List */ ReceiveCoinsDialog ******************************************************/ +QWidget#ReceiveCoinsDialog .QFrame { +} QWidget#ReceiveCoinsDialog .QFrame#frame2 .QLabel#label, QWidget#ReceiveCoinsDialog .QFrame#frame2 .QLabel#label_2, QWidget#ReceiveCoinsDialog .QFrame#frame2 .QLabel#label_3, QWidget#ReceiveCoinsDialog .QFrame#frame .QLabel#label_6 { /* Label Label */ - min-width: 102px; - padding-right: 5px; + min-width: 0px; } QWidget#ReceiveCoinsDialog .QFrame#frame QTableView#recentRequestsView::item { /* Recent Requests Table */ } +/****************************************************** +ReceiveRequestDialog +******************************************************/ + +ReceiveRequestDialog #outUri { + margin-top: 20px; +} + /****************************************************** RPCConsole ******************************************************/ @@ -1396,15 +1570,28 @@ RPCConsole QWidget#RPCConsole { /* RPC Console Dialog Box */ } -QWidget#RPCConsole QWidget#tab_info QLabel#label_11, -QWidget#RPCConsole QWidget#tab_info QLabel#label_10 { /* Margin between Network and Block Chain headers */ - qproperty-alignment: 'AlignBottom'; - min-height: 25px; - min-width: 180px; +QWidget#RPCConsole QLabel#label_9, +QWidget#RPCConsole QLabel#labelNetwork, +QWidget#RPCConsole QLabel#label_10, +QWidget#RPCConsole QLabel#labelMempoolTitle, +QWidget#RPCConsole QLabel#label_repair_header, +QWidget#RPCConsole QLabel#peerHeading, +QWidget#RPCConsole QLabel#banHeading { } -QWidget#RPCConsole QWidget#tab_peers QLabel#peerHeading { /* Peers Info Header */ - color: #1c75bc; +QWidget#RPCConsole QLabel#labelNetwork, +QWidget#RPCConsole QLabel#label_10, +QWidget#RPCConsole QLabel#labelMempoolTitle { /* Margin between Network and Block Chain headers */ + qproperty-alignment: 'AlignLeft | AlignBottom'; + min-height: 25px; + margin-top: 10px; + margin-left: -4px; +} + +QWidget#RPCConsole QLabel#banHeading { /* Peers Info Header */ + min-height: 30px; + margin-left: -3px; + margin-bottom: 15px; } QWidget#RPCConsole QPushButton#openDebugLogfileButton { @@ -1412,23 +1599,23 @@ QWidget#RPCConsole QPushButton#openDebugLogfileButton { } QWidget#RPCConsole QTextEdit#messagesWidget { /* Console Messages Window */ - background-color: transparent; - border: 0; + padding: 10px; } QWidget#RPCConsole QLineEdit#lineEdit { /* Console Input */ + margin-top: 10px; } QWidget#RPCConsole QPushButton#clearButton, QWidget#RPCConsole QPushButton#fontSmallerButton, QWidget#RPCConsole QPushButton#fontBiggerButton { /* Console Font and Clear Buttons */ - background-color: transparent; + background-color: #00000000; padding-left: 10px; padding-right: 10px; } QWidget#RPCConsole QPushButton#promptIcon { /* Prompt Icon */ - background-color: transparent; + background-color: #00000000; } QWidget#RPCConsole .QGroupBox #line { /* Network In Line */ @@ -1436,25 +1623,41 @@ QWidget#RPCConsole .QGroupBox #line { /* Network In Line */ } QWidget#RPCConsole .QGroupBox #line_2 { /* Network Out Line */ - background-color: #eb4034; + background-color: #a84832; } +#rpcAutoCompleter { + border: 1px solid red; + background-color: red; +} + +#rpcAutoCompleter QListView { + background-color: red; +} + +#rpcAutoCompleter::item { + background-color: #00000000; + color: red; +} + +#rpcAutoCompleter::item:selected { + color: red; +} + + /****************************************************** SendCoinsDialog ******************************************************/ -QDialog#SendCoinsDialog .QFrame#frameCoinControl { /* Coin Control Section */ - +QDialog#SendCoinsDialog .QFrame#frameCoinControl, +QDialog#SendCoinsDialog #scrollArea { /* Coin Control Section */ + border-bottom: 1px solid red; } QDialog#SendCoinsDialog .QFrame#frameCoinControl .QPushButton#pushButtonCoinControl { /* Coin Control Inputs Button */ - padding-left: 10px; - padding-right: 10px; - min-height: 25px; } QDialog#SendCoinsDialog .QFrame#frameCoinControl .QLabel#labelCoinControlFeatures { /* Coin Control Header */ - color: #999; } QDialog#SendCoinsDialog .QFrame#frameCoinControl .QWidget#widgetCoinControl { /* Coin Control Inputs */ @@ -1468,29 +1671,30 @@ QDialog#SendCoinsDialog .QFrame#frameCoinControl .QValidatedLineEdit#lineEditCoi } QDialog#SendCoinsDialog .QFrame#frameCoinControl .QLabel#labelCoinControlChangeLabel { /* Custom Change Address Validation Label */ - qproperty-margin: -6; margin-right: 112px; } QDialog#SendCoinsDialog .QFrame#frameCoinControl .QLabel#labelCoinControlInsuffFunds { /* Insufficient Funds Label */ - color: red; + color: #a84832; } QDialog#SendCoinsDialog .QScrollArea#scrollArea .QWidget#scrollAreaWidgetContents { /* Send To Widget */ - background-color: transparent; + background-color: #00000000; } -/* This QLabel uses name = "label" which conflicts with Address Book -> New Address */ -/* To maximize backwards compatibility this formatting has been removed */ - -QDialog#SendCoinsDialog QLabel#label { - min-height: 27px; +QDialog#SendCoinsDialog QLabel#labelBalanceText, +QDialog#SendCoinsDialog QLabel#labelBalance { + qproperty-alignment: 'AlignLeading | AlignLeft'; + min-height: 20px; + max-height: 20px; } QDialog#SendCoinsDialog QLabel#labelBalance { - margin-left: 0px; - padding-left: 0px; - min-height: 27px; + margin-right: 10px; +} + +QDialog#SendCoinsDialog QPushButton#sendButton { + margin-left:10px; } #checkboxSubtractFeeFromAmount { @@ -1502,7 +1706,7 @@ SendCoinsEntry ******************************************************/ QStackedWidget#SendCoinsEntry .QFrame#SendCoins > .QLabel { /* Send Coin Entry Labels */ - background-color: transparent; + background-color: #00000000; min-width: 50px; min-height: 25px; margin-right: 5px; @@ -1516,24 +1720,21 @@ QStackedWidget#SendCoinsEntry .QValidatedLineEdit#payTo { /* Pay To Input Field } QStackedWidget#SendCoinsEntry .QToolButton { /* General Settings for Pay To Icons */ - background-color: transparent; - padding-left: 5px; - padding-right: 5px; + background-color: #00000000; + margin-left: 5px; + margin-right: 5px; border: 0; - outline: 0; } QStackedWidget#SendCoinsEntry .QToolButton#addressBookButton { /* Address Book Button */ - padding-left: 10px; + margin-left: 10px; } -QStackedWidget#SendCoinsEntry .QToolButton#addressBookButton { -} - -QStackedWidget#SendCoinsEntry .QToolButton#pasteButton { -} - -QStackedWidget#SendCoinsEntry .QToolButton#deleteButton { +QStackedWidget#SendCoinsEntry .QToolButton#addressBookButton, +QStackedWidget#SendCoinsEntry .QToolButton#pasteButton, +QStackedWidget#SendCoinsEntry .QToolButton#deleteButton, +QStackedWidget#SendCoinsEntry .QToolButton#deleteButton_is { + qproperty-iconSize: 28px 28px; } QStackedWidget#SendCoinsEntry .QLineEdit#addAsLabel { /* Pay To Input Field */ @@ -1547,34 +1748,57 @@ QDialog#SignVerifyMessageDialog { } QDialog#SignVerifyMessageDialog QPushButton#addressBookButton_SM { /* Address Book Button */ - background-color: transparent; - padding-left: 10px; - padding-right: 10px; + background-color: #00000000; } QDialog#SignVerifyMessageDialog QPlainTextEdit { /* Message Signing Text */ - min-height: 50px; + min-height: 80px; +} + +QDialog#SignVerifyMessageDialog QLabel#infoLabel_SM, +QDialog#SignVerifyMessageDialog QLabel#infoLabel_VM { + min-height: 60px; + min-width: 200px; +} + +QDialog#SignVerifyMessageDialog QPlainTextEdit#messageIn_SM, +QDialog#SignVerifyMessageDialog QPlainTextEdit#messageIn_VM { + padding: 8px; +} + +QDialog#SignVerifyMessageDialog QLabel#signatureLabel_SM { } QDialog#SignVerifyMessageDialog QPushButton#pasteButton_SM { /* Paste Button */ - background-color: transparent; - padding-left: 15px; + background-color: #00000000; } -QDialog#SignVerifyMessageDialog QLineEdit:!focus { /* Font Hack */ +QDialog#SignVerifyMessageDialog QLineEdit#signatureOut_SM, +QDialog#SignVerifyMessageDialog QLineEdit#signatureIn_VM { } QDialog#SignVerifyMessageDialog QPushButton#copySignatureButton_SM { /* Copy Button */ - background-color: transparent; - padding-left: 10px; - padding-right: 10px; + background-color: #00000000; } QDialog#SignVerifyMessageDialog QPushButton#addressBookButton_VM { /* Verify Message - Address Book Button */ - background-color: transparent; - border: 0; - padding-left: 10px; - padding-right: 10px; + background-color: #00000000; + border: 0px solid red; +} + +QDialog#SignVerifyMessageDialog QPushButton#addressBookButton_VM, +QDialog#SignVerifyMessageDialog QPushButton#addressBookButton_SM, +QDialog#SignVerifyMessageDialog QPushButton#copySignatureButton_SM, +QDialog#SignVerifyMessageDialog QPushButton#pasteButton_SM { + qproperty-iconSize: 28px 28px; + padding-left: -1px; + padding-right: -1px; +} + +QDialog#SignVerifyMessageDialog QPushButton#addressBookButton_VM, +QDialog#SignVerifyMessageDialog QPushButton#addressBookButton_SM, +QDialog#SignVerifyMessageDialog QPushButton#copySignatureButton_SM { + margin-left: 8px; } /****************************************************** @@ -1591,7 +1815,7 @@ TransactionView TransactionView QLineEdit { /* Filters */ margin-bottom: 2px; margin-right: 1px; - min-width: 111px; + min-width: 101px; text-align: center; } @@ -1605,15 +1829,23 @@ TransactionView QLineEdit#addressWidget { /* Address Filter */ TransactionView QLineEdit#amountWidget { /* Amount Filter */ margin-bottom: 2px; margin-right: 1px; - max-width: 100px; + min-width: 101px; + max-width: 101px; text-align: center; } +TransactionView QComboBox#instantsendWidget:down-arrow { /* InstantSend Filter */ + margin-right: -5px; +} + TransactionView QComboBox { - margin-bottom: 1px; + margin-bottom: 3px; margin-right: 1px; } #transactionSumLabel, #transactionSum { + qproperty-alignment: 'AlignLeading | AlignLeft'; + min-height: 30px; + margin-top: 15px; } diff --git a/src/qt/res/css/light.css b/src/qt/res/css/light.css index faafa79944..297de242a9 100644 --- a/src/qt/res/css/light.css +++ b/src/qt/res/css/light.css @@ -17,28 +17,18 @@ Loaded in GUIUtil::loadStyleSheet() in guitil.cpp. /* do not modify! section updated by update-css-files.py -# Used colors in light.css for commit 3bebd1a5c +# Used colors in light.css for commit a50bd2371b -#333 -#999 -#ccc -#fff +#00000000 +#555 #008de4 -#1c75bc -#333333 -#616161 -#818181 -#82C3E6 +#0f75b5 +#a7a7a7 +#c7c7c7 #d2d2d2 -#d7d7d7 -#e2e2e2 -#f0f0f0 -#f2f0f0 -#f2f2f2 -#f6f6f6 -#f7f7f7 -#fcfcfc -#ffffff +#dcdcdc +#eaeaec +#f2f2f4 #ccfafafa @@ -50,19 +40,16 @@ Common stuff WalletFrame, QDialog { - background-color: #f6f6f6; -} - -QStatusBar { - background-color: #ffffff; + background-color: #f2f2f4; } QMessageBox { - background-color: #f6f6f6; + background-color: #f2f2f4; } QWidget { /* override text selection background color for all text widgets */ - selection-background-color: #999; + selection-color: #eaeaec; + selection-background-color: #555; } QCheckBox, @@ -70,54 +57,142 @@ QLabel, QListView, QRadioButton, QTreeWidget { - color: #333333; + color: #555; +} + +QCheckBox:disabled, +QLabel:disabled, +QListView:disabled, +QRadioButton:disabled { + color: #c7c7c7; +} + +/****************************************************** +User-input widget style +******************************************************/ + +BitcoinAmountField, +QAbstractSpinBox, +QComboBox, +QPlainTextEdit, +QLineEdit { + background-color: #eaeaec; + border-color: #008de4; + color: #555; +} + +BitcoinAmountField:hover:!focus, +QAbstractSpinBox:hover:!focus, +QComboBox:hover:!focus, +QPlainTextEdit:hover:!focus, +QLineEdit:hover:!focus { + background-color: #eaeaec; + border-color: #0f75b5; +} + + +BitcoinAmountField:focus, +QAbstractSpinBox:focus, +QComboBox:checked, +QComboBox:focus, +QPlainTextEdit:focus, +QLineEdit:focus { + background-color: #d2d2d2; + border-color: #0f75b5; +} + +BitcoinAmountField:disabled, +QAbstractSpinBox:disabled, +QComboBox:disabled, +QPlainTextEdit:disabled, +QLineEdit:disabled { + background-color: #eaeaec; + border-color: #d2d2d2; + color: #c7c7c7; } /****************************************************** QAbstractSpinBox ******************************************************/ -QAbstractSpinBox, -QAbstractSpinBox::up-button, -QAbstractSpinBox::down-button { - background-color: #fcfcfc; - border-color: #82C3E6; - color: #818181; +/***** No light.css specific coloring here yet *****/ + +/****************************************************** +QCalendarWidget +******************************************************/ + +QCalendarWidget, +#qt_calendar_calendarview, +#qt_calendar_navigationbar, +#qt_calendar_prevmonth, +#qt_calendar_nextmonth, +#qt_calendar_monthbutton, +#qt_calendar_yearbutton { + background-color: #eaeaec; +} + +#qt_calendar_calendarview, +#qt_calendar_navigationbar, +#qt_calendar_prevmonth, +#qt_calendar_nextmonth, +#qt_calendar_monthbutton, +#qt_calendar_yearbutton { + border-color: #dcdcdc; +} + +#qt_calendar_prevmonth:hover, +#qt_calendar_nextmonth:hover, +#qt_calendar_monthbutton:hover, +#qt_calendar_yearbutton:hover { + background-color: #d2d2d2; +} + +QCalendarWidget QToolButton { + color: #555; +} + +QCalendarWidget QWidget { + alternate-background-color: #c7c7c7; +} + +QCalendarWidget QAbstractItemView:enabled { + color: #555; + selection-background-color: #d2d2d2; + selection-color: #555; +} + +QCalendarWidget QAbstractItemView:disabled { + color: #a7a7a7; } /****************************************************** QComboBox ******************************************************/ -QComboBox { /* Dropdown Menus */ - background-color: #fcfcfc; - border-color: #82C3E6; - color: #818181; -} - -QComboBox:checked { - background-color: #f2f2f2; -} - -QComboBox:editable { - background-color: #1c75bc; - color: #616161; -} - QComboBox QListView { - background-color: #fff; + background-color: #f2f2f4; + color: #555; } QComboBox::item { - color: #818181; + color: #555; } QComboBox::item:alternate { - background-color: #fff; + background-color: #f2f2f4; } QComboBox::item:selected { - background-color: #f2f2f2; + background-color: #d2d2d2; +} + +/****************************************************** +QGroupBox +******************************************************/ + +QGroupBox { + background-color: #f2f2f4; + color: #555; } /****************************************************** @@ -126,41 +201,44 @@ QHeaderView QHeaderView::section { /* Table Header Sections */ background-color: #008de4; - border-color: #fff; - color: #fff; + border-color: #f2f2f4; + color: #f2f2f4; +} + +QHeaderView::section:hover { /* Table Header Sections */ + background-color: #0f75b5; + color: #f2f2f4; } /****************************************************** QLineEdit / QValidatedLineEdit / QPlainTextEdit ******************************************************/ -.QValidatedLineEdit, -.QLineEdit, -QPlainTextEdit { /* Text Entry Fields */ - background-color: #fcfcfc; - border-color: #82C3E6; -} - -.QValidatedLineEdit:disabled, -.QLineEdit:disabled { - background-color: #f2f2f2; -} +/***** No light.css specific coloring here yet *****/ /****************************************************** QMenu ******************************************************/ QMenu { - background-color: #f6f6f6; + background-color: #eaeaec; + border-color: #dcdcdc; } QMenu::item { - color: #333; + color: #555; } -QMenu::item:selected { - background-color: #ffffff; - color: #008de4; +QMenu::item:selected:!disabled { + background-color: #d2d2d2; +} + +QMenu::item:disabled { + color: #a7a7a7; +} + +QMenu::separator { + background-color: #c7c7c7; } /****************************************************** @@ -168,7 +246,21 @@ QMenuBar ******************************************************/ QMenuBar { - background-color: #fff; + background-color: #f2f2f4; +} + +/****************************************************** +QProgressBar +******************************************************/ + +QProgressBar { + background-color: #c7c7c7; + border-color: #00000000; + color: #00000000; +} + +QProgressBar::chunk { + background-color: #008de4; } /****************************************************** @@ -176,18 +268,93 @@ QProgressDialog ******************************************************/ .QProgressDialog { - background-color: #f6f6f6; + background-color: #f2f2f4; +} + +/****************************************************** +QPushButton +******************************************************/ + +QPushButton { + background-color: #008de4; + color: #f2f2f4; +} + +QPushButton:hover { + background-color: #0f75b5; +} + +QPushButton:pressed { + background-color: #008de4; +} + +QPushButton:disabled { + background-color: #eaeaec; + border-color: #d2d2d2; + color: #d2d2d2; } /****************************************************** QPushButton - Special case, light buttons ******************************************************/ +QWidget#AddressBookPage QPushButton#newAddress, +QWidget#AddressBookPage QPushButton#copyAddress, +QWidget#AddressBookPage QPushButton#showAddressQRCode, +QWidget#AddressBookPage QPushButton#deleteAddress, +QDialog#OpenURIDialog QPushButton#selectFileButton, +QDialog#OptionsDialog QPushButton#resetButton, +QDialog#SendCoinsDialog .QPushButton#addButton, +QDialog#SendCoinsDialog .QPushButton#clearButton, +QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#removeRequestButton, +QWidget#ReceiveCoinsDialog .QFrame#frame2 QPushButton#clearButton, +QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#showRequestButton, +QDialog#SignVerifyMessageDialog QPushButton#clearButton_SM, +QDialog#SignVerifyMessageDialog QPushButton#clearButton_VM { + background-color: #c7c7c7; + color: #555; +} + +QWidget#AddressBookPage QPushButton#newAddress:hover, +QWidget#AddressBookPage QPushButton#copyAddress:hover, +QWidget#AddressBookPage QPushButton#showAddressQRCode:hover, +QWidget#AddressBookPage QPushButton#deleteAddress:hover, +QDialog#OpenURIDialog QPushButton#selectFileButton:hover, +QDialog#OptionsDialog QPushButton#resetButton:hover, +QDialog#SendCoinsDialog .QPushButton#addButton:hover, +QDialog#SendCoinsDialog .QPushButton#clearButton:hover, +QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#removeRequestButton:hover, +QWidget#ReceiveCoinsDialog .QFrame#frame2 QPushButton#clearButton:hover, +QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#showRequestButton:hover, +QDialog#SignVerifyMessageDialog QPushButton#clearButton_SM:hover, +QDialog#SignVerifyMessageDialog QPushButton#clearButton_VM:hover { + background-color: #a7a7a7; + color: #555; +} + +QWidget#AddressBookPage QPushButton#newAddress:pressed, +QWidget#AddressBookPage QPushButton#copyAddress:pressed, +QWidget#AddressBookPage QPushButton#showAddressQRCode:pressed, +QWidget#AddressBookPage QPushButton#deleteAddress:pressed, +QDialog#OpenURIDialog QPushButton#selectFileButton:pressed, +QDialog#OptionsDialog QPushButton#resetButton:pressed, +QDialog#SendCoinsDialog .QPushButton#addButton:pressed, +QDialog#SendCoinsDialog .QPushButton#clearButton:pressed, +QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#removeRequestButton:pressed, +QWidget#ReceiveCoinsDialog .QFrame#frame2 QPushButton#clearButton:pressed, +QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#showRequestButton:pressed, +QDialog#SignVerifyMessageDialog QPushButton#clearButton_SM:pressed, +QDialog#SignVerifyMessageDialog QPushButton#clearButton_VM:pressed { + background-color: #c7c7c7; + color: #555; +} + QWidget#AddressBookPage QPushButton#newAddress:disabled, QWidget#AddressBookPage QPushButton#copyAddress:disabled, QWidget#AddressBookPage QPushButton#showAddressQRCode:disabled, QWidget#AddressBookPage QPushButton#deleteAddress:disabled, QDialog#OpenURIDialog QPushButton#selectFileButton:disabled, +QDialog#OptionsDialog QPushButton#resetButton:disabled, QDialog#SendCoinsDialog .QPushButton#addButton:disabled, QDialog#SendCoinsDialog .QPushButton#clearButton:disabled, QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#removeRequestButton:disabled, @@ -195,7 +362,7 @@ QWidget#ReceiveCoinsDialog .QFrame#frame2 QPushButton#clearButton:disabled, QWidget#ReceiveCoinsDialog .QFrame#frame QPushButton#showRequestButton:disabled, QDialog#SignVerifyMessageDialog QPushButton#clearButton_SM:disabled, QDialog#SignVerifyMessageDialog QPushButton#clearButton_VM:disabled { - background-color: #e2e2e2; + background-color: #eaeaec; border-color: #d2d2d2; color: #d2d2d2; } @@ -238,7 +405,7 @@ QPushButton - Special case, tabbar replacement buttons /* Sign/Verify dialog buttons */ #btnSignMessage:hover:checked, #btnVerifyMessage:hover:checked { - border-color: #008de4; + border-color: #555; color: #555; } @@ -257,7 +424,7 @@ QPushButton - Special case, tabbar replacement buttons /* Sign/Verify dialog buttons */ #btnSignMessage:hover:!checked, #btnVerifyMessage:hover:!checked { - border-color: #047ac2; + border-color: #0f75b5; color: #555; } @@ -276,7 +443,7 @@ QPushButton - Special case, tabbar replacement buttons /* Sign/Verify dialog buttons */ #btnSignMessage:checked, #btnVerifyMessage:checked { - border-color: #008de4; + border-color: #555; color: #555; } @@ -300,80 +467,110 @@ QScrollBar * it's OS dependent and should be handled via platform specific code. */ +/****************************************************** +QSlider +******************************************************/ + +QSlider::handle:horizontal { + background-color: #008de4; +} +QSlider::handle:horizontal:hover { + background-color: #0f75b5; +} +QSlider::sub-page:horizontal { + background-color: #c7c7c7; +} +QSlider::add-page:horizontal { + background-color: #c7c7c7; +} + +/****************************************************** +QStatusBar +******************************************************/ + +QStatusBar { + background-color: #f2f2f4; + color: #555; +} + /****************************************************** QTableView ******************************************************/ .QTableView { /* Table - has to be selected as a class otherwise it throws off QCalendarWidget */ - background-color: #fff; + background-color: #eaeaec; + border-color: #dcdcdc; } QTableView::item { /* Table Item */ - background-color: #fcfcfc; + background-color: #eaeaec; + border-color: #c7c7c7; } QTableView::item:selected { /* Table Item Selected */ - background-color: #f0f0f0; - color: #333; + background-color: #d2d2d2; + border-color: #d2d2d2; + color: #555; } /****************************************************** QTableWidget ******************************************************/ -QTableWidget { - background-color: #fff; +.QTableWidget { + background-color: #eaeaec; + border-color: #dcdcdc; + color: #555; } /****************************************************** QTabWidget ******************************************************/ -.QTabWidget { - border-color: #333; -} - -.QTabWidget::pane { - background-color: #fff; - border-color: #d7d7d7; -} - -.QTabWidget QTabBar::tab { - background-color: #f2f0f0; - border-color: #d7d7d7; - color: #333; -} - -.QTabWidget QTabBar::tab:first, -.QTabWidget QTabBar::tab:last { - border-color: #d7d7d7; -} - -.QTabWidget QTabBar::tab:selected, -.QTabWidget QTabBar::tab:hover { - background-color: #ffffff; - color: #333; -} - -.QTabWidget .QWidget { - color: #333; -} +/***** No light.css specific coloring here yet *****/ /****************************************************** QTextEdit ******************************************************/ QTextEdit { - border-color: #d7d7d7; + background-color: #eaeaec; + border-color: #dcdcdc; + color: #555; } + /****************************************************** QToolBar / QToolButton ******************************************************/ +QToolBar { + background-color: #008de4; +} + +QToolBar > QToolButton { + background-color: #00000000; + color: #f2f2f4; +} + +QToolBar > QToolButton:hover:!checked { + background-color: #0f75b5; + color: #dcdcdc; +} + QToolBar > QToolButton:checked { - background-color: #f6f6f6; - color: #333333; + background-color: #f2f2f4; + color: #555; +} + +/****************************************************** +QToolTip +******************************************************/ + +QToolTip { + background-color: #eaeaec; + border-color: #555; + color: #555; } /****************************************************** @@ -381,7 +578,9 @@ QTreeWidget ******************************************************/ QTreeWidget { - background-color: #fff; + alternate-background-color: #eaeaec; + background-color: #eaeaec; + border-color: #dcdcdc; } /****************************************************** @@ -410,40 +609,26 @@ AboutDialog AddressBookPage ******************************************************/ -QWidget#AddressBookPage { - background-color: #f6f6f6; +AddressBookPage QTableView { + color: #555; } /****************************************************** AskPassphraseDialog ******************************************************/ -QDialog#AskPassphraseDialog { - background-color: #f6f6f6; -} +/***** No light.css specific coloring here yet *****/ /****************************************************** CoinControlDialog ******************************************************/ -QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::item:selected { /* Coin Control Item (selected) */ - background-color: #f7f7f7; - color: #333; -} - -QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::item:checked { /* Coin Control Item (checked) */ - background-color: #f7f7f7; - color: #333; -} - -QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::branch:selected { /* Coin Control Branch Icon */ - background-color: #f7f7f7; - color: #333; -} - -QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::branch:checked { /* Coin Control Branch Icon */ - background-color: #f7f7f7; - color: #333; +QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::item:selected, +QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::item:checked, +QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::branch:selected, +QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::branch:checked { + background-color: #d2d2d2; + color: #555; } /****************************************************** @@ -456,8 +641,9 @@ EditAddressDialog HelpMessageDialog ******************************************************/ -QDialog#HelpMessageDialog QScrollArea * { - background-color: #ffffff; +HelpMessageDialog QWidget#scrollAreaWidgetContents { + background-color: #eaeaec; + border-color: #dcdcdc; } /****************************************************** @@ -475,24 +661,23 @@ QWidget#bgWidget { /* The frame overlaying the overview-page */ } QWidget#contentWidget { /* The actual content with the text/buttons/etc... */ - background-color: #fff; - border-color: #ccc; + background-color: #f2f2f4; + border-color: #c7c7c7; } /****************************************************** OpenURIDialog ******************************************************/ -QDialog#OpenURIDialog { - background-color: #f6f6f6; -} +/***** No light.css specific coloring here yet *****/ /****************************************************** OptionsDialog ******************************************************/ -QDialog#OptionsDialog { - background-color: #f6f6f6; +QDialog#OptionsDialog #line, +QDialog#OptionsDialog #frame { + border-color: #dcdcdc; } /****************************************************** @@ -517,46 +702,63 @@ OverviewPage RecentTransactions ReceiveCoinsDialog ******************************************************/ -/***** No light.css specific coloring here yet *****/ +ReceiveCoinsDialog QTableView { + color: #555; +} /****************************************************** RPCConsole ******************************************************/ QWidget#RPCConsole { /* RPC Console Dialog Box */ - background-color: #f6f6f6; + background-color: #f2f2f4; +} + +RPCConsole QTableView { + color: #555; +} + +#rpcAutoCompleter { + background-color: #eaeaec; + border-color: #dcdcdc; +} + +#rpcAutoCompleter::item { + color: #555; +} + +#rpcAutoCompleter::item:selected { + background-color: #d2d2d2; + color: #555; } /****************************************************** SendCoinsDialog ******************************************************/ -QDialog#SendCoinsDialog QLabel#labelBalance { - color: #333333; +QDialog#SendCoinsDialog .QFrame#frameCoinControl, +QDialog#SendCoinsDialog #scrollArea { + border-color: #dcdcdc; } /****************************************************** SendCoinsEntry ******************************************************/ -QStackedWidget#SendCoinsEntry .QFrame#SendCoins > .QLabel { /* Send Coin Entry Labels */ - color: #333; -} +/***** No light.css specific coloring here yet *****/ /****************************************************** SignVerifyMessageDialog ******************************************************/ -QDialog#SignVerifyMessageDialog { - background-color: #f6f6f6; -} +/***** No light.css specific coloring here yet *****/ /****************************************************** ShutdownWindow ******************************************************/ QWidget#ShutdownWindow { - background-color: #f6f6f6; + background-color: #f2f2f4; } /****************************************************** diff --git a/src/qt/res/css/scrollbars.css b/src/qt/res/css/scrollbars.css index 8deb72bd72..ee4033bbb6 100644 --- a/src/qt/res/css/scrollbars.css +++ b/src/qt/res/css/scrollbars.css @@ -19,7 +19,7 @@ Loaded in GUIUtil::loadStyleSheet() in guitil.cpp. /* do not modify! section updated by update-css-files.py -# Used colors in scrollbars.css for commit 3bebd1a5c +# Used colors in scrollbars.css for commit a50bd2371b #e0e0e0 #f2f0f0 diff --git a/src/qt/res/css/traditional.css b/src/qt/res/css/traditional.css index e82d66a847..0fed15c230 100644 --- a/src/qt/res/css/traditional.css +++ b/src/qt/res/css/traditional.css @@ -17,9 +17,14 @@ Loaded in GUIUtil::loadStyleSheet() in guitil.cpp. /* do not modify! section updated by update-css-files.py -# Used colors in traditional.css for commit 3bebd1a5c +# Used colors in traditional.css for commit a50bd2371b +#00000000 +#333 #fff +#008de4 +#047ac2 +#a84832 #ccfafafa @@ -56,12 +61,10 @@ QPushButton - Special case, tabbar replacement buttons #btnVerifyMessage { background: none; border-radius: 0px; - color: red; border-bottom: 3px solid red; padding-bottom: 5px; - background-color: transparent; + background-color: #00000000; border-color: #008de4; - color: #333; } /* Debug window buttons */ @@ -80,12 +83,10 @@ QPushButton - Special case, tabbar replacement buttons #btnSignMessage:hover:checked, #btnVerifyMessage:hover:checked { border: none; - color: red; border-radius: 0px; border-bottom: 3px solid red; - background-color:transparent; + background-color: #00000000; border-color: #333; - color: #333; } /* Debug window buttons */ @@ -104,12 +105,10 @@ QPushButton - Special case, tabbar replacement buttons #btnSignMessage:hover:!checked, #btnVerifyMessage:hover:!checked { border: none; - color: red; border-radius: 0px; border-bottom: 3px solid red; - background-color:transparent; + background-color: #00000000; border-color: #047ac2; - color: #666; } /* Debug window buttons */ @@ -128,12 +127,10 @@ QPushButton - Special case, tabbar replacement buttons #btnSignMessage:checked, #btnVerifyMessage:checked { border: none; - color: red; border-radius: 0px; border-bottom: 3px solid red; - background-color:transparent; + background-color: #00000000; border-color: #333; - color: #333; } /****************************************************** @@ -162,7 +159,7 @@ OverviewPage QWidget .QFrame#frame .QLabel#labelWalletStatus, /* Wallet Sync Status */ QWidget .QFrame#framePrivateSend .QLabel#labelPrivateSendSyncStatus, /* PrivateSend Sync Status */ QWidget .QFrame#frame_2 .QLabel#labelTransactionsStatus { /* Recent Transactions Sync Status */ - color: red; + color: #a84832; } /****************************************************** @@ -175,5 +172,5 @@ QDialog#SendCoinsDialog QLabel#labelBalance { } QDialog#SendCoinsDialog .QFrame#frameCoinControl .QLabel#labelCoinControlInsuffFunds { /* Insufficient Funds Label */ - color: red; + color: #a84832; }