Skip to content

Commit

Permalink
[*] update normally
Browse files Browse the repository at this point in the history
  • Loading branch information
heng30 committed Aug 30, 2024
1 parent 1623cb2 commit 10d14e2
Show file tree
Hide file tree
Showing 6 changed files with 37 additions and 23 deletions.
25 changes: 15 additions & 10 deletions ui/base/log-in.slint
Original file line number Diff line number Diff line change
Expand Up @@ -111,16 +111,21 @@ export component LogIn inherits Rectangle {
}
}

confirm-btn := TextBtnWithoutIcon {
width: password-lineedit.width;
height: self.text-height + Theme.padding * 2;
text: Logic.tr("Log in");
font-size: Theme.title3-font-size;
bg-color: Theme.third-brand-color;
text-color: Theme.light-text-color;

clicked => {
root.error-message = root.confirmed(username-lineedit.text, password-lineedit.text);
HorizontalLayout {
padding-top: Theme.padding * 5;
padding-bottom: Theme.padding * 5;

confirm-btn := TextBtnWithoutIcon {
width: password-lineedit.width;
height: self.text-height + Theme.padding * 2;
text: Logic.tr("Log in");
font-size: Theme.title3-font-size;
bg-color: Theme.third-brand-color;
text-color: Theme.light-text-color;

clicked => {
root.error-message = root.confirmed(username-lineedit.text, password-lineedit.text);
}
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions ui/base/mnemonic.slint
Original file line number Diff line number Diff line change
Expand Up @@ -197,8 +197,8 @@ export component Mnemonic inherits Rectangle {
}

if is-show-btns: HorizontalLayout {
alignment: LayoutAlignment.end;
padding: Theme.padding * 5;
padding-top: Theme.padding * 5;
padding-bottom: Theme.padding * 5;
spacing: Theme.spacing * 8;

CancelBtn {
Expand Down
2 changes: 2 additions & 0 deletions ui/base/password.slint
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,8 @@ export component Password inherits Rectangle {
}

HorizontalLayout {
padding-top: Theme.padding * 5;
padding-bottom: Theme.padding * 5;
spacing: Theme.spacing * 8;

CancelBtn {
Expand Down
2 changes: 2 additions & 0 deletions ui/base/reset-password.slint
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,8 @@ export component ResetPassword inherits Rectangle {
}

HorizontalLayout {
padding-top: Theme.padding * 5;
padding-bottom: Theme.padding * 5;
spacing: Theme.spacing * 8;

CancelBtn {
Expand Down
25 changes: 15 additions & 10 deletions ui/base/sign-in.slint
Original file line number Diff line number Diff line change
Expand Up @@ -139,16 +139,21 @@ export component SignIn inherits Rectangle {
}
}

TextBtnWithoutIcon {
width: password-first-lineedit.width;
height: self.text-height + Theme.padding * 2;
text: Logic.tr("Sign in");
font-size: Theme.title3-font-size;
bg-color: Theme.third-brand-color;
text-color: Theme.light-text-color;

clicked => {
root.error-message = root.confirmed(username-lineedit.text, password-first-lineedit.text, password-second-lineedit.text);
HorizontalLayout {
padding-top: Theme.padding * 5;
padding-bottom: Theme.padding * 5;

TextBtnWithoutIcon {
width: password-first-lineedit.width;
height: self.text-height + Theme.padding * 2;
text: Logic.tr("Sign in");
font-size: Theme.title3-font-size;
bg-color: Theme.third-brand-color;
text-color: Theme.light-text-color;

clicked => {
root.error-message = root.confirmed(username-lineedit.text, password-first-lineedit.text, password-second-lineedit.text);
}
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion ui/store.slint
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ export global Store {
component-index: ComponentIndex.WaitTransactionConfirmed,
},
{
title: is-cn ? "交易历史条目" : "TransactionTile",
title: is-cn ? "交易历史" : "TransactionTile",
component-index: ComponentIndex.TransactionTile,
},
];
Expand Down

0 comments on commit 10d14e2

Please sign in to comment.