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

Merge #144: Smooth border color

Browse Source 
9948b10689ae98312f0740ecb09fea26e56031b0 Smooth border color (edouard)

Pull request description:

ACKs for top commit:
  edouardparis:
    ACK 9948b10689ae98312f0740ecb09fea26e56031b0

Tree-SHA512: 3ae2bd8ba20314d6bf3787ba2db8d3a042c096952cf5d10f22fd02c6edabc468ec7d94037e010685045b5477bb0d9dfbbabce6d3faef9c3ded1217528d324fab
This commit is contained in:
edouard 2022-12-01 18:35:10 +01:00
commit 606e2cd1b3
No known key found for this signature in database
GPG Key ID: E65F7A089C20DC8F
6 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gui/src/app/view/spend/detail.rs
View File

@ -492,15 +492,12 @@ pub fn sign_action<'a>(
} else {
Column::new()
.push(
card::simple(
Column::new()
.spacing(20)
.width(Length::Fill)
.push("Please connect a hardware wallet")
.push(button::primary(None, "Refresh").on_press(Message::Reload))
.align_items(Alignment::Center),
)
.width(Length::Fill),
Column::new()
.spacing(20)
.width(Length::Fill)
.push("Please connect a hardware wallet")
.push(button::primary(None, "Refresh").on_press(Message::Reload))
.align_items(Alignment::Center),
)
.width(Length::Fill)
})

6
gui/src/ui/color.rs
View File

@ -6,6 +6,12 @@ pub const BACKGROUND: Color = Color::from_rgb(
0xF8 as f32 / 255.0,
);
pub const BORDER_GREY: Color = Color::from_rgb(
0xd0 as f32 / 255.0,
0xd7 as f32 / 255.0,
0xde as f32 / 255.0,
);
pub const FOREGROUND: Color = Color::WHITE;
pub const PRIMARY: Color = Color::BLACK;

2
gui/src/ui/component/button.rs
View File

@ -86,7 +86,7 @@ impl button::StyleSheet for Style {
background: Color::TRANSPARENT.into(),
border_radius: 10.0,
border_width: 1.2,
border_color: color::BACKGROUND,
border_color: color::BORDER_GREY,
text_color: Color::BLACK,
},
}

2
gui/src/ui/component/card.rs
View File

@ -15,6 +15,8 @@ impl widget::container::StyleSheet for SimpleCardStyle {
fn appearance(&self, _style: &Self::Style) -> widget::container::Appearance {
widget::container::Appearance {
border_radius: 10.0,
border_color: color::BORDER_GREY,
border_width: 1.0,
background: color::FOREGROUND.into(),
..widget::container::Appearance::default()
}

2
gui/src/ui/component/container.rs
View File

@ -17,7 +17,7 @@ impl container::StyleSheet for Style {
Self::Sidebar => container::Appearance {
background: color::FOREGROUND.into(),
border_width: 1.0,
border_color: color::SECONDARY,
border_color: color::BORDER_GREY,
..container::Appearance::default()
},
}

2
gui/src/ui/component/mod.rs
View File

@ -23,7 +23,7 @@ impl iced::widget::container::StyleSheet for SepStyle {
type Style = iced::Theme;
fn appearance(&self, _style: &Self::Style) -> iced::widget::container::Appearance {
iced::widget::container::Appearance {
background: color::SECONDARY.into(),
background: color::BORDER_GREY.into(),
..iced::widget::container::Appearance::default()
}
}