Skip to content

Commit

Permalink
Merge branch 'beancount:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
nerd4me authored Dec 11, 2024
2 parents 7a72e82 + 686c967 commit 5630ca4
Show file tree
Hide file tree
Showing 29 changed files with 401 additions and 207 deletions.
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ ci:
skip: ["eslint"]
repos:
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.8.0
rev: v0.8.2
hooks:
- id: ruff
args: ["--fix"]
Expand All @@ -23,7 +23,7 @@ repos:
files: \.(css|js|mjs|ts|svelte|yaml|json)$
require_serial: true
additional_dependencies:
- "[email protected].1"
- "[email protected].2"
- "[email protected]"
- "[email protected]"
- id: stylelint
Expand Down
19 changes: 10 additions & 9 deletions constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ alabaster==0.7.16
# via sphinx
altgraph==0.17.4
# via pyinstaller
anyio==4.6.2.post1
anyio==4.7.0
# via watchfiles
astroid==3.3.5
# via pylint
Expand Down Expand Up @@ -160,7 +160,7 @@ mypy==1.13.0
# via fava (pyproject.toml)
mypy-extensions==1.0.0
# via mypy
nh3==0.2.18
nh3==0.2.19
# via readme-renderer
nodeenv==1.9.1
# via pre-commit
Expand All @@ -176,7 +176,8 @@ packaging==24.2
# sphinx
# tox
# tox-uv
pkginfo==1.10.0
# twine
pkginfo==1.12.0
# via twine
platformdirs==4.3.6
# via
Expand Down Expand Up @@ -216,13 +217,13 @@ pyinstaller==6.11.1
# via fava (pyproject.toml)
pyinstaller-hooks-contrib==2024.10
# via pyinstaller
pylint==3.3.1
pylint==3.3.2
# via fava (pyproject.toml)
pyproject-api==1.8.0
# via tox
pyproject-hooks==1.2.0
# via build
pytest==8.3.3
pytest==8.3.4
# via
# fava (pyproject.toml)
# pytest-cov
Expand Down Expand Up @@ -263,7 +264,7 @@ setuptools==75.6.0
# pyinstaller-hooks-contrib
simplejson==3.19.3
# via fava (pyproject.toml)
six==1.16.0
six==1.17.0
# via python-dateutil
sniffio==1.3.1
# via anyio
Expand Down Expand Up @@ -313,9 +314,9 @@ tox==4.23.2
# via
# fava (pyproject.toml)
# tox-uv
tox-uv==1.16.0
tox-uv==1.16.1
# via fava (pyproject.toml)
twine==5.1.1
twine==6.0.1
# via fava (pyproject.toml)
types-setuptools==75.6.0.20241126
# via fava (pyproject.toml)
Expand All @@ -334,7 +335,7 @@ urllib3==2.2.3
# via
# requests
# twine
uv==0.5.5
uv==0.5.6
# via tox-uv
virtualenv==20.28.0
# via
Expand Down
16 changes: 0 additions & 16 deletions frontend/css/base.css
Original file line number Diff line number Diff line change
Expand Up @@ -446,19 +446,3 @@ td .status-indicator {
border-bottom: 5px solid var(--text-color-lightest);
border-left: 5px solid transparent;
}

/*
* View-specific and tables
*/

.options td {
text-align: left;
}

.options td:nth-child(1) {
font-weight: 500;
}

.options td:nth-child(2) {
white-space: normal;
}
53 changes: 52 additions & 1 deletion frontend/css/journal-table.css
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@
}

.journal .datecell {
width: 5.5rem;
width: 6rem;
white-space: nowrap;
}

Expand Down Expand Up @@ -231,3 +231,54 @@
text-transform: lowercase;
border-radius: 20px;
}

@media (width <= 767px) {
.journal p {
flex-wrap: wrap;
}

/* show a colored top border for all entries */
.journal > li > p {
border-top: thin solid var(--entry-background);
}

.journal .head .flag {
flex-grow: 1;
text-align: left;
}

.journal .description {
flex: inherit;
order: 1; /* push to second row */
width: 100%;
padding-left: 0;
}

.journal .indicators {
flex-grow: 1;
}

.journal .balance .num {
width: 35%;
}

.journal .balance .change.num {
display: none;
}

.journal .postings .datecell,
.journal .postings .flag {
display: none;
}

.journal .postings .description {
flex-grow: 1;
order: inherit;
width: inherit;
}

.journal .metadata dt,
.journal .metadata dd {
margin-left: initial;
}
}
4 changes: 4 additions & 0 deletions frontend/css/layout.css
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,10 @@ article:has(> .fixed-fullsize-container) {
}

@media (width <= 767px) {
article {
padding: 1em;
}

body {
display: block;
font-size: 16px;
Expand Down
Loading

0 comments on commit 5630ca4

Please sign in to comment.