Skip to content

Commit 5570979

Browse files
committed
Merge branch 'frontend-fix-manage-accounts-layout-spacings'
2 parents 5397ec0 + 5a20fcb commit 5570979

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

frontends/web/src/routes/settings/components/manage-accounts/watchonlySetting.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ export const WatchonlySetting = ({ keystore }: Props) => {
8282
</DialogButtons>
8383
</Dialog>
8484
{ watchonly !== undefined ? (
85-
<Label>
85+
<Label className={style.label}>
8686
<span className={style.labelText}>
8787
{t('newSettings.appearance.remebmerWallet.name')}
8888
</span>

frontends/web/src/routes/settings/components/manage-accounts/watchonlySettings.module.css

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,5 @@
77
font-size: 14px;
88
line-height: 1;
99
margin-right: 8px;
10-
padding-left: var(--space-quarter);
1110
vertical-align: sub;
1211
}

frontends/web/src/routes/settings/manage-accounts.module.css

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
align-items: center;
2727
display: flex;
2828
flex-direction: row;
29-
flex-wrap: wrap;
3029
justify-content: space-between;
3130
min-height: var(--item-height);
3231
padding: var(--space-quarter) 0;
@@ -44,7 +43,7 @@
4443
.acccountLink {
4544
align-items: center;
4645
display: flex;
47-
flex-basis: calc(100% - 100px);
46+
flex-basis: 0;
4847
flex-grow: 1;
4948
flex-shrink: 1;
5049
}

frontends/web/src/routes/settings/manage-accounts.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,9 @@ class ManageAccounts extends Component<Props, State> {
8484
onClick={() => this.setState({ currentlyEditedAccount: account })}
8585
transparent>
8686
<EditActive />
87-
{t('manageAccounts.editAccount')}
87+
<span className="hide-on-small">
88+
{t('manageAccounts.editAccount')}
89+
</span>
8890
</Button>
8991
{active && account.coinCode === 'eth' ? (
9092
<div className={style.tokenSection}>
@@ -293,6 +295,7 @@ class ManageAccounts extends Component<Props, State> {
293295
</span>
294296
{keystore.keystore.connected ? (
295297
<Badge
298+
className="m-right-quarter"
296299
icon={props => <USBSuccess {...props} />}
297300
type="success">
298301
{t('device.keystoreConnected')}

0 commit comments

Comments
 (0)