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

Merge #1612: clean usage of color outside of theme palette

Browse Source 
47093a3eafcb5fc12a3cedaa045830c7e9b3ded5 clean usage of color outside of theme palette (edouardparis)

Pull request description:

ACKs for top commit:
  edouardparis:
    ACK 47093a3eafcb5fc12a3cedaa045830c7e9b3ded5

Tree-SHA512: b8e928a125873f36eeedd64c94d324b45378d70f67c48f450408dd8906366dbae802c9af28e465d4c3d0249c9e7d140597530bc533c8b83f772f1722615798c3
This commit is contained in:
edouardparis 2025-03-26 11:29:38 +01:00
commit 05b848c5d2
No known key found for this signature in database
GPG Key ID: E65F7A089C20DC8F
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
liana-gui/src/installer/view/editor/template/custom.rs
View File

@ -36,12 +36,12 @@ pub fn custom_template_description(progress: (usize, usize)) -> Element<'static,
.max_width(800.0)
.push(Container::new(
p1_regular("For this setup you will need to define your primary and recovery spending policies. For security reasons, we suggest you use a separate Hardware Wallet for each key belonging to them.")
.color(color::GREY_2)
.style(theme::text::secondary)
.align_x(alignment::Horizontal::Left)
).align_x(alignment::Horizontal::Left).width(Length::Fill))
.push(Container::new(
p1_regular("The keys belonging to your primary policy can always spend. Those belonging to the recovery policies will be able to spend only after a defined time of wallet inactivity, allowing for secure recovery and advanced spending policies.")
.color(color::GREY_2)
.style(theme::text::secondary)
.align_x(alignment::Horizontal::Left)
).align_x(alignment::Horizontal::Left).width(Length::Fill))
.push(image::custom_template_description().width(Length::Fill))

6
liana-ui/src/component/button.rs
View File

@ -1,16 +1,16 @@
use crate::{color, theme, widget::*};
use crate::{theme, widget::*};
use iced::alignment::{Horizontal, Vertical};
use iced::widget::{button, container, row};
use super::text::text;
pub fn menu<'a, T: 'a>(icon: Option<Text<'a>>, t: &'static str) -> Button<'a, T> {
button::Button::new(content_menu(icon.map(|i| i.color(color::GREY_3)), t).padding(10))
button::Button::new(content_menu(icon.map(|i| i.style(theme::text::secondary)), t).padding(10))
.style(theme::button::menu)
}
pub fn menu_active<'a, T: 'a>(icon: Option<Text<'a>>, t: &'static str) -> Button<'a, T> {
button::Button::new(content_menu(icon.map(|i| i.color(color::GREY_3)), t).padding(10))
button::Button::new(content_menu(icon.map(|i| i.style(theme::text::secondary)), t).padding(10))
.style(theme::button::menu_pressed)
}

5
liana-ui/src/component/event.rs
View File

@ -1,5 +1,4 @@
use crate::{
color,
component::{amount, badge, text},
theme,
widget::*,
@ -56,7 +55,7 @@ pub fn confirmed_outgoing_event<T: Clone + 'static>(
.format("%b. %d, %Y - %T")
.to_string()
)
.color(color::GREY_3)
.style(theme::text::secondary)
)
)
.spacing(10)
@ -120,7 +119,7 @@ pub fn confirmed_incoming_event<T: Clone + 'static>(
.format("%b. %d, %Y - %T")
.to_string()
)
.color(color::GREY_3)
.style(theme::text::secondary)
)
)
.spacing(10)