nik/liana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge #876: gui: make the trash button prettier

Browse Source 
2b5fe01cf04d9686b63915c284cb27cabf4d4b5a gui: make the trash button prettier (Antoine Poinsot)

Pull request description:

  After feedback from Kevin.
  ![image](https://github.com/wizardsardine/liana/assets/22457751/f814613d-143a-4d33-9459-ec2e2c988100)

ACKs for top commit:
  edouardparis:
    ACK 2b5fe01cf04d9686b63915c284cb27cabf4d4b5a

Tree-SHA512: f4f1a03bf8d9a2b5f19a196f8831925a99a3fdc9b981b41f14c0905d953144dc58b6cafaf2a17bef394d8e777b863f0e5a36e7b96f0d9205675d25f252ea4ff7
This commit is contained in:
edouardparis 2023-12-15 09:59:18 +01:00
commit 67dd3af9ba
No known key found for this signature in database
GPG Key ID: E65F7A089C20DC8F
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gui/src/launcher.rs
View File

@ -179,7 +179,9 @@ impl Launcher {
*choice,
),
))
.style(theme::Button::Destructive),
.style(
theme::Button::SecondaryDestructive,
),
"Delete wallet",
tooltip::Position::Right,
))

21
gui/ui/src/theme.rs
View File

@ -462,6 +462,7 @@ pub enum Button {
Primary,
Secondary,
Destructive,
SecondaryDestructive,
Transparent,
TransparentBorder,
Border,
@ -483,14 +484,16 @@ impl button::StyleSheet for Theme {
border_color: color::GREY_7,
text_color: color::GREY_2,
},
Button::Secondary | Button::Border => button::Appearance {
shadow_offset: iced::Vector::default(),
background: iced::Color::TRANSPARENT.into(),
border_radius: 25.0,
border_width: 1.0,
border_color: color::GREY_7,
text_color: color::GREY_2,
},
Button::Secondary | Button::SecondaryDestructive | Button::Border => {
button::Appearance {
shadow_offset: iced::Vector::default(),
background: iced::Color::TRANSPARENT.into(),
border_radius: 25.0,
border_width: 1.0,
border_color: color::GREY_7,
text_color: color::GREY_2,
}
}
Button::Destructive => button::Appearance {
shadow_offset: iced::Vector::default(),
background: iced::Color::TRANSPARENT.into(),
@ -560,7 +563,7 @@ impl button::StyleSheet for Theme {
border_color: iced::Color::TRANSPARENT,
text_color: color::LIGHT_BLACK,
},
Button::Destructive => button::Appearance {
Button::Destructive | Button::SecondaryDestructive => button::Appearance {
shadow_offset: iced::Vector::default(),
background: color::RED.into(),
border_radius: 25.0,