themes: refine danger button style

This commit is contained in:
Le Tan 2017-12-12 21:04:37 +08:00
parent 8d6fc6cb4f
commit ae16b547e6
4 changed files with 44 additions and 24 deletions

View File

@ -58,9 +58,14 @@ edit_focus_border=@master_bg
edit_selection_fg=@edit_fg edit_selection_fg=@edit_fg
edit_selection_bg=#CBD2F9 edit_selection_bg=#CBD2F9
danger_red=#C9302C
icon_fg=#222222 icon_fg=#222222
danger_fg=#F5F5F5
danger_bg=#C9302C
danger_focus_bg=#D9534F
danger_hover_bg=#D9534F
danger_pressed_bg=#AC2925
[soft_defined] [soft_defined]
; VAvatar. ; VAvatar.
avatar_border_bg=@selected_bg avatar_border_bg=@selected_bg
@ -78,7 +83,7 @@ bubble_fg=@master_fg
bubble_bg=@master_bg bubble_bg=@master_bg
; Icons' foreground. ; Icons' foreground.
danger_icon_fg=@danger_red danger_icon_fg=@danger_bg
item_icon_fg=@icon_fg item_icon_fg=@icon_fg
title_icon_fg=@icon_fg title_icon_fg=@icon_fg
@ -181,12 +186,11 @@ pushbutton_titlebtn_hover_bg=@hover_bg
pushbutton_titlebtn_focus_bg=@focus_bg pushbutton_titlebtn_focus_bg=@focus_bg
pushbutton_titlebtn_pressed_bg=@pressed_bg pushbutton_titlebtn_pressed_bg=@pressed_bg
pushbutton_dangerbtn_fg=#FFF pushbutton_dangerbtn_fg=@danger_fg
pushbutton_dangerbtn_border=#D43F3A pushbutton_dangerbtn_bg=@danger_bg
pushbutton_dangerbtn_bg=#D9534F pushbutton_dangerbtn_hover_bg=@danger_hover_bg
pushbutton_dangerbtn_hover_fg=#FFF pushbutton_dangerbtn_focus_bg=@danger_focus_bg
pushbutton_dangerbtn_hover_bg=#C9302C pushbutton_dangerbtn_pressed_bg=@danger_pressed_bg
pushbutton_dangerbtn_hover_border=#AC2925
pushbutton_toolboxbtn_active_fg=@master_fg pushbutton_toolboxbtn_active_fg=@master_fg
pushbutton_toolboxbtn_active_bg=@master_bg pushbutton_toolboxbtn_active_bg=@master_bg
@ -247,7 +251,7 @@ tabbar_hover_fg=@hover_fg
tabbar_hover_bg=@hover_bg tabbar_hover_bg=@hover_bg
tabbar_icon_fg=@icon_fg tabbar_icon_fg=@icon_fg
tabbar_icon_special_fg=@danger_red tabbar_icon_special_fg=@danger_bg
; SelectorItem. ; SelectorItem.
selectoritem_border=@base_fg selectoritem_border=@base_fg

View File

@ -385,17 +385,23 @@ QPushButton[TitleBtn="true"]:disabled {
QPushButton[DangerBtn="true"] { QPushButton[DangerBtn="true"] {
color: @pushbutton_dangerbtn_fg; color: @pushbutton_dangerbtn_fg;
border-color: @pushbutton_dangerbtn_border; border: none;
background-color: @pushbutton_dangerbtn_bg; background-color: @pushbutton_dangerbtn_bg;
min-width: -1; min-width: -1;
} }
QPushButton[DangerBtn="true"]:hover { QPushButton[DangerBtn="true"]:hover {
color: @pushbutton_dangerbtn_hover_fg;
border-color: @pushbutton_dangerbtn_hover_border;
background-color: @pushbutton_dangerbtn_hover_bg; background-color: @pushbutton_dangerbtn_hover_bg;
} }
QPushButton[DangerBtn="true"]:focus {
background-color: @pushbutton_dangerbtn_focus_bg;
}
QPushButton[DangerBtn="true"]:pressed {
background-color: @pushbutton_dangerbtn_pressed_bg;
}
QPushButton[DangerBtn="true"]:disabled { QPushButton[DangerBtn="true"]:disabled {
color: @pushbutton_disabled_fg; color: @pushbutton_disabled_fg;
background-color: @pushbutton_disabled_bg; background-color: @pushbutton_disabled_bg;

View File

@ -48,9 +48,14 @@ content_bg=#FFFFFF
selection_fg=#000000 selection_fg=#000000
selection_bg=#64b5f6 selection_bg=#64b5f6
danger_red=#C9302C
icon_fg=#222222 icon_fg=#222222
danger_fg=#F5F5F5
danger_bg=#C9302C
danger_focus_bg=#D9534F
danger_hover_bg=#D9534F
danger_pressed_bg=#AC2925
[soft_defined] [soft_defined]
; VAvatar. ; VAvatar.
avatar_border_bg=@title_bg avatar_border_bg=@title_bg
@ -68,7 +73,7 @@ bubble_fg=#FFFFFF
bubble_bg=#616161 bubble_bg=#616161
; Icons' foreground. ; Icons' foreground.
danger_icon_fg=@danger_red danger_icon_fg=@danger_bg
item_icon_fg=@icon_fg item_icon_fg=@icon_fg
title_icon_fg=@icon_fg title_icon_fg=@icon_fg
@ -163,12 +168,11 @@ pushbutton_titlebtn_hover_bg=@hover_bg
pushbutton_titlebtn_focus_bg=@focus_bg pushbutton_titlebtn_focus_bg=@focus_bg
pushbutton_titlebtn_pressed_bg=@pressed_bg pushbutton_titlebtn_pressed_bg=@pressed_bg
pushbutton_dangerbtn_fg=#FFF pushbutton_dangerbtn_fg=@danger_fg
pushbutton_dangerbtn_border=#D43F3A pushbutton_dangerbtn_bg=@danger_bg
pushbutton_dangerbtn_bg=#D9534F pushbutton_dangerbtn_hover_bg=@danger_hover_bg
pushbutton_dangerbtn_hover_fg=#FFF pushbutton_dangerbtn_focus_bg=@danger_focus_bg
pushbutton_dangerbtn_hover_bg=#C9302C pushbutton_dangerbtn_pressed_bg=@danger_pressed_bg
pushbutton_dangerbtn_hover_border=#AC2925
button_icon_fg=@icon_fg button_icon_fg=@icon_fg
button_icon_danger_fg=@danger_icon_fg button_icon_danger_fg=@danger_icon_fg
@ -217,7 +221,7 @@ tabbar_closebutton_hover_bg=@hover_bg
tabbar_closebutton_focus_bg=@focus_bg tabbar_closebutton_focus_bg=@focus_bg
tabbar_icon_fg=@icon_fg tabbar_icon_fg=@icon_fg
tabbar_icon_special_fg=@danger_red tabbar_icon_special_fg=@danger_bg
; SelectorItem. ; SelectorItem.
selectoritem_border=@base_fg selectoritem_border=@base_fg

View File

@ -350,17 +350,23 @@ QPushButton[TitleBtn="true"]:disabled {
QPushButton[DangerBtn="true"] { QPushButton[DangerBtn="true"] {
color: @pushbutton_dangerbtn_fg; color: @pushbutton_dangerbtn_fg;
border-color: @pushbutton_dangerbtn_border; border: none;
background-color: @pushbutton_dangerbtn_bg; background-color: @pushbutton_dangerbtn_bg;
min-width: -1; min-width: -1;
} }
QPushButton[DangerBtn="true"]:hover { QPushButton[DangerBtn="true"]:hover {
color: @pushbutton_dangerbtn_hover_fg;
border-color: @pushbutton_dangerbtn_hover_border;
background-color: @pushbutton_dangerbtn_hover_bg; background-color: @pushbutton_dangerbtn_hover_bg;
} }
QPushButton[DangerBtn="true"]:focus {
background-color: @pushbutton_dangerbtn_focus_bg;
}
QPushButton[DangerBtn="true"]:pressed {
background-color: @pushbutton_dangerbtn_pressed_bg;
}
QPushButton[DangerBtn="true"]:disabled { QPushButton[DangerBtn="true"]:disabled {
color: @pushbutton_disabled_fg; color: @pushbutton_disabled_fg;
background-color: @pushbutton_disabled_bg; background-color: @pushbutton_disabled_bg;