From 72591e053a74b62fa4d40bcbe05433b464e56e54 Mon Sep 17 00:00:00 2001 From: Jan Pochyla Date: Mon, 9 Oct 2017 15:34:24 +0200 Subject: [PATCH] trezor/ui: style changes --- src/trezor/ui/pin.py | 2 +- src/trezor/ui/style.py | 28 ++++++++++++++-------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/trezor/ui/pin.py b/src/trezor/ui/pin.py index f1de3f0b..0ff496f1 100644 --- a/src/trezor/ui/pin.py +++ b/src/trezor/ui/pin.py @@ -48,7 +48,7 @@ class PinMatrix(ui.Widget): display.bar(0, 0, 205, 48, ui.BG) # input line with a header - display.text_center(120, 30, header, ui.BOLD, ui.GREY, ui.BG) + display.text_center(120, 30, header, ui.NORMAL, ui.blend(ui.BG, ui.FG, 0.5), ui.BG) # pin matrix buttons for btn in self.pin_buttons: diff --git a/src/trezor/ui/style.py b/src/trezor/ui/style.py index ea7a7feb..1a50fc74 100644 --- a/src/trezor/ui/style.py +++ b/src/trezor/ui/style.py @@ -62,10 +62,10 @@ BTN_DEFAULT = { 'radius': RADIUS, } BTN_DEFAULT_ACTIVE = { - 'bg-color': GREY, + 'bg-color': FG, 'fg-color': BG, 'text-style': BOLD, - 'border-color': GREY, + 'border-color': FG, 'radius': RADIUS, } BTN_DEFAULT_DISABLED = { @@ -76,31 +76,31 @@ BTN_DEFAULT_DISABLED = { 'radius': RADIUS, } BTN_CANCEL = { - 'bg-color': RED, + 'bg-color': LIGHT_RED, 'fg-color': FG, 'text-style': BOLD, - 'border-color': BG, + 'border-color': LIGHT_RED, 'radius': RADIUS, } BTN_CANCEL_ACTIVE = { - 'bg-color': ACTIVE_RED, - 'fg-color': FG, + 'bg-color': FG, + 'fg-color': LIGHT_RED, 'text-style': BOLD, - 'border-color': ACTIVE_RED, + 'border-color': LIGHT_RED, 'radius': RADIUS, } BTN_CONFIRM = { 'bg-color': GREEN, 'fg-color': FG, 'text-style': BOLD, - 'border-color': BG, + 'border-color': GREEN, 'radius': RADIUS, } BTN_CONFIRM_ACTIVE = { - 'bg-color': ACTIVE_GREEN, - 'fg-color': FG, + 'bg-color': FG, + 'fg-color': GREEN, 'text-style': BOLD, - 'border-color': ACTIVE_GREEN, + 'border-color': FG, 'radius': RADIUS, } BTN_CLEAR = { @@ -139,7 +139,7 @@ LDR_DEFAULT = { } LDR_DEFAULT_ACTIVE = { 'bg-color': BG, - 'fg-color': ACTIVE_GREEN, - 'icon': None, - 'icon-fg-color': None, + 'fg-color': GREEN, + 'icon': ICON_SEND, + 'icon-fg-color': GREEN, }