mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-21 04:01:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix css instead of defining style from within code

Browse Source
This commit is contained in:
Sebastian Stenzel
2021-07-21 09:57:56 +02:00
parent 4a8dbfbc15
commit 7a1b1292ae
4 changed files with 30 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/org/cryptomator/ui/health/CheckStateIconView.java
View File

@@ -23,7 +23,6 @@ public class CheckStateIconView extends FontAwesome5IconView {
public CheckStateIconView() {
super();
this.getStyleClass().remove("glyph-icon");
this.state = EasyBind.wrapNullable(check).mapObservable(Check::stateProperty);
this.severity = EasyBind.wrapNullable(check).mapObservable(Check::highestResultSeverityProperty);
glyphProperty().bind(EasyBind.combine(state, severity, this::glyphForState)); //TODO: does the binding need to be stored?

2
src/main/java/org/cryptomator/ui/health/ResultListCellController.java
View File

@@ -76,8 +76,6 @@ public class ResultListCellController implements FxController {
@FXML
public void initialize() {
// see getGlyph() for relevant glyphs:
severityView.getStyleClass().remove("glyph-icon");
fixView.getStyleClass().remove("glyph-icon");
subscriptions.addAll(List.of(EasyBind.includeWhen(severityView.getStyleClass(), "glyph-icon-muted", severityView.glyphProperty().isEqualTo(INFO_ICON)), //
EasyBind.includeWhen(severityView.getStyleClass(), "glyph-icon-primary", severityView.glyphProperty().isEqualTo(GOOD_ICON)), //
EasyBind.includeWhen(severityView.getStyleClass(), "glyph-icon-orange", severityView.glyphProperty().isEqualTo(WARN_ICON)), //

20
src/main/resources/css/dark_theme.css
View File

@@ -127,23 +127,33 @@
-fx-fill: TEXT_FILL;
}
.glyph-icon-primary {
.glyph-icon.glyph-icon-primary,
.list-cell .glyph-icon.glyph-icon-primary,
.list-cell:selected .glyph-icon.glyph-icon-primary {
-fx-fill: PRIMARY;
}
.glyph-icon-muted {
.glyph-icon.glyph-icon-muted,
.list-cell .glyph-icon.glyph-icon-muted,
.list-cell:selected .glyph-icon.glyph-icon-muted {
-fx-fill: TEXT_FILL_MUTED;
}
.glyph-icon-white {
.glyph-icon.glyph-icon-white,
.list-cell .glyph-icon.glyph-icon-white,
.list-cell:selected .glyph-icon.glyph-icon-white {
-fx-fill: white;
}
.glyph-icon-red {
.glyph-icon.glyph-icon-red,
.list-cell .glyph-icon.glyph-icon-red,
.list-cell:selected .glyph-icon.glyph-icon-red {
-fx-fill: RED_5;
}
.glyph-icon-orange {
.glyph-icon.glyph-icon-orange,
.list-cell .glyph-icon.glyph-icon-orange,
.list-cell:selected .glyph-icon.glyph-icon-orange {
-fx-fill: ORANGE_5;
}

20
src/main/resources/css/light_theme.css
View File

@@ -127,23 +127,33 @@
-fx-fill: TEXT_FILL;
}
.glyph-icon-primary {
.glyph-icon.glyph-icon-primary,
.list-cell .glyph-icon.glyph-icon-primary,
.list-cell:selected .glyph-icon.glyph-icon-primary {
-fx-fill: PRIMARY;
}
.glyph-icon-muted {
.glyph-icon.glyph-icon-muted,
.list-cell .glyph-icon.glyph-icon-muted,
.list-cell:selected .glyph-icon.glyph-icon-muted {
-fx-fill: TEXT_FILL_MUTED;
}
.glyph-icon-white {
.glyph-icon.glyph-icon-white,
.list-cell .glyph-icon.glyph-icon-white,
.list-cell:selected .glyph-icon.glyph-icon-white {
-fx-fill: white;
}
.glyph-icon-red {
.glyph-icon.glyph-icon-red,
.list-cell .glyph-icon.glyph-icon-red,
.list-cell:selected .glyph-icon.glyph-icon-red {
-fx-fill: RED_5;
}
.glyph-icon-orange {
.glyph-icon.glyph-icon-orange,
.list-cell .glyph-icon.glyph-icon-orange,
.list-cell:selected .glyph-icon.glyph-icon-orange {
-fx-fill: ORANGE_5;
}