Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixing light theme #778

Merged
merged 2 commits into from
May 19, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions src/Makefile.qt.include
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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 \
Expand All @@ -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 \
Expand All @@ -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 \
Expand Down
4 changes: 0 additions & 4 deletions src/qt/dash.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,6 @@
<file alias="drkblue_rightArrow_small">res/images/drkblue/drkblue_rightArrow_small.png</file>
<file alias="drkblue_qtreeview_selected">res/images/drkblue/drkblue_qtreeview_selected.png</file>
<file alias="drkblue_walletFrame_bg">res/images/drkblue/drkblue_walletFrame_bg.png</file>
<file alias="drkblue_walletFrame">res/images/drkblue/drkblue_walletFrame.png</file>
<file alias="splash">res/images/drkblue/splash.png</file>
<file alias="splash_testnet">res/images/drkblue/splash_testnet.png</file>
</qresource>
Expand All @@ -227,7 +226,6 @@
<file alias="drkblue_rightArrow_small">res/images/crownium/drkblue_rightArrow_small.png</file>
<file alias="drkblue_qtreeview_selected">res/images/crownium/drkblue_qtreeview_selected.png</file>
<file alias="drkblue_walletFrame_bg">res/images/crownium/drkblue_walletFrame_bg.png</file>
<file alias="drkblue_walletFrame">res/images/crownium/drkblue_walletFrame.png</file>
<file alias="splash">res/images/crownium/splash.png</file>
<file alias="splash_testnet">res/images/crownium/splash_testnet.png</file>
</qresource>
Expand All @@ -241,7 +239,6 @@
<file alias="drkblue_rightArrow_small">res/images/light/drkblue_rightArrow_small.png</file>
<file alias="drkblue_qtreeview_selected">res/images/light/drkblue_qtreeview_selected.png</file>
<file alias="drkblue_walletFrame_bg">res/images/light/drkblue_walletFrame_bg.png</file>
<file alias="drkblue_walletFrame">res/images/light/drkblue_walletFrame.png</file>
<file alias="splash">res/images/light/splash.png</file>
<file alias="splash_testnet">res/images/light/splash_testnet.png</file>
</qresource>
Expand All @@ -255,7 +252,6 @@
<file alias="drkblue_rightArrow_small">res/images/trad/drkblue_rightArrow_small.png</file>
<file alias="drkblue_qtreeview_selected">res/images/trad/drkblue_qtreeview_selected.png</file>
<file alias="drkblue_walletFrame_bg">res/images/trad/drkblue_walletFrame_bg.png</file>
<file alias="drkblue_walletFrame">res/images/trad/drkblue_walletFrame.png</file>
<file alias="splash">res/images/trad/splash.png</file>
<file alias="splash_testnet">res/images/trad/splash_testnet.png</file>
</qresource>
Expand Down
100 changes: 53 additions & 47 deletions src/qt/res/css/light.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down Expand Up @@ -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 {
Expand All @@ -142,7 +142,7 @@ background:#f2f2f2;
}

QComboBox:editable {
background: #3398CC;
background: #1c75bc;
color:#616161;
border:0px solid transparent;
}
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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 {
Expand All @@ -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;
Expand Down Expand Up @@ -922,7 +923,7 @@ color:#818181;
}

QWidget .QFrame#frameDarksend #formLayoutWidget .QProgressBar#darksendProgress::chunk {
background-color: #3398CC;
background-color: #1c75bc;
width:1px;
}

Expand Down Expand Up @@ -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;
}
Expand All @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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 */
Expand All @@ -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;
}

Expand Down Expand Up @@ -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 */
Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -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;
}

Expand Down
Binary file removed src/qt/res/icons/light/_history.png
Binary file not shown.
Binary file modified src/qt/res/icons/light/eye.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/light/eye_minus.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/light/eye_plus.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/light/transaction_conflicted.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/light/tx_inout.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/light/tx_input.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/light/tx_mined.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/light/tx_output.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/light/verify.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed src/qt/res/images/crownium/drkblue_walletFrame.png
Binary file not shown.
Binary file removed src/qt/res/images/drkblue/drkblue_walletFrame.png
Binary file not shown.
Binary file removed src/qt/res/images/light/1x1w_90.png
Binary file not shown.
Binary file removed src/qt/res/images/light/blue_10x10_90.png
Binary file not shown.
Binary file not shown.
Binary file removed src/qt/res/images/light/dash_logo_horizontal_2.png
Binary file not shown.
Binary file removed src/qt/res/images/light/drkblue_walletFrame.png
Binary file not shown.
Binary file modified src/qt/res/images/light/drkblue_walletFrame_bg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed src/qt/res/images/trad/drkblue_walletFrame.png
Binary file not shown.