diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include index 5ac0335ca5203..8a0cdbb0d4e4b 100644 --- a/src/Makefile.qt.include +++ b/src/Makefile.qt.include @@ -422,7 +422,6 @@ RES_IMAGES = \ qt/res/images/drkblue/drkblue_rightArrow_small.png \ qt/res/images/drkblue/drkblue_qtreeview_selected.png \ qt/res/images/drkblue/drkblue_walletFrame_bg.png \ - qt/res/images/drkblue/drkblue_walletFrame.png \ qt/res/images/crownium/about.png \ qt/res/images/crownium/splash.png \ qt/res/images/crownium/splash_testnet.png \ @@ -434,7 +433,6 @@ RES_IMAGES = \ qt/res/images/crownium/drkblue_rightArrow_small.png \ qt/res/images/crownium/drkblue_qtreeview_selected.png \ qt/res/images/crownium/drkblue_walletFrame_bg.png \ - qt/res/images/crownium/drkblue_walletFrame.png \ qt/res/images/light/about.png \ qt/res/images/light/splash.png \ qt/res/images/light/splash_testnet.png \ @@ -446,7 +444,6 @@ RES_IMAGES = \ qt/res/images/light/drkblue_rightArrow_small.png \ qt/res/images/light/drkblue_qtreeview_selected.png \ qt/res/images/light/drkblue_walletFrame_bg.png \ - qt/res/images/light/drkblue_walletFrame.png \ qt/res/images/trad/about.png \ qt/res/images/trad/splash.png \ qt/res/images/trad/splash_testnet.png \ @@ -457,8 +454,7 @@ RES_IMAGES = \ qt/res/images/trad/drkblue_leftArrow_small.png \ qt/res/images/trad/drkblue_rightArrow_small.png \ qt/res/images/trad/drkblue_qtreeview_selected.png \ - qt/res/images/trad/drkblue_walletFrame_bg.png \ - qt/res/images/trad/drkblue_walletFrame.png + qt/res/images/trad/drkblue_walletFrame_bg.png RES_CSS = \ qt/res/css/drkblue.css \ diff --git a/src/qt/dash.qrc b/src/qt/dash.qrc index d0997c88ecba7..6ac0d3d28d914 100644 --- a/src/qt/dash.qrc +++ b/src/qt/dash.qrc @@ -213,7 +213,6 @@ res/images/drkblue/drkblue_rightArrow_small.png res/images/drkblue/drkblue_qtreeview_selected.png res/images/drkblue/drkblue_walletFrame_bg.png - res/images/drkblue/drkblue_walletFrame.png res/images/drkblue/splash.png res/images/drkblue/splash_testnet.png @@ -227,7 +226,6 @@ res/images/crownium/drkblue_rightArrow_small.png res/images/crownium/drkblue_qtreeview_selected.png res/images/crownium/drkblue_walletFrame_bg.png - res/images/crownium/drkblue_walletFrame.png res/images/crownium/splash.png res/images/crownium/splash_testnet.png @@ -241,7 +239,6 @@ res/images/light/drkblue_rightArrow_small.png res/images/light/drkblue_qtreeview_selected.png res/images/light/drkblue_walletFrame_bg.png - res/images/light/drkblue_walletFrame.png res/images/light/splash.png res/images/light/splash_testnet.png @@ -255,7 +252,6 @@ res/images/trad/drkblue_rightArrow_small.png res/images/trad/drkblue_qtreeview_selected.png res/images/trad/drkblue_walletFrame_bg.png - res/images/trad/drkblue_walletFrame.png res/images/trad/splash.png res/images/trad/splash_testnet.png diff --git a/src/qt/res/css/light.css b/src/qt/res/css/light.css index f1b477303e6d6..bf93992f6ad82 100644 --- a/src/qt/res/css/light.css +++ b/src/qt/res/css/light.css @@ -41,24 +41,24 @@ color:#333; } QToolBar { -background-color:#3398CC; +background-color:#fff; border:0px solid #000; padding:0; margin:0; } QToolBar > QToolButton { -background-color:#3398CC; +background-color:#fff; border:0px solid #333; min-height:2.5em; padding: 0em 1em; -font-weight:bold; -color:#fff; +/*font-weight:bold;*/ +color:#333; } QToolBar > QToolButton:checked { -background-color:#fff; -color:#333; +background-color:#1c75bc; +color:#fff; font-weight:bold; } @@ -102,22 +102,22 @@ background-color:#f2f2f2; /*******************************************************/ QPushButton { /* Global Button Style */ -background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #64ACD2, stop: .1 #3398CC, stop: .95 #3398CC, stop: 1 #1D80B5); +background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #4ca5dc, stop: .1 #2c85cc, stop: .95 #2c85cc, stop: 1 #1D80B5); border:0; border-radius:3px; color:#ffffff; font-size:12px; -font-weight:bold; - height: 26px; +font-weight:normal; +height: 26px; padding-left:25px; padding-right:25px; padding-top:5px; padding-bottom:5px; - margin-right: 10px; +margin-right: 10px; } QPushButton:hover { -background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #64ACD2, stop: .1 #46AADE, stop: .95 #46AADE, stop: 1 #1D80B5); +background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #4ca5dc, stop: .1 #4ca5dc, stop: .95 #4ca5dc, stop: 1 #1D80B5); } QPushButton:focus { @@ -142,7 +142,7 @@ background:#f2f2f2; } QComboBox:editable { -background: #3398CC; +background: #1c75bc; color:#616161; border:0px solid transparent; } @@ -237,7 +237,7 @@ background-color:transparent; QHeaderView::section { /* Table Header Sections */ qproperty-alignment:center; -background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 0.25, stop: 0 #4c97bf, stop: 1 #56ABD8); +background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 0.25, stop: 0 #1070B0, stop: 1 #1c75bc); color:#fff; min-height:25px; font-weight:bold; @@ -659,7 +659,7 @@ min-width:180px; } QDialog#RPCConsole QWidget#tab_peers QLabel#peerHeading { /* Peers Info Header */ -color:#3398CC; +color:#1c75bc; } QDialog#RPCConsole QPushButton#openDebugLogfileButton { @@ -769,18 +769,19 @@ margin-left:16px; QWidget .QFrame#frame .QLabel#labelBalanceText { /* Available Balance Label */ qproperty-alignment: 'AlignVCenter | AlignRight'; min-width:160px; -background-color:#1E75BB; +background-color:#1c75bc; color:#ffffff; margin-right:5px; padding-right:5px; -font-size:16px; +font-size:14px; +font-weight: bold; min-height:35px; } QWidget .QFrame#frame .QLabel#labelBalance { /* Available Balance */ qproperty-alignment: 'AlignVCenter | AlignLeft'; font-size:16px; -color:#1E75BB; +color:#1c75bc; margin-left:0px; font-weight: bold; } @@ -858,7 +859,7 @@ margin-left:16px; QWidget .QFrame#frameDarksend { /* Darksend Widget */ background-color:transparent; -qproperty-minimumSize: 451px 343px; +qproperty-minimumSize: 451px 353px; } QWidget .QFrame#frameDarksend QWidget { @@ -868,7 +869,7 @@ qproperty-geometry: rect(10 0 431 35); QWidget .QFrame#frameDarksend .QLabel#label_2 { /* Darksend Header */ qproperty-alignment: 'AlignVCenter | AlignCenter'; min-width:451px; -background-color:#56ABD8; +background-color:#1c75bc; color:#fff; margin-right:5px; padding-right:5px; @@ -922,7 +923,7 @@ color:#818181; } QWidget .QFrame#frameDarksend #formLayoutWidget .QProgressBar#darksendProgress::chunk { -background-color: #3398CC; +background-color: #1c75bc; width:1px; } @@ -964,7 +965,7 @@ QWidget .QFrame#frameDarksend #formLayoutWidget .QLabel#labelSubmittedDenom { /* QWidget .QFrame#frameDarksend .QLabel#darksendStatus { /* Darksend Status Notifications */ qproperty-alignment: 'AlignVCenter | AlignCenter'; -qproperty-geometry: rect(70 226 395 34); +qproperty-geometry: rect(9 226 441 34); font-size:11px; color:#818181; } @@ -985,9 +986,9 @@ qproperty-geometry: rect(0 0 0 0); } QWidget .QFrame#frameDarksend .QPushButton#toggleDarksend { /* Start Darksend Mixing */ - qproperty-geometry: rect(9 253 441 40); + qproperty-geometry: rect(9 268 441 40); font-size:15px; -font-weight:bold; +font-weight:normal; color:#ffffff; padding-left:10px; padding-right:10px; @@ -1000,7 +1001,7 @@ QWidget .QFrame#frameDarksend .QPushButton#toggleDarksend:hover { } QWidget .QFrame#frameDarksend .QPushButton#darksendAuto { /* Try Mix Button */ - qproperty-geometry: rect(9 304 220 30); + qproperty-geometry: rect(9 314 220 30); background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(250, 250, 250, 128), stop: .95 rgba(250, 250, 250, 255), stop: 1 #ebebeb); border:1px solid #d2d2d2; color:#616161; @@ -1019,7 +1020,7 @@ border:1px solid #9e9e9e; } QWidget .QFrame#frameDarksend .QPushButton#darksendReset { /* Reset Button */ - qproperty-geometry: rect(232 304 220 30); + qproperty-geometry: rect(232 314 220 30); background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: .01 #f6f6f6, stop: .1 rgba(250, 250, 250, 128), stop: .95 rgba(250, 250, 250, 255), stop: 1 #ebebeb); border:1px solid #d2d2d2; color:#616161; @@ -1050,12 +1051,12 @@ background-repeat:none; QWidget .QFrame#frame_2 .QLabel#label_4 { /* Recent Transactions Label */ min-width:180px; -color:#3398CC; +color:#999; margin-left:67px; margin-top:83px; margin-right:5px; padding-right:5px; -font-weight:bold; +font-weight:normal; font-size:15px; min-height:24px; } @@ -1085,6 +1086,7 @@ QDialog#SendCoinsDialog .QFrame#frameCoinControl { /* Coin Control Section */ QDialog#SendCoinsDialog .QFrame#frameCoinControl > .QLabel { /* Default Font Color and Size */ font-weight:normal; +color: #999; } QDialog#SendCoinsDialog .QFrame#frameCoinControl .QPushButton#pushButtonCoinControl { /* Coin Control Inputs Button */ @@ -1094,8 +1096,8 @@ min-height:25px; } QDialog#SendCoinsDialog .QFrame#frameCoinControl .QLabel#labelCoinControlFeatures { /* Coin Control Header */ -color:#3398CC; -font-weight:bold; +color:#999; +font-weight:normal; font-size:14px; } @@ -1212,18 +1214,19 @@ min-height:27px; /* SEND COINS ENTRY */ QStackedWidget#SendCoinsEntry .QFrame#SendCoins > .QLabel { /* Send Coin Entry Labels */ -background-color:#56ABD8; +background-color:#F8F6F6; min-width:102px; -font-weight:bold; -font-size:11px; -color:#ffffff; +font-weight:normal; +/*font-size:11px;*/ +color:#333; min-height:25px; margin-right:5px; padding-right:5px; } QStackedWidget#SendCoinsEntry .QFrame#SendCoins .QLabel#amountLabel { -background-color:#6a6a6a; +color: #fff; +background-color:#999; } QStackedWidget#SendCoinsEntry .QValidatedLineEdit#payTo { /* Pay To Input Field */ @@ -1399,29 +1402,32 @@ QDialog#CoinControlDialog .CoinControlTreeWidget#treeWidget::indicator { /* Coin /* RECEIVE COINS */ QWidget#ReceiveCoinsDialog .QFrame#frame2 .QLabel#label_2 { /* Label Label */ -background-color:#56ABD8; +background-color:#F8F6F6; +border: 1px solid #fff; min-width:102px; -color:#ffffff; -font-weight:bold; -font-size:11px; +color:#333; +/*font-weight:bold; +font-size:11px;*/ padding-right:5px; } QWidget#ReceiveCoinsDialog .QFrame#frame2 .QLabel#label { /* Amount Label */ -background-color:#6a6a6a; +background-color:#999; +border: 1px solid #fff; min-width:102px; color:#ffffff; -font-weight:bold; -font-size:11px; +/*font-weight:bold; +font-size:11px;*/ padding-right:5px; } QWidget#ReceiveCoinsDialog .QFrame#frame2 .QLabel#label_3 { /* Message Label */ -background-color:#56ABD8; +background-color:#F8F6F6; +border: 1px solid #fff; min-width:102px; -color:#ffffff; -font-weight:bold; -font-size:11px; +color:#333; +/*font-weight:bold; +font-size:11px;*/ padding-right:5px; } @@ -1477,8 +1483,8 @@ border:1px solid #9e9e9e; } QWidget#ReceiveCoinsDialog .QFrame#frame .QLabel#label_6 { /* Requested Payments History Label */ -color:#3398CC; -font-weight:bold; +color:#999; +font-weight:normal; font-size:14px; } diff --git a/src/qt/res/icons/light/_history.png b/src/qt/res/icons/light/_history.png deleted file mode 100644 index 0c202685943fa..0000000000000 Binary files a/src/qt/res/icons/light/_history.png and /dev/null differ diff --git a/src/qt/res/icons/light/eye.png b/src/qt/res/icons/light/eye.png index f2f139dbb2f5b..a890c8e35fd2f 100644 Binary files a/src/qt/res/icons/light/eye.png and b/src/qt/res/icons/light/eye.png differ diff --git a/src/qt/res/icons/light/eye_minus.png b/src/qt/res/icons/light/eye_minus.png index 795bf6436a477..3486352730bce 100644 Binary files a/src/qt/res/icons/light/eye_minus.png and b/src/qt/res/icons/light/eye_minus.png differ diff --git a/src/qt/res/icons/light/eye_plus.png b/src/qt/res/icons/light/eye_plus.png index eaab69297a672..bd0c5b5541f24 100644 Binary files a/src/qt/res/icons/light/eye_plus.png and b/src/qt/res/icons/light/eye_plus.png differ diff --git a/src/qt/res/icons/light/transaction_conflicted.png b/src/qt/res/icons/light/transaction_conflicted.png index 55e34de4b8cbb..70e8f2f0f0c3c 100644 Binary files a/src/qt/res/icons/light/transaction_conflicted.png and b/src/qt/res/icons/light/transaction_conflicted.png differ diff --git a/src/qt/res/icons/light/tx_inout.png b/src/qt/res/icons/light/tx_inout.png index e733af293b738..f42ed238a62e3 100644 Binary files a/src/qt/res/icons/light/tx_inout.png and b/src/qt/res/icons/light/tx_inout.png differ diff --git a/src/qt/res/icons/light/tx_input.png b/src/qt/res/icons/light/tx_input.png index 9475f96663552..69cc00a8e47bb 100644 Binary files a/src/qt/res/icons/light/tx_input.png and b/src/qt/res/icons/light/tx_input.png differ diff --git a/src/qt/res/icons/light/tx_mined.png b/src/qt/res/icons/light/tx_mined.png index 33bfdf8ae8421..0ef3e0f403908 100644 Binary files a/src/qt/res/icons/light/tx_mined.png and b/src/qt/res/icons/light/tx_mined.png differ diff --git a/src/qt/res/icons/light/tx_output.png b/src/qt/res/icons/light/tx_output.png index ceedb1b71d7e9..e49f4a5298c4c 100644 Binary files a/src/qt/res/icons/light/tx_output.png and b/src/qt/res/icons/light/tx_output.png differ diff --git a/src/qt/res/icons/light/verify.png b/src/qt/res/icons/light/verify.png index 8e2cb2cc14436..e51f46e97aca1 100644 Binary files a/src/qt/res/icons/light/verify.png and b/src/qt/res/icons/light/verify.png differ diff --git a/src/qt/res/images/crownium/drkblue_walletFrame.png b/src/qt/res/images/crownium/drkblue_walletFrame.png deleted file mode 100644 index 617dbb7cdd68c..0000000000000 Binary files a/src/qt/res/images/crownium/drkblue_walletFrame.png and /dev/null differ diff --git a/src/qt/res/images/drkblue/drkblue_walletFrame.png b/src/qt/res/images/drkblue/drkblue_walletFrame.png deleted file mode 100644 index 3d30cbbe05f2a..0000000000000 Binary files a/src/qt/res/images/drkblue/drkblue_walletFrame.png and /dev/null differ diff --git a/src/qt/res/images/light/1x1w_90.png b/src/qt/res/images/light/1x1w_90.png deleted file mode 100644 index 0e087cf94a402..0000000000000 Binary files a/src/qt/res/images/light/1x1w_90.png and /dev/null differ diff --git a/src/qt/res/images/light/blue_10x10_90.png b/src/qt/res/images/light/blue_10x10_90.png deleted file mode 100644 index 67495a6f6b0e1..0000000000000 Binary files a/src/qt/res/images/light/blue_10x10_90.png and /dev/null differ diff --git a/src/qt/res/images/light/dash_logo_horizontal copy.png b/src/qt/res/images/light/dash_logo_horizontal copy.png deleted file mode 100644 index 59d04cb35f08d..0000000000000 Binary files a/src/qt/res/images/light/dash_logo_horizontal copy.png and /dev/null differ diff --git a/src/qt/res/images/light/dash_logo_horizontal_2.png b/src/qt/res/images/light/dash_logo_horizontal_2.png deleted file mode 100644 index 7162f7e064c2f..0000000000000 Binary files a/src/qt/res/images/light/dash_logo_horizontal_2.png and /dev/null differ diff --git a/src/qt/res/images/light/drkblue_walletFrame.png b/src/qt/res/images/light/drkblue_walletFrame.png deleted file mode 100644 index a70ab9436b8ec..0000000000000 Binary files a/src/qt/res/images/light/drkblue_walletFrame.png and /dev/null differ diff --git a/src/qt/res/images/light/drkblue_walletFrame_bg.png b/src/qt/res/images/light/drkblue_walletFrame_bg.png index b4d0ee3b2c55f..d3df0ec1192fa 100644 Binary files a/src/qt/res/images/light/drkblue_walletFrame_bg.png and b/src/qt/res/images/light/drkblue_walletFrame_bg.png differ diff --git a/src/qt/res/images/trad/drkblue_walletFrame.png b/src/qt/res/images/trad/drkblue_walletFrame.png deleted file mode 100644 index 3d30cbbe05f2a..0000000000000 Binary files a/src/qt/res/images/trad/drkblue_walletFrame.png and /dev/null differ