From: Maran Date: Tue, 24 Jul 2012 12:59:41 +0000 (+0200) Subject: Removed lighter.css and moved it to the default layout X-Git-Url: https://git.novaco.in/?p=electrum-nvc.git;a=commitdiff_plain;h=f4218d441e3a3309d95e03e4bb7ae3056e23fbf0 Removed lighter.css and moved it to the default layout --- diff --git a/data/lighter.css b/data/lighter.css deleted file mode 100644 index 2f3a3f2..0000000 --- a/data/lighter.css +++ /dev/null @@ -1,78 +0,0 @@ -#main_window -{ - background: qlineargradient(x1: 0, y1: 0, x2:0,y2:1, stop: 0 white , stop: 1 #E8E8E8); -} - -MiniWindow QPushButton { - color: #777; - border: 1px solid #CCC; - border-radius: 0px; - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, - stop: 0 white, stop: 1 #E6E6E6); - min-height: 25px; - min-width: 30px; -} - - -#send_button{ - color: #E5F2FF; - border: 1px solid #3786E6; - border-radius: 4px; - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, - stop: 0 #72B2F8, stop: 1 #3484E6); - min-width: 80px; - min-height: 23px; - padding: 2px; -} - -#send_button:disabled{ - color: #D3E8FE; - border: 1px solid #6DAEF7; - border-radius: 4px; - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, - stop: 0 #A5CFFA, stop: 1 #72B2F8); - min-width: 80px; - min-height: 23px; - padding: 2px; -} - -#address_input[readOnly=true], #amount_input[readOnly=true] -{ - color: #ABABAB; - padding: 5px; - border-radius: 4px; - border: 1px solid #AAA9A9; - width: 225px; - margin-top: 4px; -} -#address_input[readOnly=false], #amount_input[readOnly=false] -{ - padding: 2px; - border: 1px solid #AAA9A9; - font: normal; - color: #424242; - border-radius: 4px; - font-size: 95%; - width: 225px; - margin-top: 4px; -} - -#valid_address::indicator -{ - width: 24px; - height: 24px; - margin-top: 2px; -} -#valid_address::indicator:checked -{ - image: url(icons/confirmed.png); -} -#valid_address::indicator:unchecked -{ - image: url(icons/unconfirmed.png); -} - -#balance_label -{ - color: #333; -} diff --git a/data/style.css b/data/style.css index 61a86e6..2f3a3f2 100644 --- a/data/style.css +++ b/data/style.css @@ -1,23 +1,67 @@ #main_window { - background-image: url(background.png); + background: qlineargradient(x1: 0, y1: 0, x2:0,y2:1, stop: 0 white , stop: 1 #E8E8E8); +} + +MiniWindow QPushButton { + color: #777; + border: 1px solid #CCC; + border-radius: 0px; + background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, + stop: 0 white, stop: 1 #E6E6E6); + min-height: 25px; + min-width: 30px; +} + + +#send_button{ + color: #E5F2FF; + border: 1px solid #3786E6; + border-radius: 4px; + background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, + stop: 0 #72B2F8, stop: 1 #3484E6); + min-width: 80px; + min-height: 23px; + padding: 2px; +} + +#send_button:disabled{ + color: #D3E8FE; + border: 1px solid #6DAEF7; + border-radius: 4px; + background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, + stop: 0 #A5CFFA, stop: 1 #72B2F8); + min-width: 80px; + min-height: 23px; + padding: 2px; } #address_input[readOnly=true], #amount_input[readOnly=true] { - font: italic; - color: gray; + color: #ABABAB; + padding: 5px; + border-radius: 4px; + border: 1px solid #AAA9A9; + width: 225px; + margin-top: 4px; } #address_input[readOnly=false], #amount_input[readOnly=false] { + padding: 2px; + border: 1px solid #AAA9A9; font: normal; - color: black; + color: #424242; + border-radius: 4px; + font-size: 95%; + width: 225px; + margin-top: 4px; } #valid_address::indicator { width: 24px; height: 24px; + margin-top: 2px; } #valid_address::indicator:checked { @@ -30,6 +74,5 @@ #balance_label { - color: white; + color: #333; } - diff --git a/lib/gui_lite.py b/lib/gui_lite.py index f38f441..93fcd6b 100644 --- a/lib/gui_lite.py +++ b/lib/gui_lite.py @@ -56,7 +56,7 @@ class ElectrumGui: # change the behaviour of rsrc(...) self.old_path = QDir.currentPath() cd_data_dir() - with open(rsrc("lighter.css")) as style_file: + with open(rsrc("style.css")) as style_file: self.app.setStyleSheet(style_file.read()) def main(self, url):