Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .oxlintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -333,6 +333,10 @@
"importNames": ["colors"],
"message": "Please use themes instead of colors"
},
{
"group": ["**/style/themes/*"],
"message": "Please do not import theme files directly"
},
{
"group": ["@actual-app/web/**/*"],
"message": "Please do not import `@actual-app/web` in `loot-core`"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ import {
} from '@desktop-client/components/ServerContext';
import { useNavigate } from '@desktop-client/hooks/useNavigate';
import { useDispatch } from '@desktop-client/redux';
import { warningBackground } from '@desktop-client/style/themes/dark';
import { loggedIn } from '@desktop-client/users/usersSlice';

function PasswordLogin({ setError, dispatch }) {
Expand Down Expand Up @@ -171,13 +170,11 @@ function OpenIdLogin({ setError }) {
<Button
variant="primary"
onPress={onSubmitOpenId}
style={
warningBackground && {
padding: 6,
fontSize: 14,
width: 170,
}
}
style={{
padding: 6,
fontSize: 14,
width: 170,
}}
isDisabled={
firstLoginPassword === '' &&
askForPassword &&
Expand Down
6 changes: 6 additions & 0 deletions upcoming-release-notes/6796.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
category: Maintenance
authors: [MatissJanis]
---

lint: disallow importing theme files directly
Loading