Skip to content

Commit e3615d6

Browse files
committed
fix aux down margin
1 parent a6dd95b commit e3615d6

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed

page/common.scss

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ $color-transition: var(--color-transition, background-color 500ms ease, color 50
404404
border-radius: $highlight-radius;
405405
}
406406

407-
.fcitx-candidate-inner, .fcitx-preedit, .fcitx-aux-up, .fcitx-aux-down, .fcitx-menu-item, .fcitx-prev, .fcitx-next {
407+
.fcitx-candidate-inner, .fcitx-preedit, .fcitx-aux-up, .fcitx-menu-item, .fcitx-prev, .fcitx-next {
408408
margin: $margin;
409409
}
410410

@@ -478,12 +478,18 @@ $color-transition: var(--color-transition, background-color 500ms ease, color 50
478478
}
479479
}
480480

481-
.fcitx-candidate-inner, .fcitx-preedit, .fcitx-aux-up, .fcitx-aux-down, .fcitx-menu-item {
481+
.fcitx-candidate-inner, .fcitx-preedit, .fcitx-aux-up, .fcitx-menu-item {
482482
/* combine min-block-size, min-inline-size and padding to make aux-up a square for 小 and A */
483483
padding-block: $top-padding $bottom-padding;
484484
padding-inline: $left-padding $right-padding;
485485
}
486486

487+
.fcitx-aux-down {
488+
/* No highlight for aux-down so combine padding and margin. */
489+
padding-block: calc($top-padding + $margin) calc($bottom-padding + $margin);
490+
padding-inline: calc($left-padding + $margin) calc($right-padding + $margin);
491+
}
492+
487493
/* Use a dedicated div because
488494
* 1. divider color is not overlaid by panel color
489495
* 2. divider may not be full-length

tests/test-header.spec.ts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,12 @@ test('No text shift when preedit grows', async ({ page }) => {
3030
const ceBox = await getTextBox(preedit, 0)
3131
expect(ceBox).toEqual(cBox)
3232
})
33+
34+
test('Aux down', async ({ page }) => {
35+
await init(page)
36+
await updateInputPanel(page, '', 'Clipboard', 'No entries.')
37+
const auxDown = panel(page).locator('.fcitx-aux-down')
38+
await expect(auxDown).toHaveCSS('padding', '2px 9px')
39+
await expect(auxDown).toHaveCSS('margin', '0px')
40+
expect((await getBox(auxDown)).height).toEqual(28)
41+
})

0 commit comments

Comments
 (0)