Skip to content

A local-first personal finance app

Add oxlint rule against direct theme imports; fix Login OpenID button styles (#6796)

Matiss Janis Aboltins9585a92cdaf7
diff --git a/.oxlintrc.json b/.oxlintrc.json
index 8a58e6c3da..bfe5fc51e1 100644
--- a/.oxlintrc.json
+++ b/.oxlintrc.json
@@ -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`"
diff --git a/packages/desktop-client/src/components/manager/subscribe/Login.tsx b/packages/desktop-client/src/components/manager/subscribe/Login.tsx
index 9bfffcaac9..052f772677 100644
--- a/packages/desktop-client/src/components/manager/subscribe/Login.tsx
+++ b/packages/desktop-client/src/components/manager/subscribe/Login.tsx
@@ -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 }) {
@@ -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 &&
diff --git a/upcoming-release-notes/6796.md b/upcoming-release-notes/6796.md
new file mode 100644
index 0000000000..4f8e8b5d46
--- /dev/null
+++ b/upcoming-release-notes/6796.md
@@ -0,0 +1,6 @@
+---
+category: Maintenance
+authors: [MatissJanis]
+---
+
+lint: disallow importing theme files directly