Derived style fixes

This commit is contained in:
crschnick
2024-11-06 06:21:43 +00:00
parent 34ecec41fc
commit 8717752183
4 changed files with 9 additions and 12 deletions
@@ -192,10 +192,12 @@ public class AppTheme {
public static class DerivedTheme extends Theme {
private final String name;
private final int skipLines;
public DerivedTheme(String id, String cssId, String name, atlantafx.base.theme.Theme theme) {
public DerivedTheme(String id, String cssId, String name, atlantafx.base.theme.Theme theme, int skipLines) {
super(id, cssId, theme);
this.name = name;
this.skipLines = skipLines;
}
@Override
@@ -213,7 +215,7 @@ public class AppTheme {
builder.append("\n")
.append(baseStyleContent
.lines()
.skip(builder.toString().lines().count())
.skip(skipLines)
.collect(Collectors.joining("\n")));
});
@@ -240,10 +242,10 @@ public class AppTheme {
public static final Theme CUPERTINO_LIGHT = new Theme("cupertinoLight", "cupertino", new CupertinoLight());
public static final Theme CUPERTINO_DARK = new Theme("cupertinoDark", "cupertino", new CupertinoDark());
public static final Theme DRACULA = new Theme("dracula", "dracula", new Dracula());
public static final Theme MOCHA = new DerivedTheme("mocha", "mocha", "Mocha", new PrimerDark());
public static final Theme MOCHA = new DerivedTheme("mocha", "mocha", "Mocha", new PrimerDark(), 115);
// Adjust this to create your own theme
public static final Theme CUSTOM = new DerivedTheme("custom", "primer", "Custom", new PrimerDark());
public static final Theme CUSTOM = new DerivedTheme("custom", "primer", "Custom", new PrimerDark(), 115);
// Also include your custom theme here
public static final List<Theme> ALL = List.of(
@@ -37,10 +37,6 @@
-fx-padding: 0.1em 0.2em;
}
.browser .transfer .label .ikonli-font-icon {
-fx-icon-color: -color-fg-default;
}
.root.nord .transfer > * {
-fx-background-radius: 0;
-fx-border-radius: 0;
@@ -164,7 +164,3 @@
.root:performance:dark .store-active-comp .dot {
-fx-fill: rgb(30, 180, 30, 0.7);
}
.custom-text-field .font-icon, .custom-text-field .ikonli-font-icon {
-fx-icon-color: -color-fg-default;
}
@@ -110,6 +110,9 @@
-color-chart-8-alpha20: rgba(136, 136, 136, 0.2);
-fx-background-color: -color-bg-default;
-fx-font-size: 14px;
-fx-background-radius: inherit;
-fx-background-insets: inherit;
-fx-padding: inherit;
}
.root { -color-bg-default-transparent: #0d1117d2; }